| spring: develop 70586b1c | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| hoijui | hoijui | develop | 2010-06-16 16:58:21 | develop ce3b2014 |
| Changeset | Merge remote branch 'originSpring/master' into pureint Conflicts: AI/CMakeLists.txt AI/Skirmish/E323AI AI/Wrappers/LegacyCpp/AIAICallback.cpp CMakeLists.txt rts/build/cmake/Util.cmake rts/ExternalAI/Interface/AISCommands.h rts/ExternalAI/Interface/SSkirmishAICallback.h rts/ExternalAI/SSkirmishAICallbackImpl.cpp rts/ExternalAI/SSkirmishAICallbackImpl.h rts/ExternalAI/SkirmishAI.cpp rts/ExternalAI/SkirmishAI.h rts/ExternalAI/SkirmishAIWrapper.cpp rts/Game/Game.cpp |
|||
| mod - .gitmodules | [ Diff ] [ File ] | |||
| mod - AI/CMakeLists.txt | [ Diff ] [ File ] | |||
| add - AI/Interfaces/Python | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/E323AI | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/AIClasses.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/AttackHandler.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/DefenseMatrix.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/KAIK.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/KAIK.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/ThreatMap.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/ThreatMap.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/IAICallback.h | [ Diff ] [ File ] | |||
| mod - CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - buildbot/create-build-dirs.sh | [ Diff ] [ File ] | |||
| mod - buildbot/make_installer.sh | [ Diff ] [ File ] | |||
| mod - buildbot/master.cfg | [ Diff ] [ File ] | |||
| add - buildbot/prepare.sh | [ Diff ] [ File ] | |||
| mod - buildbot/rsync.sh | [ Diff ] [ File ] | |||
| add - buildbot/stacktrace_translator.py | [ Diff ] [ File ] | |||
| mod - buildbot/update-docs.sh | [ Diff ] [ File ] | |||
| add - buildbot/update-version.sh | [ Diff ] [ File ] | |||
| add - cont/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/gamedata/armordefs.lua | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/gamedata/movedefs.lua | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/gamedata/sidedata.lua | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/shaders/GLSL/SMFVertProg.glsl | [ Diff ] [ File ] | |||
| mod - directories.txt | [ Diff ] [ File ] | |||
| add - doc/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - doc/changelog.txt | [ Diff ] [ File ] | |||
| mod - installer/make_luaui_nsh.py | [ Diff ] [ File ] | |||
| mod - installer/sections/luaui.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/main.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/shortcuts.nsh | [ Diff ] [ File ] | |||
| mod - installer/spring.nsi | [ Diff ] [ File ] | |||
| mod - rts/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AIInterfaceLibrary.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AIInterfaceLibrary.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AILibraryManager.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/AISCommands.h | [ 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/SkirmishAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAI.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAIWrapper.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameServer.h | [ Diff ] [ File ] | |||
| mod - rts/Game/PreGame.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/SelectedUnits.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Server/GameParticipant.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Server/GameParticipant.h | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/GuiHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/HwMouseCursor.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/KeyBindings.cpp | [ 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/LuaUnsyncedCtrl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnsyncedRead.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SM3/terrain/Textures.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/AVIGenerator.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/myGL.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/InMapDraw.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/InMapDraw.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Models/S3OParser.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/ProjectileDrawer.cpp | [ Diff ] [ File ] | |||
| add - rts/Rendering/TeamHighlight.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Textures/Bitmap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Textures/Bitmap.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Textures/nv_dds.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Textures/nv_dds.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/VerticalSync.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/glFont.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/Team.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/TeamBase.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/TeamHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/TeamHandler.h | [ Diff ] [ File ] | |||
| rm - rts/Sim/Misc/TeamHighlight.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/COB/CobDefines.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/COB/CobInstance.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/COB/LuaUnitScript.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/COB/UnitScript.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/MobileCAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Unit.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/System/ConfigHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/ConfigHandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/ArchiveScanner.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/ArchiveScanner.h | [ Diff ] [ File ] | |||
| mod - rts/System/GlobalConfig.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/GlobalConfig.h | [ Diff ] [ File ] | |||
| mod - rts/System/Input/MouseInput.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/LogOutput.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Net/UDPConnection.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/Clipboard.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/CrashHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/Win/CrashHandler.cpp | [ Diff ] [ File ] | |||
| rm - rts/System/Sound/AudioChannel.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/CMakeLists.txt | [ Diff ] [ File ] | |||
| add - rts/System/Sound/EffectChannel.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/IAudioChannel.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/IAudioChannel.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/IEffectChannel.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/IEffectChannel.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/IMusicChannel.cpp | [ Diff ] [ File ] | |||
| add - 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/Music.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/MusicChannel.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/NullEffectChannel.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/NullMusicChannel.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/Sound.cpp | [ 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/SpringApp.h | [ Diff ] [ File ] | |||
| mod - rts/build/cmake/FindWindres.cmake | [ Diff ] [ File ] | |||
| add - rts/build/cmake/Util.cmake | [ Diff ] [ File ] | |||
| mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | |||
| mod - rts/builds/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - rts/builds/GML/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - rts/builds/HL/CMakeLists.txt | [ Diff ] [ File ] | |||
| add - rts/builds/default/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - rts/lib/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - rts/lib/gml/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - rts/lib/gml/gml.h | [ Diff ] [ File ] | |||
| mod - rts/lib/headlessStubs/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - rts/lib/headlessStubs/README.markdown | [ Diff ] [ File ] | |||
| mod - rts/lib/headlessStubs/glewstub.c | [ Diff ] [ File ] | |||
| add - rts/lib/headlessStubs/glewstub.h | [ Diff ] [ File ] | |||
| mod - rts/lib/headlessStubs/glstub.c | [ Diff ] [ File ] | |||
| add - rts/lib/headlessStubs/glstub.h | [ Diff ] [ File ] | |||
| mod - rts/lib/headlessStubs/glustub.c | [ Diff ] [ File ] | |||
| add - rts/lib/headlessStubs/glxextstub.c | [ Diff ] [ File ] | |||
| add - rts/lib/headlessStubs/glxextstub.h | [ Diff ] [ File ] | |||
| mod - rts/lib/headlessStubs/sdlstub.c | [ Diff ] [ File ] | |||
| mod - rts/lib/headlessStubs/sdlstub_cppbit.cpp | [ Diff ] [ File ] | |||
| add - rts/lib/headlessStubs/wglstub.cpp | [ Diff ] [ File ] | |||
| add - rts/lib/headlessStubs/wglstub.h | [ Diff ] [ File ] | |||
| add - tools/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - tools/DemoTool/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - tools/DemoTool/DemoTool.cpp | [ Diff ] [ File ] | |||
| mod - tools/DemoTool/StringSerializer.h | [ Diff ] [ File ] | |||
| add - tools/dirchange/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - tools/dirchange/dirchange.cpp | [ Diff ] [ File ] | |||
| rm - tools/scripts/propset.sh | [ Diff ] [ File ] | |||
| mod - tools/unitsync/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - tools/unitsync/unitsync.cpp | [ Diff ] [ File ] | |||
| mod - tools/unitsync/unitsync_api.h | [ Diff ] [ File ] | |||
