| spring: develop ab5e6118 | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| hoijui | hoijui | develop | 2009-02-12 13:11:44 | develop d6100fc6 |
| Changeset | Merge commit 'origin/master' into caiinterface Conflicts: AI/CMakeLists.txt SConstruct rts/ExternalAI/GlobalAI.cpp rts/build/scons/config.py rts/build/vstudio8/rts.vcproj tools/unitsync/unitsync.cpp |
|||
| mod - CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - Documentation/cmds.txt | [ Diff ] [ File ] | |||
| mod - SConstruct | [ Diff ] [ File ] | |||
| mod - game/LuaUI/widgets.lua | [ Diff ] [ File ] | |||
| mod - installer/builddata/springcontent/EngineOptions.lua | [ Diff ] [ File ] | |||
| add - installer/builddata/springcontent/gamedata/sounds.lua | [ Diff ] [ File ] | |||
| mod - installer/sections/main.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/shortcuts.nsh | [ Diff ] [ File ] | |||
| mod - rts/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/GroupHandler.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/GameServer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameServer.h | [ Diff ] [ File ] | |||
| mod - rts/Game/GameSetup.cpp | [ Diff ] [ File ] | |||
| add - rts/Game/OSCStatsSender.cpp | [ Diff ] [ File ] | |||
| add - rts/Game/OSCStatsSender.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Player.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/PreGame.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/SelectMenu.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/MiniMap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/MouseCursor.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/MouseHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaHandle.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaHandle.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaMaterial.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaParser.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaParser.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnitDefs.cpp | [ 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/Map/SM3/terrain/TerrainTexture.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SMF/BFGroundDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/BumpWater.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/BumpWater.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/InMapDraw.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Textures/3DOTextureHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitModels/3DOParser.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitModels/UnitDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitModels/s3oParser.cpp | [ Diff ] [ File ] | |||
| rm - rts/Sim/Misc/ModSound.cpp | [ Diff ] [ File ] | |||
| rm - rts/Sim/Misc/ModSound.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/TeamHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/AirMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/PathEstimator.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/PathFinder.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Path/PathManager.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/FireProjectile.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/COB/CobFile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/COB/CobInstance.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Unit.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDef.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDefHandler.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/Units/UnitTypes/TransportUnit.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/BeamLaser.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/BeamLaser.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/Cannon.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/Cannon.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/DGunWeapon.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/DGunWeapon.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/EmgCannon.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/EmgCannon.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/FlameThrower.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/FlameThrower.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/LaserCannon.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/LaserCannon.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/LightningCannon.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/LightningCannon.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/MeleeWeapon.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/MeleeWeapon.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/MissileLauncher.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/MissileLauncher.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/NoWeapon.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/NoWeapon.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/PlasmaRepulser.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/Rifle.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/Rifle.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/StarburstLauncher.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/StarburstLauncher.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/TorpedoLauncher.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/TorpedoLauncher.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/Weapon.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/Weapon.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/WeaponDefHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/bombdropper.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/bombdropper.h | [ Diff ] [ File ] | |||
| mod - rts/System/DemoRecorder.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/ArchiveScanner.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/DataDirLocater.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/LogOutput.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/LogOutput.h | [ Diff ] [ File ] | |||
| mod - rts/System/Net/Socket.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Net/Socket.h | [ Diff ] [ File ] | |||
| mod - rts/System/NetProtocol.cpp | [ Diff ] [ File ] | |||
| rm - rts/System/Platform/Linux/OpenALSound.cpp | [ Diff ] [ File ] | |||
| rm - rts/System/Platform/Linux/OpenALSound.h | [ Diff ] [ File ] | |||
| rm - rts/System/Platform/NullSound.h | [ Diff ] [ File ] | |||
| rm - rts/System/Platform/Win/DxSound.cpp | [ Diff ] [ File ] | |||
| rm - rts/System/Platform/Win/DxSound.h | [ Diff ] [ File ] | |||
| rm - rts/System/Platform/Win/OggStream.cpp | [ Diff ] [ File ] | |||
| rm - rts/System/Platform/Win/OggStream.h | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/errorhandler.h | [ Diff ] [ File ] | |||
| rm - rts/System/Sound.cpp | [ Diff ] [ File ] | |||
| rm - rts/System/Sound.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/ALShared.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/Sound.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/Sound.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/SoundBuffer.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/SoundBuffer.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/SoundItem.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/SoundItem.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/SoundSource.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/SoundSource.h | [ Diff ] [ File ] | |||
| mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sync/SyncDebugger.cpp | [ Diff ] [ File ] | |||
| mod - rts/build/cmake/FindWin32Libs.cmake | [ Diff ] [ File ] | |||
| mod - rts/build/scons/config.py | [ Diff ] [ File ] | |||
| mod - rts/build/scons/filelist.py | [ Diff ] [ File ] | |||
| mod - rts/build/scons/rts.py | [ Diff ] [ File ] | |||
| mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | |||
| mod - rts/lib/CMakeLists.txt | [ Diff ] [ File ] | |||
| add - rts/lib/oscpack/LICENSE | [ Diff ] [ File ] | |||
| add - rts/lib/oscpack/OscException.h | [ Diff ] [ File ] | |||
| add - rts/lib/oscpack/OscHostEndianness.h | [ Diff ] [ File ] | |||
| add - rts/lib/oscpack/OscOutboundPacketStream.cpp | [ Diff ] [ File ] | |||
| add - rts/lib/oscpack/OscOutboundPacketStream.h | [ Diff ] [ File ] | |||
| add - rts/lib/oscpack/OscTypes.cpp | [ Diff ] [ File ] | |||
| add - rts/lib/oscpack/OscTypes.h | [ Diff ] [ File ] | |||
| add - rts/lib/oscpack/README | [ Diff ] [ File ] | |||
| add - tools/nedmalloc/License.txt | [ Diff ] [ File ] | |||
| add - tools/nedmalloc/Readme.txt | [ Diff ] [ File ] | |||
| add - tools/nedmalloc/SConscript | [ Diff ] [ File ] | |||
| add - tools/nedmalloc/malloc.c.h | [ Diff ] [ File ] | |||
| add - tools/nedmalloc/nedmalloc.c | [ Diff ] [ File ] | |||
| add - tools/nedmalloc/nedmalloc.h | [ Diff ] [ File ] | |||
| add - tools/nedmalloc/nedmalloc.sln | [ Diff ] [ File ] | |||
| add - tools/nedmalloc/nedmalloc.vcproj | [ Diff ] [ File ] | |||
| add - tools/nedmalloc/test.c | [ Diff ] [ File ] | |||
| add - tools/nedmalloc/testlist.cpp | [ Diff ] [ File ] | |||
| mod - tools/unitsync/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - tools/unitsync/unitsync.cpp | [ Diff ] [ File ] | |||
