Skip to content

Update master 2025 12 #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
Andreas-W merged 344 commits into from
Dec 20, 2025
Merged

Update master 2025 12 #59

Andreas-W merged 344 commits into from
Dec 20, 2025

Conversation

@Andreas-W
Copy link
Owner

@Andreas-W Andreas-W commented Dec 20, 2025

merged SH master

xezon and others added 30 commits September 20, 2025 20:26
@xezon
feat(client): Make opacity and shadows of build placement preview obj…
568a162 
…ects customizable (TheSuperHackers#1592)

Adds new fields ObjectPlacementOpacity=0..1 and ObjectPlacementShadows=Yes/No to GameData.ini
@Mauller
refactor(pathfinder): Remove superfluous whitespace and commented cod…
dca765f 
…e in Pathfinder (TheSuperHackers#1611)
@Stubbjax
bugfix(input): Double-clicking to place a building no longer performs…
1875dbf 
… double-click selection logic (TheSuperHackers#1608)
@Stubbjax
bugfix(module): Fix damage calculation for determining the initial de…
a2cebd8 
…ath of GLA Battle Bus (TheSuperHackers#1603)
@xezon
bugfix(input): Fix broken single click command after right mouse doub…
cd86cc4 
…le click (TheSuperHackers#1605)
@xezon
refactor(tree): Simplify W3DTreeDraw related code (TheSuperHackers#1614)
80cc300
@xezon
bugfix(tree): Fix 1 in 10 trees not swaying (TheSuperHackers#1613)
5a9a526
@xezon
perf(behavior): Optimize loops in ParkingPlaceBehavior (TheSuperHacke…
48054ec 
…rs#1618)
@Stubbjax
bugfix(buildassistant): Prevent showing the invalid placement indicat…
e87031f 
…or for shrouded objects (TheSuperHackers#1543)
@Stubbjax
bugfix(gui): Consistently show blue health bars for disabled objects (T…
e8ef120 
…heSuperHackers#1622)
@Stubbjax
bugfix(module): GLA Battle Bus can no longer be subdued indefinitely (T…
5ba1741 
…heSuperHackers#1604)
@Stubbjax
bugfix(contain): Fix unit attachments being visible in fog after exit…
04b968f 
…ing a GLA Tunnel Network (TheSuperHackers#1522)
@xezon
tweak(options): Simplify user options for Cursor Capture (TheSuperHac…
63ec8d0 
…kers#1541)

Replaces CursorCaptureMode with the following options in Options.ini:

CursorCaptureEnabledInFullscreenGame=yes
CursorCaptureEnabledInFullscreenMenu=yes
CursorCaptureEnabledInWindowedGame=yes
CursorCaptureEnabledInWindowedMenu=no
@xezon
bugfix(input): Fix cargo units selection hack (TheSuperHackers#1635)
abe8dba
@xezon
refactor(ww3d): Rename WW3D::Get_Frame_Time to WW3D::Get_Sync_Frame_T…
777eae8 
…ime (TheSuperHackers#1579)
@xezon
bugfix(draw): Fix tank draw update logic step time is smaller than re…
e0d992f 
…nder frame time (TheSuperHackers#1579)
@xezon
tweak(snow): Decouple snow render update from logic step (TheSuperHac…
a9a69f6 
…kers#1579)
@xezon
tweak(segline): Decouple segline render update from logic step (TheSu…
bfa5671 
…perHackers#1579)
@xezon
bugfix(anim): Fix calling Animatable3DObjClass::Single_Anim_Progress …
4aabdcc 
…more than once a frame (TheSuperHackers#1579)
@xezon
tweak(anim): Decouple anim object render update from logic step (TheS…
abf86fa 
…uperHackers#1579)
@xezon
bugfix(ww3d): Bind the ww3d sync step to the game logic step (TheSupe…
eee445d 
…rHackers#1579)
@xezon
refactor(anim): Cleanup and simplify animation code a bit (TheSuperHa…
5dd9d6a 
…ckers#1579)
@xezon
tweak(anim): Enable interpolation for raw animation updates and coupl…
26c5a9b 
…e the legacy non interpolated updates to the ww3d sync (TheSuperHackers#1579)
@xezon
tweak(heightmap): Decouple cloud render update from logic step (TheSu…
792d17d 
…perHackers#1579)
@xezon
bugfix(drawable): Fix locked color in Drawable::colorTint, EMPUpdate:…
7ac7a41 
…:update (TheSuperHackers#1579)
@xezon
tweak(ww3d): Decouple render update from logic step in RingRenderObjC…
8dc210c 
…lass::animate, SphereRenderObjClass::animate (TheSuperHackers#1579)
@xezon
tweak(ww3d): Decouple render update from logic step in DazzleRenderOb…
2683d1b 
…jClass::Render, TexProjectClass::Pre_Render_Update (TheSuperHackers#1579)
@xezon
tweak(w3dview): Decouple WWAudioClass update from logic step (TheSupe…
049ef5f 
…rHackers#1579)
@xezon
fix(shadow): Fix counting of W3DProjectedShadowManager::m_numDecalSha…
2bbf902 
…dows (TheSuperHackers#1568)
@Stubbjax
bugfix(buildassistant): Fix Network game mismatch by using the correc…
0193ad2 
…t player index to check shroud status when placing structures (TheSuperHackers#1646)
bobtista and others added 29 commits December 7, 2025 10:56
@bobtista
fix: Wrong usage of sizeof(this) in BitFlags::xfer(), W3DMPO::glueEnf…
2b1bcee 
…orcer() (TheSuperHackers#1947)
@xezon
refactor(mouse): Apply minor refactoring and whitespace tweaks in Win…
aed42f0 
…Main, Mouse, HeaderTemplate (TheSuperHackers#1939)
@xezon
bugfix(mouse): Prevent cursor capture when mouse is outside of app wi…
68d832f 
…ndow (TheSuperHackers#1939)
@slurmlord
feat(crashdump): Add crash dump functionality for fatal errors (TheSu…
f4608df 
…perHackers#1594)

Crash dumps are stored in %USERPROFILE%\Documents\Command and Conquer Generals Zero Hour Data\CrashDumps
@bobtista
ci(vcpkg): Include preset in binary cache key to avoid ABI mismatches…
158b046 
… and slow CI builds (TheSuperHackers#1973)
@Mauller
bugfix(pathfinder): Prevent infinite loop within PathfindCell::putOnS…
42f846b 
…ortedOpenList() (TheSuperHackers#1965)
@bobtista
build: Add clang-tidy checks and script (TheSuperHackers#1807)
9573250
@Caball009
bugfix(string): Allow startsWith and endsWith to be called on empty s…
e6e874e 
…trings (TheSuperHackers#1979)
@bobtista
refactor: Remove superfluous inline and register keywords with clang-…
d2625f0 
…tidy (TheSuperHackers#1936)
@xezon
unify(matpass): Merge WW3D2 matpass code (TheSuperHackers#1982)
3209a5b 
This fixes a runtime crash in Generals due to incomplete code merging
@xezon
refactor(namekey): Reduce code duplication in NameKeyGenerator functi…
d809648 
…ons, misc formatting tweaks (TheSuperHackers#1959)
@xezon
perf(namekey): Remove all superfluous AsciiString allocations for nam…
0c993a9 
…e key lookups (TheSuperHackers#1959)
@Mauller @jbremer @Skyaero42
bugfix(network): Prevent buffer overflow in NetPacket::readFileMessag…
38abe9e 
…e() and NetPacket::readFileAnnounceMessage() (TheSuperHackers#1981)

Co-authored-by: JBremer <[email protected]>
Co-authored-by: SkyAero <[email protected]>
@bobtista
fix(network): Fix missing value initialization of LANGameInfo::m_isDi…
c5aa3cd 
…rectConnect (TheSuperHackers#1836)
@bobtista
refactor: Apply the readability-container-size-empty check with clang…
746c017 
…-tidy (TheSuperHackers#1957)
@xezon
unify(texture): Merge W3DWater and WW3D2 texture code (TheSuperHacker…
fa9cb0c 
…s#1989)
@xezon
unify(texture): Move W3DWater, W3DLaserDraw and WW3D2 texture related…
c110a0e 
… files to Core (TheSuperHackers#1989)
@xezon
build(heightmap): Fix include paths in Zero Hour Height Map files (Th…
334f56a 
…eSuperHackers#1991)
@xezon
unify(heightmap): Merge Height Map related code and move Zero Hour's …
330ad22 
…BaseHeightMap, FlatHeightMap, W3DPropDraw, W3DTreeDraw, W3DPropBuffer, W3DSnow, W3DTerrainBackground files to Core (TheSuperHackers#1991)
@xezon
unify(heightmap): Move Height Map and Terrain related files to Core (T…
ce4e595 
…heSuperHackers#1991)
@Caball009
bugfix(input): Disable mouse waypoint mode after using alt tab (TheSu…
844c436 
…perHackers#1987)
@Stubbjax
bugfix(object): Fix visibility conditions for client-side effects (Th…
123492c 
…eSuperHackers#1964)
@Stubbjax
bugfix(experience): Prevent ranking of riders that are not trainable (T…
4951762 
…heSuperHackers#1970)
@bobtista
refactor: Apply integer value comparisons for strcmp and stricmp with…
bffbcb4 
… clang-tidy (TheSuperHackers#1956)
@sherif181
build: Implement docker build (TheSuperHackers#1774)
3b7e734
@Mauller @Skyaero42
bugfix(network): Fix data offset for string reads in NetPacket::readF…
fc36efc 
…ileMessage() and NetPacket::readFileAnnounceMessage() (TheSuperHackers#2005)

Co-authored-by: SkyAero <[email protected]>
@xezon
tweak(metaevent): Change COMMANDUSABLE_OBSERVER to no longer apply in…
23a2926 
… Shell Map (TheSuperHackers#2002)

Keys P and O no longer pause the Shell Map. But Shift+P and Shift+O still do
@Andreas-W
Merge branch 'main' of https://github.com/TheSuperHackers/GeneralsGam…
d3d6344 
…eCode into update_master_2025_12

# Conflicts:
#	GeneralsMD/Code/GameEngine/CMakeLists.txt
#	GeneralsMD/Code/GameEngine/Include/Common/INI.h
#	GeneralsMD/Code/GameEngine/Include/Common/KindOf.h
#	GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h
#	GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h
#	GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h
#	GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h
#	GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h
#	GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h
#	GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h
#	GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h
#	GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h
#	GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h
#	GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp
#	GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
#	GeneralsMD/Code/GameEngine/Source/Common/INI/INI.cpp
#	GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp
#	GeneralsMD/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp
#	GeneralsMD/Code/GameEngine/Source/Common/System/SubsystemInterface.cpp
#	GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp
#	GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp
#	GeneralsMD/Code/GameEngine/Source/GameClient/Eva.cpp
#	GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/ParkingPlaceBehavior.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/PoisonedBehavior.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/GarrisonContain.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ExperienceTracker.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/FiringTracker.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Locomotor.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Object.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LifetimeUpdate.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ProductionUpdate.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
#	GeneralsMD/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp
#	GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
#	GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
#	GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordAircraftDraw.cpp
#	GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp
#	GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTruckDraw.cpp
#	GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScene.cpp
#	GeneralsMD/Code/Libraries/Include/Lib/BaseType.h
#	GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h
@Andreas-W
remove waitForDebug
821ef2d
@Andreas-W Andreas-W merged commit 13328fb into main Dec 20, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.