spring: develop 9ccb20e5 |
[ Diff ] [ Back to Repository ] |
Author |
Committer |
Branch |
Timestamp |
Parent |
Kaylewt |
Kaylewt |
develop |
2011-12-06 16:57:27 |
develop e7b1d5d1 |
Changeset |
Merge branch 'develop' into PFF |
mod - AI/Skirmish/AAI/AAIAttackManager.cpp |
[ Diff ] [ File ] |
mod - AI/Skirmish/AAI/AAIBuildTable.cpp |
[ Diff ] [ File ] |
mod - AI/Skirmish/Shard |
[ Diff ] [ File ] |
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp |
[ Diff ] [ File ] |
mod - buildbot/slave/tests-prepare.sh |
[ Diff ] [ File ] |
mod - cont/examples/Widgets/minimap_startbox.lua |
[ Diff ] [ File ] |
mod - installer/make_source_package.sh |
[ Diff ] [ File ] |
mod - rts/ExternalAI/AICallback.cpp |
[ Diff ] [ File ] |
mod - rts/ExternalAI/EngineOutHandler.h |
[ Diff ] [ File ] |
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp |
[ Diff ] [ File ] |
mod - rts/Game/CMakeLists.txt |
[ Diff ] [ File ] |
mod - rts/Game/Camera.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera/CameraController.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera/OverheadController.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera/OverviewController.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Camera/SmoothController.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/GameHelper.h |
[ Diff ] [ File ] |
mod - rts/Game/GameServer.cpp |
[ Diff ] [ File ] |
mod - rts/Game/GameServer.h |
[ Diff ] [ File ] |
mod - rts/Game/GameVersion.cpp |
[ Diff ] [ File ] |
mod - rts/Game/LoadScreen.h |
[ Diff ] [ File ] |
mod - rts/Game/NetCommands.cpp |
[ Diff ] [ File ] |
mod - rts/Game/Player.cpp |
[ Diff ] [ File ] |
mod - rts/Game/PreGame.cpp |
[ Diff ] [ File ] |
mod - rts/Game/SelectedUnitsAI.cpp |
[ Diff ] [ File ] |
mod - rts/Game/SyncedGameCommands.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/MiniMap.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UI/MouseHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Game/UnsyncedGameCommands.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/CMakeLists.txt |
[ Diff ] [ File ] |
mod - rts/Lua/LuaGaia.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaHandle.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaLobby.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaParser.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaRules.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaSyncedCall.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/LuaUnsyncedCall.cpp |
[ Diff ] [ File ] |
mod - rts/Lua/LuaWeaponDefs.cpp |
[ Diff ] [ File ] |
mod - rts/Map/BasicMapDamage.cpp |
[ Diff ] [ File ] |
mod - rts/Map/SM3/Plane.h |
[ Diff ] [ File ] |
mod - rts/Map/SM3/terrain/Lightcalc.cpp |
[ Diff ] [ File ] |
mod - rts/Map/SM3/terrain/Terrain.cpp |
[ Diff ] [ File ] |
mod - rts/Map/SMF/SMFReadMap.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/DefaultPathDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Env/AdvWater.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Env/BumpWater.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Env/DynWater.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/FarTextureHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/GL/FBO.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/GL/FBO.h |
[ Diff ] [ File ] |
mod - rts/Rendering/GlobalRendering.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/GlobalRendering.h |
[ Diff ] [ File ] |
mod - rts/Rendering/ProjectileDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/Textures/3DOTextureHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Rendering/UnitDrawer.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Features/Feature.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/CollisionHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/GlobalSynced.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/GlobalSynced.h |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/GuiSoundSet.h |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/Team.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Misc/TeamHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/AAirMoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/GroundMoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/GroundMoveType.h |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/HoverAirMoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/ScriptMoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/StaticMoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/MoveTypes/StrafeAirMoveType.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Objects/SolidObject.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Objects/SolidObject.h |
[ Diff ] [ File ] |
mod - rts/Sim/Objects/WorldObject.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Objects/WorldObject.h |
[ Diff ] [ File ] |
mod - rts/Sim/Path/Default/PathDataTypes.h |
[ Diff ] [ File ] |
mod - rts/Sim/Path/QTPFS/NodeLayer.hpp |
[ Diff ] [ File ] |
mod - rts/Sim/Path/QTPFS/PathSearch.hpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/FlareProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/PieceProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Projectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/ExploSpikeProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/GeoSquareProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/GeoThermSmokeProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/HeatCloudProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/RepulseGfx.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.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/TracerProjectile.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/LaserProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/WeaponProjectiles/TorpedoProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/CommandAI/TransportCAI.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/Scripts/UnitScript.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/Unit.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/Unit.h |
[ Diff ] [ File ] |
mod - rts/Sim/Units/UnitTypes/Builder.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/UnitTypes/Building.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/UnitTypes/Factory.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Units/UnitTypes/TransportUnit.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/BeamLaser.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/BombDropper.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/Cannon.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/LightningCannon.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/MissileLauncher.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/StarburstLauncher.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/TorpedoLauncher.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/Weapon.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/Weapon.h |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/WeaponDef.h |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/WeaponDefHandler.cpp |
[ Diff ] [ File ] |
mod - rts/Sim/Weapons/WeaponLoader.cpp |
[ Diff ] [ File ] |
mod - rts/System/CMakeLists.txt |
[ Diff ] [ File ] |
mod - rts/System/EventHandler.cpp |
[ Diff ] [ File ] |
mod - rts/System/EventHandler.h |
[ Diff ] [ File ] |
add - rts/System/Misc/SpringTime.cpp |
[ Diff ] [ File ] |
add - rts/System/Misc/SpringTime.h |
[ Diff ] [ File ] |
mod - rts/System/Net/UDPConnection.cpp |
[ Diff ] [ File ] |
mod - rts/System/Net/UDPConnection.h |
[ Diff ] [ File ] |
mod - rts/System/OffscreenGLContext.cpp |
[ Diff ] [ File ] |
mod - rts/System/Platform/Linux/CrashHandler.cpp |
[ Diff ] [ File ] |
mod - rts/System/Platform/Watchdog.cpp |
[ Diff ] [ File ] |
mod - rts/System/Sound/Sound.cpp |
[ Diff ] [ File ] |
mod - rts/System/SpringApp.cpp |
[ Diff ] [ File ] |
mod - rts/System/SpringApp.h |
[ Diff ] [ File ] |
mod - rts/System/Sync/SyncChecker.cpp |
[ Diff ] [ File ] |
mod - rts/System/Sync/SyncChecker.h |
[ Diff ] [ File ] |
mod - rts/System/Sync/SyncedPrimitiveBase.h |
[ Diff ] [ File ] |
mod - rts/System/VersionGenerated.h.template |
[ Diff ] [ File ] |
mod - rts/System/float3.cpp |
[ Diff ] [ File ] |
mod - rts/System/float3.h |
[ Diff ] [ File ] |
rm - rts/System/myTime.h |
[ Diff ] [ File ] |
mod - rts/build/cmake/ConfigureVersion.cmake |
[ Diff ] [ File ] |
mod - rts/build/cmake/UtilVersion.cmake |
[ Diff ] [ File ] |
mod - rts/builds/dedicated/CMakeLists.txt |
[ Diff ] [ File ] |
mod - rts/lib/gml/CMakeLists.txt |
[ Diff ] [ File ] |
add - rts/lib/gml/gml_base.cpp |
[ Diff ] [ File ] |
add - rts/lib/gml/gml_base.h |
[ Diff ] [ File ] |
mod - test/CMakeLists.txt |
[ Diff ] [ File ] |
mod - test/engine/System/Sync/TestSyncedPrimitive.cpp |
[ Diff ] [ File ] |
mod - tools/unitsync/unitsync.cpp |
[ Diff ] [ File ] |