| spring: develop 3a1354f8 | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| Gajo Petrovic | Gajo Petrovic | develop | 2015-12-05 05:00:01 | develop 18e00270 |
| Changeset | Merge branch 'develop' into pr-downloader | |||
| mod - .travis.yml | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/AAI.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/E323AI | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/HughAI | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/Shard | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/JavaOO/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - buildbot/master/master.cfg | [ Diff ] [ File ] | |||
| mod - buildbot/slave/create-build-dirs.py | [ Diff ] [ File ] | |||
| mod - buildbot/slave/create-build-dirs.sh | [ Diff ] [ File ] | |||
| add - buildbot/slave/create-doc.sh | [ Diff ] [ File ] | |||
| rm - buildbot/slave/doxygen/update-docs.sh | [ Diff ] [ File ] | |||
| mod - buildbot/slave/rsync.sh | [ Diff ] [ File ] | |||
| mod - buildbot/slave/run-tests.sh | [ Diff ] [ File ] | |||
| mod - cont/base/maphelper/maphelper/mapdefaults.lua | [ Diff ] [ File ] | |||
| mod - cont/base/maphelper/maphelper/parse_tdf_map.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/shaders/GLSL/ModelFragProg.glsl | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl | [ Diff ] [ File ] | |||
| mod - doc/changelog.txt | [ Diff ] [ File ] | |||
| mod - installer/make_uninstall_nsh.py | [ 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/SkirmishAILibrary.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera.h | [ Diff ] [ File ] | |||
| mod - rts/Game/CameraHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameHelper.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/SelectedUnitsAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/TraceRay.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/GuiHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/MiniMap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaFeatureDefs.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaGaia.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaGaia.h | [ 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/LuaIntro.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaIntro.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaMaterial.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaMaterial.h | [ Diff ] [ File ] | |||
| add - rts/Lua/LuaObjectMaterial.h | [ Diff ] [ File ] | |||
| add - rts/Lua/LuaObjectRendering.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaOpenGL.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaRBOs.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaRBOs.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaRules.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaRules.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 ] | |||
| add - rts/Lua/LuaUICommand.cpp | [ Diff ] [ File ] | |||
| add - rts/Lua/LuaUICommand.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnitDefs.cpp | [ Diff ] [ File ] | |||
| rm - rts/Lua/LuaUnitMaterial.h | [ Diff ] [ File ] | |||
| rm - rts/Lua/LuaUnitRendering.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnsyncedCtrl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnsyncedRead.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUtils.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaVFS.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaVFS.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaZip.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/BaseGroundDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/BaseGroundDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Map/MapInfo.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/MapInfo.h | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/ROAM/RoamMeshDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/SMFGroundDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/SMFGroundTextures.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/SMFReadMap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/SMFReadMap.h | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/SMFRenderState.cpp | [ Diff ] [ File ] | |||
| mod - rts/Net/NetCommands.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/AVIGenerator.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - rts/Rendering/DebugColVolDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/AdvTreeDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/AdvWater.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/BasicTreeDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/BumpWater.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/CubeMapHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/CubeMapHandler.h | [ 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/DynWater.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/GrassDrawer.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/GL/GeometryBuffer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/GeometryBuffer.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/Light.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/VertexArray.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/HUDDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/InMapDrawView.cpp | [ Diff ] [ File ] | |||
| add - rts/Rendering/LuaObjectDrawer.cpp | [ Diff ] [ File ] | |||
| add - rts/Rendering/LuaObjectDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Map/InfoTexture/Modern/AirLos.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Map/InfoTexture/Modern/Los.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/3DModel.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/3DModel.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/3DOParser.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/3DOParser.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/AssParser.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/AssParser.h | [ 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/Models/WorldObjectModelRenderer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Shaders/Shader.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/ShadowHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitDrawer.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitDrawerState.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/WorldDrawer.cpp | [ 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/FeatureHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Features/FeatureHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/CollisionHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/CollisionHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/CollisionVolume.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/CollisionVolume.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/DefinitionTag.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/LosHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/LosHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/LosMap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/LosMap.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/QuadField.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/Team.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/Team.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/TeamHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/TeamHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/AAirMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/AAirMoveType.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/HoverAirMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/HoverAirMoveType.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/StrafeAirMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/StrafeAirMoveType.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Objects/SolidObject.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Objects/SolidObject.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Objects/SolidObjectDef.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Objects/SolidObjectDef.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Objects/WorldObject.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/Default/PathEstimator.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/ProjectileHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Scripts/CobInstance.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Scripts/CobInstance.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Scripts/LuaUnitScript.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Scripts/NullUnitScript.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Scripts/NullUnitScript.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Scripts/UnitScript.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Scripts/UnitScript.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Unit.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Unit.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDef.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDefHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDefHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitTypes/Builder.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitTypes/Factory.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/BeamLaser.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/LightningCannon.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/Weapon.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Config/ConfigVariable.h | [ Diff ] [ File ] | |||
| mod - rts/System/EventClient.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/EventClient.h | [ Diff ] [ File ] | |||
| mod - rts/System/EventHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/EventHandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/Events.def | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/DataDirLocater.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Info.h | [ Diff ] [ File ] | |||
| mod - rts/System/Log/Backend.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Log/DefaultFilter.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Option.h | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/CpuID.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/Threading.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sync/DumpState.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sync/HsiehHash.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sync/SyncDebugger.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/ThreadPool.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/ThreadPool.h | [ Diff ] [ File ] | |||
| mod - rts/System/Threading/SpringMutex.h | [ Diff ] [ File ] | |||
| mod - rts/System/Util.h | [ Diff ] [ File ] | |||
| mod - rts/System/creg/creg_runtime_tests.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/float4.h | [ Diff ] [ File ] | |||
| rm - rts/build/cmake/FindJavaExtended.cmake | [ Diff ] [ File ] | |||
| mod - rts/lib/lua/include/LuaUser.cpp | [ Diff ] [ File ] | |||
| mod - rts/lib/lua/include/LuaUser.h | [ Diff ] [ File ] | |||
| mod - rts/lib/lua/include/luaconf.h | [ Diff ] [ File ] | |||
| mod - test/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - test/engine/Sim/Misc/testQuadField.cpp | [ Diff ] [ File ] | |||
| mod - test/engine/System/testThreadPool.cpp | [ Diff ] [ File ] | |||
| add - test/other/testPrintf.cpp | [ Diff ] [ File ] | |||
| mod - test/validation/run.sh | [ Diff ] [ File ] | |||
| mod - tools/DemoTool/DemoTool.cpp | [ Diff ] [ File ] | |||
| mod - tools/scripts/travis_before_install.sh | [ Diff ] [ File ] | |||
| add - tools/scripts/travis_before_script.sh | [ Diff ] [ File ] | |||
| mod - tools/scripts/travis_install.sh | [ Diff ] [ File ] | |||
| mod - tools/unitsync/CMakeLists.txt | [ Diff ] [ File ] | |||
| rm - tools/unitsync/Doxyfile | [ Diff ] [ File ] | |||
| mod - tools/unitsync/unitsync.cpp | [ Diff ] [ File ] | |||
| mod - tools/unitsync/unitsync.h | [ Diff ] [ File ] | |||
| mod - tools/unitsync/unitsync_api.h | [ Diff ] [ File ] | |||
