spring: develop 78130fed |
[ Diff ] [ Back to Repository ] |
Author |
Committer |
Branch |
Timestamp |
Parent |
Gajo Petrovic |
Gajo Petrovic |
develop |
2015-01-24 05:53:00 |
develop 3c4ca654 |
Changeset |
Merge branch 'develop' into pr-downloader |
mod - AI/Interfaces/Java/src/main/native/JavaBridge.c |
[ Diff ] [ File ] |
mod - AI/Skirmish/HughAI |
[ Diff ] [ File ] |
mod - AI/Wrappers/LegacyCpp/MoveData.cpp |
[ Diff ] [ File ] |
mod - cont/base/springcontent/shaders/GLSL/GrassVertProg.glsl |
[ Diff ] [ File ] |
mod - cont/base/springcontent/shaders/GLSL/bumpWaterFS.glsl |
[ Diff ] [ File ] |
mod - cont/base/springcontent/shaders/GLSL/infoHeight.lua |
[ Diff ] [ File ] |
mod - cont/base/springcontent/shaders/GLSL/infoLOS.lua |
[ Diff ] [ File ] |
mod - cont/base/springcontent/shaders/GLSL/infoMetal.lua |
[ Diff ] [ File ] |
mod - cont/base/springcontent/shaders/GLSL/infoPath.lua |
[ Diff ] [ File ] |
mod - doc/changelog.txt |
[ Diff ] [ File ] |
mod - doc/manpages/spring.6.txt |
[ Diff ] [ File ] |
mod - doc/releasechecklist.txt |
[ 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/SkirmishAIData.cpp |
[ Diff ] [ File ] |
mod - rts/ExternalAI/SkirmishAIHandler.h |
[ Diff ] [ File ] |
mod - rts/Game/CMakeLists.txt |
[ Diff ] [ File ] |
mod - rts/Game/Camera.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera.h |
[ Diff ] [ File ] |
mod - rts/Game/Camera/CameraController.h |
[ Diff ] [ File ] |
mod - rts/Game/Camera/FPSController.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera/FPSController.h |
[ Diff ] [ File ] |
mod - rts/Game/Camera/FreeController.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera/FreeController.h |
[ Diff ] [ File ] |
rm - rts/Game/Camera/OrbitController.cpp |
[ Diff ] [ File ] |
rm - rts/Game/Camera/OrbitController.h |
[ Diff ] [ File ] |
mod - rts/Game/Camera/OverheadController.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera/OverheadController.h |
[ Diff ] [ File ] |
mod - rts/Game/Camera/OverviewController.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera/OverviewController.h |
[ Diff ] [ File ] |
mod - rts/Game/Camera/RotOverheadController.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera/RotOverheadController.h |
[ Diff ] [ File ] |
rm - rts/Game/Camera/SmoothController.cpp |
[ Diff ] [ File ] |
rm - rts/Game/Camera/SmoothController.h |
[ Diff ] [ File ] |
add - rts/Game/Camera/SpringController.cpp |
[ Diff ] [ File ] |
add - rts/Game/Camera/SpringController.h |
[ Diff ] [ File ] |
rm - rts/Game/Camera/TWController.cpp |
[ Diff ] [ File ] |
rm - rts/Game/Camera/TWController.h |
[ Diff ] [ File ] |
mod - rts/Game/CameraHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Game/CameraHandler.h |
[ Diff ] [ File ] |
mod - rts/Game/FPSUnitController.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Game.cpp |
[ Diff ] [ File ] |
mod - rts/Game/InMapDraw.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/GuiHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/KeyBindings.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/KeyCodes.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/MiniMap.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/MouseHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/SelectionKeyHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/UnitTracker.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/UnitTracker.h |
[ Diff ] [ File ] |
mod - rts/Game/UnsyncedGameCommands.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaSyncedMoveCtrl.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaUnsyncedCtrl.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaUnsyncedRead.cpp |
[ Diff ] [ File ] |
mod - rts/Map/BaseGroundDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Net/GameServer.cpp |
[ 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/AdvWater.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Env/BasicSky.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Env/BasicSky.h |
[ Diff ] [ File ] |
mod - rts/Rendering/Env/BumpWater.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Env/CubeMapHandler.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/FarTextureHandler.cpp |
[ 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/HUDDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Map/InfoTexture/Legacy/LegacyInfoTextureHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Map/InfoTexture/Modern/AirLos.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/Los.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Map/InfoTexture/Modern/Path.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Map/InfoTexture/Modern/Path.h |
[ Diff ] [ File ] |
mod - rts/Rendering/ProjectileDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/ShadowHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/UnitDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/VerticalSync.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/CMakeLists.txt |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/CollisionHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/AAirMoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/ClassicGroundMoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/GroundMoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/MoveDefHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/MoveMath/MoveMath.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/MoveMath/MoveMath.h |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/MoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Objects/SolidObject.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Path/Default/PathConstants.h |
[ Diff ] [ File ] |
mod - rts/Sim/Path/Default/PathEstimator.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Path/Default/PathEstimator.h |
[ Diff ] [ File ] |
mod - rts/Sim/Path/Default/PathManager.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Path/Default/PathManager.h |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/ExplosionGenerator.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/ExplosionGenerator.h |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/FireProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/FlareProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/PieceProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/BubbleProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/DirtProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/GenericParticleProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/GfxProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/HeatCloudProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/MuzzleFlame.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile2.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/WreckProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/WeaponProjectiles/BeamLaserProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/WeaponProjectiles/EmgProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/WeaponProjectiles/ExplosiveProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/WeaponProjectiles/FireBallProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/WeaponProjectiles/FlameProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/WeaponProjectiles/LargeBeamLaserProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/CommandAI/CommandAI.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/UnitTypes/Builder.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/Weapon.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/Weapon.h |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/WeaponDef.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/WeaponDef.h |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/WeaponLoader.cpp |
[ Diff ] [ File ] |
mod - rts/System/CMakeLists.txt |
[ Diff ] [ File ] |
mod - rts/System/FastMath.h |
[ Diff ] [ File ] |
mod - rts/System/OffscreenGLContext.cpp |
[ Diff ] [ File ] |
mod - rts/System/Platform/CpuID.cpp |
[ Diff ] [ File ] |
mod - rts/System/Platform/Linux/CrashHandler.cpp |
[ Diff ] [ File ] |
mod - rts/System/Platform/Linux/ThreadSupport.cpp |
[ Diff ] [ File ] |
mod - rts/System/Platform/Linux/ThreadSupport.h |
[ Diff ] [ File ] |
rm - rts/System/Platform/Linux/thread_backtrace.cpp |
[ Diff ] [ File ] |
rm - rts/System/Platform/Linux/thread_backtrace.h |
[ Diff ] [ File ] |
mod - rts/System/Platform/Mac/CrashHandler.cpp |
[ Diff ] [ File ] |
mod - rts/System/Platform/Threading.cpp |
[ Diff ] [ File ] |
mod - rts/System/Sound/OpenAL/OggStream.cpp |
[ Diff ] [ File ] |
mod - rts/System/Sound/OpenAL/Sound.cpp |
[ Diff ] [ File ] |
mod - rts/System/SpringApp.cpp |
[ Diff ] [ File ] |
mod - rts/System/creg/STL_Deque.h |
[ Diff ] [ File ] |
mod - rts/System/creg/STL_List.h |
[ Diff ] [ File ] |
mod - rts/System/creg/STL_Map.h |
[ Diff ] [ File ] |
mod - rts/System/creg/STL_Set.h |
[ Diff ] [ File ] |
mod - rts/System/creg/Serializer.cpp |
[ Diff ] [ File ] |
mod - rts/System/creg/TypeDeduction.h |
[ Diff ] [ File ] |
mod - rts/System/creg/VarTypes.cpp |
[ Diff ] [ File ] |
mod - rts/System/creg/VarTypes.h |
[ Diff ] [ File ] |
mod - rts/System/creg/creg.h |
[ Diff ] [ File ] |
mod - rts/System/creg/creg_cond.h |
[ Diff ] [ File ] |
mod - rts/System/float3.h |
[ Diff ] [ File ] |
mod - rts/System/myMath.h |
[ Diff ] [ File ] |
mod - rts/build/cmake/FindLibunwind.cmake |
[ Diff ] [ File ] |
mod - rts/builds/dedicated/CMakeLists.txt |
[ Diff ] [ File ] |
mod - rts/lib/headlessStubs/glewstub.h |
[ Diff ] [ File ] |
mod - rts/lib/headlessStubs/sdlstub.c |
[ Diff ] [ File ] |
mod - test/engine/System/LoadSave/testCregLoadSave.cpp |
[ Diff ] [ File ] |
mod - tools/pr-downloader |
[ Diff ] [ File ] |
mod - tools/unitsync/CMakeLists.txt |
[ Diff ] [ File ] |