spring: develop 8563243b |
[ Diff ] [ Back to Repository ] |
Author |
Committer |
Branch |
Timestamp |
Parent |
Gajo Petrovic |
Gajo Petrovic |
develop |
2015-02-21 04:31:29 |
develop f2895ffe |
Changeset |
Merge remote-tracking branch 'origin/develop' into pr-downloader |
add - buildbot/master/.gitignore |
[ Diff ] [ File ] |
mod - buildbot/master/master.cfg |
[ Diff ] [ File ] |
add - buildbot/master/passwords.py.template |
[ Diff ] [ File ] |
mod - buildbot/master/public_html/default.css |
[ Diff ] [ File ] |
mod - buildbot/master/public_html/robots.txt |
[ Diff ] [ File ] |
rm - buildbot/master/templates/forms.html |
[ Diff ] [ File ] |
mod - buildbot/slave/linux/create_linux_static_bundle.sh |
[ Diff ] [ File ] |
mod - buildbot/slave/win/make_installer.sh |
[ Diff ] [ File ] |
mod - doc/changelog.txt |
[ Diff ] [ File ] |
mod - installer/make_installer.sh |
[ Diff ] [ File ] |
mod - installer/sections/deprecated.nsh |
[ Diff ] [ File ] |
mod - installer/sections/sectiondesc.nsh |
[ Diff ] [ File ] |
mod - installer/sections/setupSections.nsh |
[ Diff ] [ File ] |
mod - installer/sections/shortcuts_desktop.nsh |
[ Diff ] [ File ] |
mod - installer/sections/shortcuts_startMenu.nsh |
[ Diff ] [ File ] |
rm - installer/sections/zeroK.nsh |
[ Diff ] [ File ] |
mod - installer/spring.nsi |
[ Diff ] [ File ] |
mod - rts/ExternalAI/AICallback.cpp |
[ Diff ] [ File ] |
mod - rts/ExternalAI/EngineOutHandler.cpp |
[ Diff ] [ File ] |
mod - rts/ExternalAI/EngineOutHandler.h |
[ Diff ] [ File ] |
mod - rts/ExternalAI/IAILibraryManager.cpp |
[ Diff ] [ File ] |
mod - rts/ExternalAI/IAILibraryManager.h |
[ Diff ] [ File ] |
mod - rts/ExternalAI/Interface/SSkirmishAICallback.h |
[ Diff ] [ File ] |
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp |
[ Diff ] [ File ] |
mod - rts/ExternalAI/SkirmishAIHandler.cpp |
[ Diff ] [ File ] |
mod - rts/ExternalAI/SkirmishAIHandler.h |
[ Diff ] [ File ] |
mod - rts/Game/Benchmark.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Benchmark.h |
[ Diff ] [ File ] |
mod - rts/Game/Camera.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera/CameraController.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera/FPSController.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera/OverheadController.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera/OverviewController.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera/RotOverheadController.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera/SpringController.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Console.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Console.h |
[ 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/GameData.cpp |
[ Diff ] [ File ] |
mod - rts/Game/GameData.h |
[ Diff ] [ File ] |
mod - rts/Game/GameHelper.cpp |
[ Diff ] [ File ] |
add - rts/Game/GameJobDispatcher.h |
[ Diff ] [ File ] |
mod - rts/Game/GameSetup.cpp |
[ Diff ] [ File ] |
mod - rts/Game/GameSetup.h |
[ Diff ] [ File ] |
mod - rts/Game/GlobalUnsynced.cpp |
[ Diff ] [ File ] |
mod - rts/Game/GlobalUnsynced.h |
[ Diff ] [ File ] |
mod - rts/Game/InMapDraw.cpp |
[ Diff ] [ File ] |
mod - rts/Game/InMapDrawModel.cpp |
[ Diff ] [ File ] |
mod - rts/Game/LoadScreen.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Players/PlayerHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Players/PlayerHandler.h |
[ Diff ] [ File ] |
mod - rts/Game/PreGame.cpp |
[ Diff ] [ File ] |
mod - rts/Game/PreGame.h |
[ Diff ] [ File ] |
mod - rts/Game/SelectedUnitsHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Game/SyncedGameCommands.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/GameInfo.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/GameInfo.h |
[ Diff ] [ File ] |
mod - rts/Game/UI/KeyBindings.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/MiniMap.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/QuitBox.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/QuitBox.h |
[ Diff ] [ File ] |
mod - rts/Game/UI/ResourceBar.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/ShareBox.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/StartPosSelecter.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/TooltipConsole.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UnsyncedGameCommands.cpp |
[ Diff ] [ File ] |
mod - rts/Game/WordCompletion.cpp |
[ Diff ] [ File ] |
mod - rts/Game/WordCompletion.h |
[ Diff ] [ File ] |
mod - rts/Lua/LuaConstGame.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaContextData.h |
[ Diff ] [ File ] |
mod - rts/Lua/LuaDefs.h |
[ Diff ] [ File ] |
mod - rts/Lua/LuaFeatureDefs.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaFeatureDefs.h |
[ Diff ] [ File ] |
mod - rts/Lua/LuaGaia.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaHandle.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaHandleSynced.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaIntro.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaOpenGL.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaOpenGLUtils.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaPathFinder.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaRules.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaSyncedCtrl.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaSyncedMoveCtrl.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaSyncedRead.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaUI.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaUnitDefs.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaUnitDefs.h |
[ Diff ] [ File ] |
mod - rts/Lua/LuaUnsyncedCtrl.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaUnsyncedCtrl.h |
[ Diff ] [ File ] |
mod - rts/Lua/LuaUnsyncedRead.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaUtils.h |
[ Diff ] [ File ] |
mod - rts/Lua/LuaWeaponDefs.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaWeaponDefs.h |
[ Diff ] [ File ] |
mod - rts/Map/BaseGroundDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Map/BasicMapDamage.cpp |
[ Diff ] [ File ] |
mod - rts/Map/Ground.cpp |
[ Diff ] [ File ] |
mod - rts/Map/Ground.h |
[ Diff ] [ File ] |
mod - rts/Map/HeightMapTexture.cpp |
[ 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/ROAM/Patch.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/SMFRenderState.cpp |
[ Diff ] [ File ] |
mod - rts/Menu/SelectMenu.cpp |
[ Diff ] [ File ] |
mod - rts/Net/GameParticipant.cpp |
[ 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/Net/Protocol/BaseNetProtocol.cpp |
[ Diff ] [ File ] |
mod - rts/Net/Protocol/BaseNetProtocol.h |
[ Diff ] [ File ] |
mod - rts/Net/Protocol/NetProtocol.cpp |
[ Diff ] [ File ] |
mod - rts/Net/Protocol/NetProtocol.h |
[ Diff ] [ File ] |
mod - rts/Rendering/CommandDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/CommandDrawer.h |
[ Diff ] [ File ] |
mod - rts/Rendering/DebugColVolDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/DefaultPathDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Env/AdvTreeDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Env/BasicTreeDrawer.cpp |
[ 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/RefractWater.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/FeatureDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Fonts/CFontTexture.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/GL/myGL.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/GlobalRendering.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/GlobalRendering.h |
[ Diff ] [ File ] |
mod - rts/Rendering/IPathDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/InMapDrawView.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Map/InfoTexture/Legacy/LegacyInfoTextureHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Map/InfoTexture/Modern/Combiner.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Map/InfoTexture/Modern/Height.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Map/InfoTexture/Modern/Metal.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Map/InfoTexture/Modern/MetalExtraction.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Map/InfoTexture/Modern/Path.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/ProjectileDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/QTPFSPathDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Shaders/Shader.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Shaders/Shader.h |
[ Diff ] [ File ] |
mod - rts/Rendering/Shaders/ShaderHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Shaders/ShaderHandler.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/Textures/NamedTextures.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/WorldDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/WorldDrawer.h |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/CategoryHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/CategoryHandler.h |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/CollisionHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/GeometricObjects.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/GlobalSynced.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/GlobalSynced.h |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/GroundBlockingObjectMap.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/GroundBlockingObjectMap.h |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/LosHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/LosMap.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/ModInfo.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/ModInfo.h |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/QuadField.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/RadarHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/ResourceHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/ResourceHandler.h |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/SideParser.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/SideParser.h |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/Team.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/TeamHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/TeamHandler.h |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/ClassicGroundMoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/GroundMoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/MoveMath/MoveMath.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Objects/SolidObject.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Path/Default/IPathFinder.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Path/Default/PathConstants.h |
[ Diff ] [ File ] |
mod - rts/Sim/Path/Default/PathDataTypes.h |
[ Diff ] [ File ] |
mod - rts/Sim/Path/Default/PathEstimator.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Path/Default/PathFlowMap.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Path/Default/PathHeatMap.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Path/Default/PathManager.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Path/IPathManager.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Path/IPathManager.h |
[ Diff ] [ File ] |
mod - rts/Sim/Path/QTPFS/Node.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Path/QTPFS/NodeLayer.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Path/QTPFS/PathManager.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Path/QTPFS/PathSearch.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/CommandAI/AirCAI.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/CommandAI/BuilderCAI.h |
[ Diff ] [ File ] |
mod - rts/Sim/Units/Scripts/CobInstance.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/Scripts/CobScriptNames.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/Scripts/LuaScriptNames.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/Scripts/LuaUnitScript.cpp |
[ 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/UnitLoader.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/UnitTypes/Builder.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/UnitTypes/ExtractorBuilding.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/WeaponDef.cpp |
[ Diff ] [ File ] |
mod - rts/System/CMakeLists.txt |
[ Diff ] [ File ] |
mod - rts/System/EventBatchHandler.cpp |
[ Diff ] [ File ] |
mod - rts/System/EventHandler.cpp |
[ Diff ] [ File ] |
mod - rts/System/EventHandler.h |
[ Diff ] [ File ] |
mod - rts/System/FileSystem/FileSystemInitializer.cpp |
[ Diff ] [ File ] |
mod - rts/System/FileSystem/FileSystemInitializer.h |
[ Diff ] [ File ] |
mod - rts/System/FileSystem/VFSHandler.cpp |
[ Diff ] [ File ] |
mod - rts/System/FileSystem/VFSHandler.h |
[ Diff ] [ File ] |
mod - rts/System/LoadSave/CregLoadSaveHandler.cpp |
[ Diff ] [ File ] |
mod - rts/System/LoadSave/LuaLoadSaveHandler.cpp |
[ Diff ] [ File ] |
mod - rts/System/Log/FramePrefixer.cpp |
[ Diff ] [ File ] |
mod - rts/System/Net/LocalConnection.cpp |
[ Diff ] [ File ] |
mod - rts/System/Net/LocalConnection.h |
[ Diff ] [ File ] |
mod - rts/System/Net/UDPConnection.h |
[ Diff ] [ File ] |
mod - rts/System/Sound/ISound.cpp |
[ Diff ] [ File ] |
mod - rts/System/Sound/ISound.h |
[ Diff ] [ File ] |
mod - rts/System/Sound/Null/NullSound.cpp |
[ Diff ] [ File ] |
mod - rts/System/Sound/Null/NullSound.h |
[ Diff ] [ File ] |
mod - rts/System/Sound/OpenAL/Sound.cpp |
[ Diff ] [ File ] |
mod - rts/System/Sound/OpenAL/Sound.h |
[ Diff ] [ File ] |
mod - rts/System/SpringApp.cpp |
[ Diff ] [ File ] |
mod - rts/System/SpringApp.h |
[ Diff ] [ File ] |
mod - rts/System/Sync/HsiehHash.h |
[ Diff ] [ File ] |
mod - rts/System/Sync/SyncDebugger.cpp |
[ Diff ] [ File ] |
mod - rts/System/Sync/SyncedFloat3.h |
[ Diff ] [ File ] |
add - rts/System/Threading/CriticalSection.cpp |
[ Diff ] [ File ] |
add - rts/System/Threading/CriticalSection.h |
[ Diff ] [ File ] |
add - rts/System/Threading/Futex.cpp |
[ Diff ] [ File ] |
add - rts/System/Threading/Futex.h |
[ Diff ] [ File ] |
add - rts/System/Threading/SpringMutex.h |
[ Diff ] [ File ] |
mod - rts/System/TimeProfiler.cpp |
[ Diff ] [ File ] |
mod - rts/System/TimeProfiler.h |
[ Diff ] [ File ] |
mod - rts/System/creg/creg_runtime_tests.cpp |
[ Diff ] [ File ] |
mod - rts/System/float3.h |
[ Diff ] [ File ] |
mod - rts/builds/dedicated/CMakeLists.txt |
[ Diff ] [ File ] |
mod - rts/builds/dedicated/main.cpp |
[ Diff ] [ File ] |
mod - rts/lib/lua/include/LuaUser.cpp |
[ Diff ] [ File ] |
mod - test/CMakeLists.txt |
[ Diff ] [ File ] |
add - test/other/testMutex.cpp |
[ Diff ] [ File ] |
mod - test/validation/LuaUI/Widgets/test.lua |
[ Diff ] [ File ] |
mod - tools/unitsync/CMakeLists.txt |
[ Diff ] [ File ] |