| spring: develop 46a4848d | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| zerver | zerver | develop | 2011-03-05 00:01:20 | develop 1224c0b7 |
| Changeset | Merge branch 'master' of github.com:spring/spring Conflicts: rts/Rendering/FeatureDrawer.cpp |
|||
| add - buildbot/README.markdown | [ Diff ] [ File ] | |||
| mod - buildbot/master/buildbot.mk | [ Diff ] [ File ] | |||
| mod - buildbot/master/master.cfg | [ Diff ] [ File ] | |||
| mod - buildbot/slave/makensis | [ 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/shaders/GLSL/SMFFragProg.glsl | [ Diff ] [ File ] | |||
| mod - doc/changelog.txt | [ Diff ] [ File ] | |||
| add - include/AL/efx.h | [ Diff ] [ File ] | |||
| mod - rts/Game/ConsoleHistory.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameController.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameHelper.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/IVideoCapturing.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/LoadScreen.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/NetCommands.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/SelectedUnits.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/KeyBindings.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/LuaUI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/LuaUI.h | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/MiniMap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/MouseHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/UnitTracker.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/WaitCommandsAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaSyncedMoveCtrl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaSyncedMoveCtrl.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnitDefs.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnitMaterial.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.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/MapInfo.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/MapInfo.h | [ Diff ] [ File ] | |||
| mod - rts/Map/ReadMap.h | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/BFGroundDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/SmfReadMap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/SmfReadMap.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/DebugColVolDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/DefaultPathDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GLContext.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GlobalRendering.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GroundDecalHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GroundDecalHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/InMapDraw.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/glFont.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/CommonDefHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/GroundBlockingObjectMap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/QuadField.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/AAirMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/AAirMoveType.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/AirMoveType.cpp | [ 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/MoveMath/GroundMoveMath.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/MoveMath/GroundMoveMath.h | [ 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/MoveTypes/MoveType.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/MoveTypeFactory.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/ScriptMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/ScriptMoveType.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/StaticMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/StaticMoveType.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/TAAirMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/TAAirMoveType.h | [ 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/PathFinder.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/CommandAI.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/Groups/GroupHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Scripts/CobFile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Scripts/CobInstance.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Scripts/CobThread.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/UnitDef.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDef.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDefHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitLoader.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/Weapon.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/WeaponDef.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/WeaponDefHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/ConfigHandler.cpp | [ 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/FileSystem/VFSHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Input/MouseInput.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/LogOutput.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/LogOutput.h | [ Diff ] [ File ] | |||
| mod - rts/System/Main.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/CrashHandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/Linux/CrashHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/Linux/X_MessageBox.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Platform/Linux/thread_backtrace.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Platform/Linux/thread_backtrace.h | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/Threading.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/Threading.h | [ Diff ] [ File ] | |||
| add - rts/System/Platform/Watchdog.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Platform/Watchdog.h | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/Win/CrashHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/errorhandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/errorhandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/ALShared.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/ALShared.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/AudioChannel.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/AudioChannel.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/CMakeLists.txt | [ Diff ] [ File ] | |||
| add - rts/System/Sound/EFX.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/EFX.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/EFXPresets.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/EFXPresets.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/EFXfuncs.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/EFXfuncs.h | [ Diff ] [ File ] | |||
| rm - rts/System/Sound/EffectChannel.cpp | [ Diff ] [ File ] | |||
| rm - rts/System/Sound/EffectChannel.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/IAudioChannel.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/IAudioChannel.h | [ Diff ] [ File ] | |||
| rm - rts/System/Sound/IEffectChannel.cpp | [ Diff ] [ File ] | |||
| rm - rts/System/Sound/IEffectChannel.h | [ Diff ] [ File ] | |||
| rm - rts/System/Sound/IMusicChannel.cpp | [ Diff ] [ File ] | |||
| rm - rts/System/Sound/IMusicChannel.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/ISound.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/ISound.h | [ Diff ] [ File ] | |||
| rm - rts/System/Sound/MusicChannel.cpp | [ Diff ] [ File ] | |||
| rm - rts/System/Sound/MusicChannel.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/NullAudioChannel.h | [ Diff ] [ File ] | |||
| rm - rts/System/Sound/NullEffectChannel.h | [ Diff ] [ File ] | |||
| rm - rts/System/Sound/NullMusicChannel.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/NullSound.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/NullSound.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/OggStream.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/OggStream.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/SoundBuffer.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/SoundChannels.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/SoundChannels.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/SoundItem.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/SoundItem.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/SoundLog.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/SoundLog.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/SoundSource.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/SoundSource.h | [ Diff ] [ File ] | |||
| mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Util.h | [ Diff ] [ File ] | |||
| mod - rts/System/creg/Serializer.cpp | [ Diff ] [ File ] | |||
| mod - rts/aGui/List.cpp | [ Diff ] [ File ] | |||
| mod - rts/lib/gml/gmlsrv.h | [ Diff ] [ File ] | |||
| mod - rts/lib/lobby/Connection.h | [ Diff ] [ File ] | |||
| mod - tools/ArchiveMover/ArchiveMover.cpp | [ Diff ] [ File ] | |||
