| spring: develop 7ac721ca | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| Tobi Vollebregt | Tobi Vollebregt | develop | 2009-05-09 17:41:23 | develop 6147ca7c |
| Changeset | Merge commit 'origin/master' into luacob Conflicts: rts/Sim/Units/Unit.cpp rts/Sim/Units/Unit.h |
|||
| mod - AI/Interfaces/C/Interface.cpp | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/C/Interface.h | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/JavaBridge.c | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/JvmLocater_solaris.c | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/bin/java_wrappCallbackOO.awk | [ Diff ] [ File ] | |||
| mod - AI/SConscript | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/DGunController.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/NullLegacyCppAI/TestGlobalAI.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/GTerrainMap.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/CUtils/SharedLibrary.c | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/CUtils/SharedLibrary.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp | [ Diff ] [ File ] | |||
| mod - CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - game/LuaUI/selector.lua | [ Diff ] [ File ] | |||
| add - game/fonts/AUTHORS | [ Diff ] [ File ] | |||
| add - game/fonts/COPYING | [ Diff ] [ File ] | |||
| add - game/fonts/CREDITS | [ Diff ] [ File ] | |||
| add - game/fonts/FreeSansBold.otf | [ Diff ] [ File ] | |||
| rm - game/fonts/Luxi.ttf | [ Diff ] [ File ] | |||
| add - game/fonts/README | [ Diff ] [ File ] | |||
| rm - game/fonts/Vera.ttf | [ Diff ] [ File ] | |||
| mod - installer/builddata/springcontent/gamedata/sounds.lua | [ Diff ] [ File ] | |||
| mod - installer/sections/main.nsh | [ Diff ] [ File ] | |||
| mod - rts/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AILibraryManager.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/AISEvents.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SAIInterfaceCallbackImpl.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAIWrapper.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAIWrapper.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Game.h | [ Diff ] [ File ] | |||
| mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameServer.h | [ Diff ] [ File ] | |||
| mod - rts/Game/GameSetup.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Player.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/PlayerHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/PlayerHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Game/PlayerRoster.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/PlayerRoster.h | [ 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/MiniMap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/MouseHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/QuitBox.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/QuitBox.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaFonts.cpp | [ 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/LuaSyncedRead.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnsyncedRead.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/MapInfo.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/MetalMap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/MetalMap.h | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/BFGroundTextures.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/FBO.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/VertexArray.inl | [ Diff ] [ File ] | |||
| mod - rts/Rendering/glFont.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/glFont.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Features/Feature.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Features/FeatureHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/AirBaseHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/GlobalSynced.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/GlobalSynced.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/LosHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/LosHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/QuadField.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/RadarHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/Resource.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/ResourceHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/ResourceMapAnalyzer.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/AirMoveType.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/GroundMoveType.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/MoveInfo.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/MoveInfo.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/MoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/MoveType.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/ScriptMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/ScriptMoveType.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/TAAirMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/TAAirMoveType.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/PathEstimator.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/ProjectileHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/ProjectileHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/Command.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/Command.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/CommandAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/CommandAI.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/CommandQueue.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/FactoryCAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/MobileCAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Groups/Group.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Unit.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Unit.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitTypes/Factory.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitTypes/TransportUnit.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/ConfigHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/ConfigHandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/DemoRecorder.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/ArchiveScanner.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/DataDirLocater.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/FileHandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/GlobalUnsynced.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/GlobalUnsynced.h | [ Diff ] [ File ] | |||
| mod - rts/System/Main.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/BaseCmd.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/BaseCmd.h | [ Diff ] [ File ] | |||
| rm - rts/System/Platform/Linux/PosixCmd.cpp | [ Diff ] [ File ] | |||
| rm - rts/System/Platform/Linux/PosixCmd.h | [ Diff ] [ File ] | |||
| rm - rts/System/Platform/Win/Win32Cmd.cpp | [ Diff ] [ File ] | |||
| rm - rts/System/Platform/Win/Win32Cmd.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/Sound.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/Sound.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/SoundBuffer.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/SoundSource.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/SpringApp.h | [ Diff ] [ File ] | |||
| add - rts/System/TimeUtil.cpp | [ Diff ] [ File ] | |||
| add - rts/System/TimeUtil.h | [ Diff ] [ File ] | |||
| mod - rts/System/exportdefines.h | [ Diff ] [ File ] | |||
| mod - rts/System/float4.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/maindefines.h | [ Diff ] [ File ] | |||
| mod - rts/build/scons/config.py | [ Diff ] [ File ] | |||
| mod - rts/build/scons/rts.py | [ Diff ] [ File ] | |||
| mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | |||
| mod - tools/DedicatedServer/CMakeLists.txt | [ Diff ] [ File ] | |||
