2025-08-07 22:04 CEST

spring: develop f954404a Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
abma abma develop 2014-10-07 20:45:22 develop 951cb63a
Changeset Merge branch 'develop'
mod - .travis.yml Diff ] File ]
mod - AI/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/C/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/C/src/Interface.h Diff ] File ]
mod - AI/Interfaces/Java/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/Java/bin/jni_wrappCallback.awk Diff ] File ]
mod - AI/Interfaces/Java/src/main/native/JavaBridge.c Diff ] File ]
mod - AI/Skirmish/AAI/AAI.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAI.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIAirForceManager.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIAirForceManager.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIAttack.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIAttack.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIAttackManager.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIAttackManager.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIBrain.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIBrain.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIBuildTable.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIBuildTable.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIBuildTask.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIBuildTask.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIConfig.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIConfig.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIConstructor.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIConstructor.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIExecute.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIExecute.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIGroup.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIGroup.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIMap.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIMap.h Diff ] File ]
mod - AI/Skirmish/AAI/AAISector.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAISector.h Diff ] File ]
mod - AI/Skirmish/AAI/AAIUnitTable.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIUnitTable.h Diff ] File ]
mod - AI/Skirmish/AAI/AIExport.h Diff ] File ]
mod - AI/Skirmish/AAI/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/AAI/aidef.h Diff ] File ]
mod - AI/Skirmish/CppTestAI/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/E323AI Diff ] File ]
mod - AI/Skirmish/KAIK Diff ] File ]
mod - AI/Skirmish/RAI/Builder.cpp Diff ] File ]
mod - AI/Skirmish/RAI/BuilderPlacement.cpp Diff ] File ]
mod - AI/Skirmish/RAI/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/RAI/RAI.cpp Diff ] File ]
mod - AI/Skirmish/RAI/UnitDefHandler.cpp Diff ] File ]
mod - AI/Skirmish/Shard Diff ] File ]
mod - AI/Wrappers/CMakeLists.txt Diff ] File ]
mod - AI/Wrappers/CUtils/CMakeLists.txt Diff ] File ]
mod - AI/Wrappers/CUtils/SharedLibrary.c Diff ] File ]
mod - AI/Wrappers/CUtils/SharedLibrary.h Diff ] File ]
mod - AI/Wrappers/CUtils/SimpleLog.h Diff ] File ]
mod - AI/Wrappers/CUtils/Util.c Diff ] File ]
mod - AI/Wrappers/CUtils/Util.h Diff ] File ]
mod - AI/Wrappers/Cpp/CMakeLists.txt Diff ] File ]
mod - AI/Wrappers/Cpp/bin/combine_wrappCommands.awk Diff ] File ]
mod - AI/Wrappers/Cpp/bin/wrappCallback.awk Diff ] File ]
mod - AI/Wrappers/JavaOO/CMakeLists.txt Diff ] File ]
mod - AI/Wrappers/JavaOO/bin/wrappCallback.awk Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Command.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/Command.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/CommandQueue.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/DamageArray.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/DamageArray.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/FeatureDef.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/MoveData.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/MoveData.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/WeaponDef.h Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
mod - README.markdown Diff ] File ]
mod - buildbot/master/master.cfg Diff ] File ]
mod - buildbot/slave/cppcheck/cppcheck.supress Diff ] File ]
mod - buildbot/slave/validation/tests-prepare.sh Diff ] File ]
mod - buildbot/version_list/list.php Diff ] File ]
mod - cont/LuaUI/widgets.lua Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/actions.lua Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/callins.lua Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/gadgets.lua Diff ] File ]
mod - cont/base/springcontent/gamedata/weapondefs_post.lua Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/GrassFragProg.glsl Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/GrassVertProg.glsl Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/SMFVertProg.glsl Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/TreeFragProg.glsl Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/TreeVertProg.glsl Diff ] File ]
mod - doc/CMakeLists.txt Diff ] File ]
mod - doc/changelog.txt Diff ] File ]
mod - rts/CMakeLists.txt Diff ] File ]
mod - rts/ExternalAI/AICallback.cpp Diff ] File ]
mod - rts/ExternalAI/AIInterfaceKey.cpp Diff ] File ]
mod - rts/ExternalAI/AIInterfaceKey.h Diff ] File ]
mod - rts/ExternalAI/AILibraryManager.cpp Diff ] File ]
mod - rts/ExternalAI/CMakeLists.txt Diff ] File ]
mod - rts/ExternalAI/EngineOutHandler.cpp Diff ] File ]
mod - rts/ExternalAI/EngineOutHandler.h Diff ] File ]
mod - rts/ExternalAI/Interface/SSkirmishAICallback.h Diff ] File ]
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp Diff ] File ]
mod - rts/ExternalAI/SSkirmishAICallbackImpl.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAIBase.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAIData.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIData.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAIHandler.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIHandler.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAIKey.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIKey.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.h Diff ] File ]
mod - rts/Game/CMakeLists.txt Diff ] File ]
mod - rts/Game/Camera.cpp Diff ] File ]
mod - rts/Game/Camera/OverheadController.cpp Diff ] File ]
mod - rts/Game/Camera/SmoothController.cpp Diff ] File ]
mod - rts/Game/CameraHandler.cpp Diff ] File ]
mod - rts/Game/ClientSetup.cpp Diff ] File ]
mod - rts/Game/FPSUnitController.cpp Diff ] File ]
mod - rts/Game/Game.cpp Diff ] File ]
mod - rts/Game/Game.h Diff ] File ]
mod - rts/Game/GameHelper.cpp Diff ] File ]
mod - rts/Game/GameSetup.cpp Diff ] File ]
mod - rts/Game/GameSetup.h Diff ] File ]
mod - rts/Game/GameVersion.h Diff ] File ]
mod - rts/Game/GlobalUnsynced.cpp Diff ] File ]
mod - rts/Game/GlobalUnsynced.h Diff ] File ]
mod - rts/Game/IActionExecutor.h Diff ] File ]
mod - rts/Game/InMapDraw.cpp Diff ] File ]
mod - rts/Game/InMapDrawModel.cpp Diff ] File ]
mod - rts/Game/InMapDrawModel.h Diff ] File ]
mod - rts/Game/LoadScreen.cpp Diff ] File ]
mod - rts/Game/Players/Player.cpp Diff ] File ]
mod - rts/Game/Players/Player.h Diff ] File ]
mod - rts/Game/Players/PlayerBase.cpp Diff ] File ]
mod - rts/Game/Players/PlayerBase.h Diff ] File ]
mod - rts/Game/Players/PlayerHandler.cpp Diff ] File ]
mod - rts/Game/Players/PlayerHandler.h Diff ] File ]
mod - rts/Game/Players/PlayerStatistics.cpp Diff ] File ]
mod - rts/Game/Players/PlayerStatistics.h Diff ] File ]
mod - rts/Game/Players/TeamController.cpp Diff ] File ]
mod - rts/Game/Players/TeamController.h Diff ] File ]
mod - rts/Game/SelectedUnitsHandler.cpp Diff ] File ]
mod - rts/Game/SyncedGameCommands.cpp Diff ] File ]
mod - rts/Game/TraceRay.cpp Diff ] File ]
mod - rts/Game/TraceRay.h Diff ] File ]
mod - rts/Game/UI/CursorIcons.cpp Diff ] File ]
mod - rts/Game/UI/EndGameBox.cpp Diff ] File ]
mod - rts/Game/UI/GameInfo.cpp Diff ] File ]
mod - rts/Game/UI/GuiHandler.cpp Diff ] File ]
mod - rts/Game/UI/InfoConsole.cpp Diff ] File ]
mod - rts/Game/UI/InfoConsole.h Diff ] File ]
mod - rts/Game/UI/KeyBindings.cpp Diff ] File ]
mod - rts/Game/UI/KeySet.cpp Diff ] File ]
mod - rts/Game/UI/KeySet.h Diff ] File ]
mod - rts/Game/UI/MiniMap.cpp Diff ] File ]
mod - rts/Game/UI/MiniMap.h Diff ] File ]
mod - rts/Game/UI/MouseHandler.cpp Diff ] File ]
mod - rts/Game/UI/ProfileDrawer.cpp Diff ] File ]
mod - rts/Game/UI/ResourceBar.cpp Diff ] File ]
mod - rts/Game/UI/SelectionKeyHandler.cpp Diff ] File ]
mod - rts/Game/UI/StartPosSelecter.cpp Diff ] File ]
mod - rts/Game/UI/StartPosSelecter.h Diff ] File ]
mod - rts/Game/UnsyncedGameCommands.cpp Diff ] File ]
mod - rts/Game/WaitCommandsAI.cpp Diff ] File ]
mod - rts/Game/WaitCommandsAI.h Diff ] File ]
mod - rts/Game/WordCompletion.cpp Diff ] File ]
mod - rts/Lua/CMakeLists.txt Diff ] File ]
add - rts/Lua/LuaArchive.cpp Diff ] File ]
add - rts/Lua/LuaArchive.h Diff ] File ]
mod - rts/Lua/LuaConstCMD.cpp Diff ] File ]
mod - rts/Lua/LuaDefs.h Diff ] File ]
mod - rts/Lua/LuaDisplayLists.h Diff ] File ]
mod - rts/Lua/LuaFBOs.cpp Diff ] File ]
mod - rts/Lua/LuaFBOs.h Diff ] File ]
mod - rts/Lua/LuaFeatureDefs.cpp Diff ] File ]
mod - rts/Lua/LuaHandle.cpp Diff ] File ]
mod - rts/Lua/LuaHandle.h Diff ] File ]
mod - rts/Lua/LuaHandleSynced.cpp Diff ] File ]
mod - rts/Lua/LuaHandleSynced.h Diff ] File ]
mod - rts/Lua/LuaIntro.cpp Diff ] File ]
mod - rts/Lua/LuaOpenGL.cpp Diff ] File ]
mod - rts/Lua/LuaOpenGL.h Diff ] File ]
mod - rts/Lua/LuaParser.cpp Diff ] File ]
mod - rts/Lua/LuaRulesParams.cpp Diff ] File ]
mod - rts/Lua/LuaRulesParams.h Diff ] File ]
mod - rts/Lua/LuaSyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedCtrl.h Diff ] File ]
mod - rts/Lua/LuaSyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedRead.h Diff ] File ]
mod - rts/Lua/LuaUI.cpp Diff ] File ]
mod - rts/Lua/LuaUnitDefs.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/Lua/LuaVFS.cpp Diff ] File ]
mod - rts/Lua/LuaVFS.h Diff ] File ]
mod - rts/Map/BaseGroundDrawer.cpp Diff ] File ]
mod - rts/Map/BaseGroundDrawer.h Diff ] File ]
mod - rts/Map/BasicMapDamage.cpp Diff ] File ]
mod - rts/Map/CMakeLists.txt Diff ] File ]
mod - rts/Map/HeightMapTexture.cpp Diff ] File ]
mod - rts/Map/MapInfo.cpp Diff ] File ]
mod - rts/Map/MapInfo.h Diff ] File ]
mod - rts/Map/MetalMap.cpp Diff ] File ]
mod - rts/Map/MetalMap.h Diff ] File ]
mod - rts/Map/ReadMap.cpp Diff ] File ]
mod - rts/Map/ReadMap.h Diff ] File ]
mod - rts/Map/SM3/SM3Map.cpp Diff ] File ]
mod - rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp Diff ] File ]
mod - rts/Map/SMF/Legacy/LegacyMeshDrawer.h Diff ] File ]
mod - rts/Map/SMF/ROAM/RoamMeshDrawer.cpp Diff ] File ]
mod - rts/Map/SMF/SMFGroundTextures.cpp Diff ] File ]
mod - rts/Map/SMF/SMFReadMap.cpp Diff ] File ]
mod - rts/Map/SMF/SMFRenderState.cpp Diff ] File ]
mod - rts/Map/SMF/SMFRenderState.h Diff ] File ]
mod - rts/Menu/CMakeLists.txt Diff ] File ]
mod - rts/Net/CMakeLists.txt Diff ] File ]
mod - rts/Net/GameServer.cpp Diff ] File ]
mod - rts/Net/GameServer.h Diff ] File ]
mod - rts/Net/NetCommands.cpp Diff ] File ]
mod - rts/Rendering/CMakeLists.txt Diff ] File ]
mod - rts/Rendering/Colors.h Diff ] File ]
mod - rts/Rendering/DebugColVolDrawer.h Diff ] File ]
mod - rts/Rendering/DefaultPathDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvSky.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvTreeDrawer.h Diff ] File ]
mod - rts/Rendering/Env/AdvWater.cpp Diff ] File ]
mod - rts/Rendering/Env/BasicTreeDrawer.h Diff ] File ]
mod - rts/Rendering/Env/BasicWater.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/DynWater.cpp Diff ] File ]
mod - rts/Rendering/Env/GrassDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/GrassDrawer.h Diff ] File ]
mod - rts/Rendering/Env/ISky.cpp Diff ] File ]
mod - rts/Rendering/Env/ITreeDrawer.h Diff ] File ]
mod - rts/Rendering/Env/IWater.cpp Diff ] File ]
mod - rts/Rendering/FeatureDrawer.cpp Diff ] File ]
mod - rts/Rendering/FeatureDrawer.h Diff ] File ]
mod - rts/Rendering/Fonts/CFontTexture.cpp Diff ] File ]
mod - rts/Rendering/Fonts/TextWrap.cpp Diff ] File ]
mod - rts/Rendering/Fonts/glFont.cpp Diff ] File ]
mod - rts/Rendering/Fonts/ustring.h Diff ] File ]
mod - rts/Rendering/GL/GeometryBuffer.h Diff ] File ]
mod - rts/Rendering/GL/Light.h Diff ] File ]
mod - rts/Rendering/GL/LightHandler.h Diff ] File ]
mod - rts/Rendering/GL/PBO.h Diff ] File ]
mod - rts/Rendering/GL/VBO.cpp Diff ] File ]
mod - rts/Rendering/GL/VBO.h Diff ] File ]
mod - rts/Rendering/GL/VertexArray.cpp Diff ] File ]
mod - rts/Rendering/GL/VertexArray.h Diff ] File ]
mod - rts/Rendering/GL/VertexArray.inl Diff ] File ]
mod - rts/Rendering/GL/glExtra.cpp Diff ] File ]
mod - rts/Rendering/GL/myGL.cpp Diff ] File ]
mod - rts/Rendering/GL/myGL.h Diff ] File ]
mod - rts/Rendering/GLContext.h Diff ] File ]
mod - rts/Rendering/GlobalRendering.cpp Diff ] File ]
mod - rts/Rendering/GlobalRendering.h Diff ] File ]
mod - rts/Rendering/GroundFlash.cpp Diff ] File ]
mod - rts/Rendering/GroundFlash.h Diff ] File ]
mod - rts/Rendering/IPathDrawer.cpp Diff ] File ]
mod - rts/Rendering/Icon.h Diff ] File ]
mod - rts/Rendering/IconHandler.cpp Diff ] File ]
mod - rts/Rendering/IconHandler.h Diff ] File ]
mod - rts/Rendering/Models/3DModel.cpp Diff ] File ]
mod - rts/Rendering/Models/3DModel.h Diff ] File ]
mod - rts/Rendering/Models/AssParser.cpp Diff ] File ]
mod - rts/Rendering/Models/IModelParser.cpp Diff ] File ]
mod - rts/Rendering/Models/IModelParser.h Diff ] File ]
mod - rts/Rendering/Models/OBJParser.cpp Diff ] File ]
mod - rts/Rendering/Models/S3OParser.cpp Diff ] File ]
mod - rts/Rendering/ProjectileDrawer.cpp Diff ] File ]
mod - rts/Rendering/ProjectileDrawer.h Diff ] File ]
mod - rts/Rendering/QTPFSPathDrawer.h Diff ] File ]
mod - rts/Rendering/Shaders/Shader.cpp Diff ] File ]
mod - rts/Rendering/Shaders/Shader.h Diff ] File ]
mod - rts/Rendering/Shaders/ShaderStates.cpp Diff ] File ]
mod - rts/Rendering/Shaders/ShaderStates.h Diff ] File ]
mod - rts/Rendering/ShadowHandler.cpp Diff ] File ]
mod - rts/Rendering/ShadowHandler.h Diff ] File ]
mod - rts/Rendering/SmoothHeightMeshDrawer.cpp Diff ] File ]
mod - rts/Rendering/Textures/Bitmap.cpp Diff ] File ]
mod - rts/Rendering/Textures/Bitmap.h Diff ] File ]
mod - rts/Rendering/Textures/ColorMap.cpp Diff ] File ]
mod - rts/Rendering/Textures/ColorMap.h Diff ] File ]
mod - rts/Rendering/Textures/NamedTextures.h Diff ] File ]
mod - rts/Rendering/Textures/S3OTextureHandler.cpp Diff ] File ]
mod - rts/Rendering/Textures/TextureAtlas.cpp Diff ] File ]
mod - rts/Rendering/Textures/TextureAtlas.h Diff ] File ]
mod - rts/Rendering/UnitDrawer.cpp Diff ] File ]
mod - rts/Rendering/UnitDrawerState.cpp Diff ] File ]
mod - rts/Rendering/WorldDrawer.cpp Diff ] File ]
mod - rts/Sim/CMakeLists.txt Diff ] File ]
mod - rts/Sim/Features/Feature.cpp Diff ] File ]
mod - rts/Sim/Features/Feature.h Diff ] File ]
mod - rts/Sim/Features/FeatureDef.cpp Diff ] File ]
mod - rts/Sim/Features/FeatureDef.h Diff ] File ]
mod - rts/Sim/Features/FeatureHandler.cpp Diff ] File ]
mod - rts/Sim/Features/FeatureHandler.h Diff ] File ]
mod - rts/Sim/Misc/AirBaseHandler.cpp Diff ] File ]