Commit 1d181e7
committed
Merge branch 'main' of https://github.com/TheSuperHackers/GeneralsGameCode into merge_SH
# Conflicts:
# Core/GameEngine/Include/Common/GameAudio.h
# Core/GameEngine/Include/GameClient/ParticleSys.h
# Core/GameEngine/Source/Common/INI/INIAudioEventInfo.cpp
# Core/GameEngine/Source/Common/INI/INIMiscAudio.cpp
# Core/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyCarrierDraw.h
# Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDefaultDraw.cpp
# Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDependencyCarrierDraw.cpp
# Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DLaserDraw.cpp
# Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
# Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordAircraftDraw.cpp
# Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTankDraw.cpp
# Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DOverlordTruckDraw.cpp
# GeneralsMD/Code/GameEngine/CMakeLists.txt
# GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h
# GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h
# GeneralsMD/Code/GameEngine/Include/GameClient/FXList.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h
# GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h
# GeneralsMD/Code/GameEngine/Source/Common/BitFlags.cpp
# GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp
# GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
# GeneralsMD/Code/GameEngine/Source/Common/RTS/Science.cpp
# GeneralsMD/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp
# GeneralsMD/Code/GameEngine/Source/Common/System/DisabledTypes.cpp
# GeneralsMD/Code/GameEngine/Source/Common/System/Upgrade.cpp
# GeneralsMD/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp
# GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp
# GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp
# GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
# GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
# GeneralsMD/Code/GameEngine/Source/GameClient/RadiusDecal.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/AI/TurretAI.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/VeterancyCrateCollide.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OpenContain.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/OverlordContain.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Die/CreateCrateDie.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/SpecialPower/OCLSpecialPower.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/ChinookAIUpdate.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/TransportAIUpdate.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HeightDieUpdate.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/LaserUpdate.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/PhysicsUpdate.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipDeploymentUpdate.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/WeaponBonusUpdate.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/CostModifierUpgrade.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/ExperienceScalarUpgrade.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Upgrade/MaxHealthUpgrade.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/Object/WeaponSet.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/System/CrateSystem.cpp
# GeneralsMD/Code/GameEngine/Source/GameLogic/System/Damage.cpp
# GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
# GeneralsMD/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp2,961 files changed
Lines changed: 52204 additions & 75252 deletions
File tree
- .github/workflows
- Core
- GameEngineDevice
- Include
- MilesAudioDevice
- W3DDevice
- Common
- GameClient
- Module
- Source
- MilesAudioDevice
- StdDevice/Common
- VideoDevice
- Bink
- FFmpeg
- W3DDevice
- Common/System
- GameClient
- Drawable/Draw
- Water
- Win32Device/Common
- GameEngine
- Include
- Common
- GameClient
- GameLogic
- GameNetwork
- GameSpy
- WOLBrowser
- Source
- Common
- Audio
- INI
- System
- GameClient
- GUI
- System
- Debug
- Terrain
- GameNetwork
- GameSpy
- Thread
- WOLBrowser
- Libraries
- Include/Lib
- Source
- Compression
- EAC
- LZHCompress
- EABrowserDispatch
- EABrowserEngine
- WWVegas
- WW3D2
- WWAudio
- WWDebug
- WWDownload
- WWLib
- WWMath
- WWSaveLoad
- WWStub
- debug
- debug_dlg
- netserv
- test2
- profile
- Tools
- Autorun
- Babylon
- CRCDiff
- Compress
- DebugWindow
- ImagePacker
- Include
- Source
- WindowProcedures
- Launcher
- DatGen
- Toolkit
- Debug
- Storage
- Support
- MapCacheBuilder/Source
- PATCHGET
- ParticleEditor
- res
- W3DView
- WW3D
- max2w3d
- pluglib
- assetcull
- buildVersionUpdate
- mangler
- wlib
- wnet
- matchbot
- wlib
- wnet
- textureCompress
- timingTest
- versionUpdate
- wolSetup
- WOLAPI
- Dependencies/Utility
- Utility
- GeneralsMD
- Code
- GameEngineDevice
- Include
- W3DDevice
- Common
- GameClient
- GameLogic
- Win32Device
- Common
- GameClient
- Source
- W3DDevice
- Common/System
- GameClient
- GUI
- GUICallbacks
- Gadget
- Shadow
- GameLogic
- Win32Device
- Common
- GameClient
- GameEngine
- Include
- Common
- GameClient
- GameLogic
- Module
- GameNetwork
- Precompiled
- Source
- Common
- INI
- RTS
- System
- SaveGame
- Thing
- GameClient
- Drawable/Update
- GUI
- ControlBar
- DisconnectMenu
- EstablishConnectionsMenu
- GUICallbacks
- Menus
- Gadget
- Shell
- Input
- MessageStream
- System
- GameLogic
- AI
- Map
- Object
- Behavior
- Body
- Collide
- CrateCollide
- Contain
- Create
- Damage
- Die
- SpecialPower
- Update
- AIUpdate
- DockUpdate
- ProductionExitUpdate
- Upgrade
- ScriptEngine
- System
- GameNetwork
- Libraries
- Include/Lib
- Source/WWVegas
- WW3D2
- WWAudio
- Main
- Tools
- GUIEdit
- Include
- Resource
- Source
- Dialog Procedures
- ParticleEditor
- res
- W3DView
- WorldBuilder
- include
- src
- wdump
- Generals
- Code
- GameEngineDevice
- Include
- W3DDevice
- Common
- GameClient
- Module
- GameLogic
- Win32Device
- Common
- GameClient
- Source
- W3DDevice
- Common/System
- GameClient
- Drawable/Draw
- GUI
- GUICallbacks
- Gadget
- Shadow
- GameLogic
- Win32Device
- Common
- GameClient
- GameEngine
- Include
- Common
- GameClient
- GameLogic
- Module
- GameNetwork
- Precompiled
- Source
- Common
- INI
- RTS
- System
- SaveGame
- Thing
- GameClient
- Drawable/Update
- GUI
- ControlBar
- DisconnectMenu
- EstablishConnectionsMenu
- GUICallbacks
- Menus
- Gadget
- Shell
- Input
- MessageStream
- System
- GameLogic
- AI
- Map
- Object
- Behavior
- Body
- Collide
- CrateCollide
- Contain
- Create
- Damage
- Die
- SpecialPower
- Update
- AIUpdate
- DockUpdate
- ProductionExitUpdate
- Upgrade
- ScriptEngine
- System
- GameNetwork
- Libraries
- Include/Lib
- Source/WWVegas
- WW3D2
- WWAudio
- Main
- Tools
- GUIEdit
- Include
- Resource
- Source
- Dialog Procedures
- ParticleEditor
- W3DView
- WorldBuilder
- include
- src
- cmake
- toolchains
- scripts
- clang-tidy-plugin
- readability
- cpp
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
0 commit comments