Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9a92028
Add opt-in high-resolution artwork and shared map zoom
genixpro Sep 8, 2026
ea98540
Document the final asset pipeline and preserve inference provenance
genixpro Sep 8, 2026
d5da7e8
Validate the isolated PR branch and refresh in-engine captures
genixpro Sep 8, 2026
52ef377
Enable HD artwork by default while retaining classic selection
genixpro Sep 8, 2026
7e484d4
Fix full-period sprite seams, minimap outline and Retina cursor scale
genixpro Sep 8, 2026
dd997f3
Upscale resources and remaining world art; repeat the map across the …
genixpro Sep 8, 2026
9f27009
Construct terrain from shared materials and matching corner transitions
genixpro Sep 8, 2026
61aef41
Refine connected grass and water materials and move gameplay zoom int…
genixpro Sep 8, 2026
5e75650
Use larger grass tufts and broader water ripples for normal map scale
genixpro Sep 8, 2026
90dcd70
Make grass tufts sparse and large; restore smaller water ripples
genixpro Sep 8, 2026
f8cf603
Subdue grass and water so resources remain visually distinct
genixpro Sep 8, 2026
6358e76
Organize original artwork, recovered sources and concept art with pro…
genixpro Sep 8, 2026
62648b1
Identify recovered building artwork by visual comparison and hidden l…
genixpro Sep 8, 2026
2d083ce
Preserve and catalog second recovered artwork archive
genixpro Sep 8, 2026
eff5073
Use recovered hive flag and construction artwork in runtime pack
genixpro Sep 8, 2026
934037b
Replace tree upscales with recovered original GIMP artwork
genixpro Sep 8, 2026
e4b5ab0
Normalize native tree export manifest whitespace
genixpro Sep 8, 2026
bf557d2
Use recovered original wheat artwork for matching growth stages
genixpro Sep 8, 2026
fbb7c94
Use original layered school and racetrack artwork
genixpro Sep 8, 2026
75a7897
Use recovered original area markers and audit building compositing
genixpro Sep 8, 2026
dba9c1c
Use original papyrus growth stages and document project handoff
genixpro Sep 8, 2026
9b30dba
Document per-frame artwork provenance and resumed integration results
genixpro Sep 8, 2026
2235bd6
Record recovered Blender 2.34 rendering environment
genixpro Sep 8, 2026
29b56f3
Clarify actual Blender container mount path
genixpro Sep 8, 2026
aa7b74f
Separate approved original and AI artwork inputs from runtime packaging
genixpro Sep 8, 2026
81e3ff5
Remove historical artwork experiments and retain final-only productio…
genixpro Sep 8, 2026
ef06982
Point combined artwork work to three focused PRs
genixpro Sep 9, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ compile_commands.json
Glob2.app/
Glob2-*.dmg
/.tmp

# Historical artwork experiments are local only, never part of the PR.
/experiments/ai-upscale/
2 changes: 2 additions & 0 deletions data/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ SConscript("gui/SConscript")
SConscript("icons/SConscript")
SConscript("zik/SConscript")


SConscript("highres/SConscript")
14 changes: 14 additions & 0 deletions data/highres/SConscript
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import os

Import("env")
Import("PackTar")

# Only the versioned runtime pack is shipped, never experiment/model files.
if 'dist' in COMMAND_LINE_TARGETS or 'install' in COMMAND_LINE_TARGETS:
PackTar(env["TARFILE"], "SConscript")
for directory, _, files in os.walk("v1"):
for name in sorted(files):
source = os.path.join(directory, name)
PackTar(env["TARFILE"], source)
env.Install(env["INSTALLDIR"] + "/glob2/data/highres/" + directory, source)
env.Alias("install", env["INSTALLDIR"] + "/glob2/data/highres")
7 changes: 7 additions & 0 deletions data/highres/v1/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Globulation 2 high-resolution pack v1

Default 4× artwork for OpenGL sessions. Disable High-resolution artwork in General Settings to select classic artwork on the next session load. Original game assets are required for logical geometry and fallback.

`frames.txt` is the runtime index (`GLOB2_HIGHRES 1`). Each row contains frame ID, original logical width/height, scale, base PNG and team PNG (`-` means absent). `manifest.json` records provenance, SHA-256 hashes, per-layer dimensions, and terrain atlas layout. Green team layers follow the engine's hue-shift convention.

Ship this directory intact. Invalid or incomplete frames fall back to originals. Terrain mip PNGs must correspond to the frame PNGs and retain their extruded borders. Runtime does not require Python or AI tooling. Reproduction and validation instructions are in `docs/high-resolution/README.md` in the source checkout.
Binary file added data/highres/v1/area-clearing0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-clearing1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-clearing2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-clearing3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-clearing4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-clearing5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-clearing6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-clearing7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-forbidden0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-forbidden1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-forbidden2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-forbidden3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-forbidden4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-forbidden5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-forbidden6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-forbidden7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-guard0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-guard1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-guard2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-guard3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-guard4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-guard5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-guard6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/area-guard7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/barracks0b0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/highres/v1/barracks0b0r.png
Binary file added data/highres/v1/barracks1b0.png
Binary file added data/highres/v1/barracks1b0r.png
Binary file added data/highres/v1/barracks2b0.png
Binary file added data/highres/v1/barracks2b0r.png
Binary file added data/highres/v1/black0.png
Binary file added data/highres/v1/black1.png
Binary file added data/highres/v1/black10.png
Binary file added data/highres/v1/black11.png
Binary file added data/highres/v1/black12.png
Binary file added data/highres/v1/black13.png
Binary file added data/highres/v1/black14.png
Binary file added data/highres/v1/black15.png
Binary file added data/highres/v1/black2.png
Binary file added data/highres/v1/black3.png
Binary file added data/highres/v1/black4.png
Binary file added data/highres/v1/black5.png
Binary file added data/highres/v1/black6.png
Binary file added data/highres/v1/black7.png
Binary file added data/highres/v1/black8.png
Binary file added data/highres/v1/black9.png
Binary file added data/highres/v1/buildingsite0.png
Binary file added data/highres/v1/buildingsite1.png
Binary file added data/highres/v1/buildingsite2.png
Binary file added data/highres/v1/buildingsite3.png
Binary file added data/highres/v1/buildingsite4.png
Binary file added data/highres/v1/buildingsite5.png
Binary file added data/highres/v1/bullet0.png
Binary file added data/highres/v1/bullet1.png
Binary file added data/highres/v1/clearingflag0.png
Binary file added data/highres/v1/clearingflag0r.png
Binary file added data/highres/v1/cloud0.png
Binary file added data/highres/v1/defencetower0b0.png
Binary file added data/highres/v1/defencetower0b0r.png
Binary file added data/highres/v1/defencetower1b0.png
Binary file added data/highres/v1/defencetower1b0r.png
Binary file added data/highres/v1/defencetower1b1.png
Binary file added data/highres/v1/defencetower1b1r.png
Binary file added data/highres/v1/defencetower1b2.png
Binary file added data/highres/v1/defencetower1b2r.png
Binary file added data/highres/v1/defencetower2b0.png
Binary file added data/highres/v1/defencetower2b0r.png
Binary file added data/highres/v1/explorationflag0.png
Binary file added data/highres/v1/explorationflag0r.png
Binary file added data/highres/v1/explosion0.png
Binary file added data/highres/v1/explosion1.png
Binary file added data/highres/v1/explosion2.png
Binary file added data/highres/v1/explosion3.png
Binary file added data/highres/v1/explosion4.png
Binary file added data/highres/v1/explosion5.png
Loading