2025-08-29 10:34 CEST
  

spring: maintenance 063ed815 [ Diff ] [ Back to Repository ]
Author Committer Branch Timestamp Parent
Gajo Petrovic Gajo Petrovic maintenance 2018-11-17 10:14:54 maintenance 06a7c46b
Changeset Merge a vast amount of small changes from develop into maintenance
This basically merges various changes that I don't think will be included with cherry-pick.

This has been merged manually by using a Folder diff and merge tool (meld) with very little typing.
All of these changes exist in the develop branch.
Most of the changes are obvious NLC (syntax cleanup, NULL->nullptr and similar).
In the case of more complex changes, those are bits of code contained in develop that I think should be included in maintenance and tested ASAP.

The purpose of this was to make the eventual switch to develop less open to (non-GL) bugs.
If there are any unwanted difference in behavior caused by this, please fix it through develop first.
mod - rts/ExternalAI/AICallback.cpp [ Diff ] [ File ]
mod - rts/Game/GameHelper.cpp [ Diff ] [ File ]
mod - rts/Game/LoadScreen.cpp [ Diff ] [ File ]
mod - rts/Game/UnsyncedGameCommands.cpp [ Diff ] [ File ]
mod - rts/Game/WaitCommandsAI.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaConstGL.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaFonts.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaHandleSynced.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaMaterial.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaObjectRendering.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaOpenGL.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaOpenGLUtils.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaShaders.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedCtrl.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaTextures.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedRead.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUtils.cpp [ Diff ] [ File ]
mod - rts/Map/Generation/SimpleMapGenerator.cpp [ Diff ] [ File ]
mod - rts/Map/HeightMapTexture.cpp [ Diff ] [ File ]
mod - rts/Map/MapInfo.cpp [ Diff ] [ File ]
mod - rts/Map/ReadMap.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/SMFMapFile.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/SMFReadMap.cpp [ Diff ] [ File ]
mod - rts/Menu/SelectMenu.cpp [ Diff ] [ File ]
mod - rts/Menu/SelectionWidget.cpp [ Diff ] [ File ]
mod - rts/Rendering/DebugDrawerAI.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/AdvWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/BumpWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Decals/DecalsDrawerGL4.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Decals/GroundDecalHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/Classes/BitmapMuzzleFlame.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/Classes/BubbleProjectile.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/Classes/DirtProjectile.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/Classes/ExploSpikeProjectile.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/Classes/GenericParticleProjectile.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/Classes/HeatCloudProjectile.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/Classes/MuzzleFlame.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/Classes/NanoProjectile.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/Classes/ShieldSegmentProjectile.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/Classes/SimpleParticleSystem.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/Classes/SmokeProjectile.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/Classes/SmokeProjectile2.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/Particles/Classes/SpherePartProjectile.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/SkyBox.h [ Diff ] [ File ]
mod - rts/Rendering/FarTextureHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/FeatureDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/Fonts/CFontTexture.cpp [ Diff ] [ File ]
mod - rts/Rendering/Fonts/CFontTexture.h [ Diff ] [ File ]
mod - rts/Rendering/Fonts/TextWrap.cpp [ Diff ] [ File ]
mod - rts/Rendering/GlobalRendering.h [ Diff ] [ File ]
mod - rts/Rendering/GroundFlash.cpp [ Diff ] [ File ]
mod - rts/Rendering/HUDDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/IconHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/InMapDrawView.cpp [ Diff ] [ File ]
mod - rts/Rendering/LuaObjectDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/Map/InfoTexture/IInfoTextureHandler.h [ Diff ] [ File ]
mod - rts/Rendering/Map/InfoTexture/InfoTexture.cpp [ Diff ] [ File ]
mod - rts/Rendering/Map/InfoTexture/Modern/InfoTextureHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/Map/InfoTexture/Modern/Path.cpp [ Diff ] [ File ]
mod - rts/Rendering/Models/3DModel.cpp [ Diff ] [ File ]
mod - rts/Rendering/Models/3DOParser.cpp [ Diff ] [ File ]
mod - rts/Rendering/Models/AssIO.cpp [ Diff ] [ File ]
mod - rts/Rendering/Models/AssIO.h [ Diff ] [ File ]
mod - rts/Rendering/Models/AssParser.cpp [ Diff ] [ File ]
mod - rts/Rendering/Models/IModelParser.cpp [ Diff ] [ File ]
mod - rts/Rendering/Textures/ColorMap.cpp [ Diff ] [ File ]
mod - rts/Rendering/Textures/LegacyAtlasAlloc.cpp [ Diff ] [ File ]
mod - rts/Rendering/Textures/NamedTextures.cpp [ Diff ] [ File ]
mod - rts/Rendering/Textures/QuadtreeAtlasAlloc.cpp [ Diff ] [ File ]
mod - rts/Rendering/Textures/RowAtlasAlloc.cpp [ Diff ] [ File ]
mod - rts/Rendering/WorldDrawer.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/Team.cpp [ Diff ] [ File ]
mod - rts/Sim/Path/Default/PathEstimator.h [ Diff ] [ File ]
mod - rts/Sim/Units/UnitDefHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitDefHandler.h [ Diff ] [ File ]
mod - rts/System/EventHandler.h [ Diff ] [ File ]
mod - rts/System/Rectangle.h [ Diff ] [ File ]
mod - test/README.md [ Diff ] [ File ]