| spring: develop 069f13fd | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| hoijui | hoijui | develop | 2010-05-12 19:20:22 | develop 90df57ec |
| Changeset | Merge remote branch 'originSpring/master' into pureint Conflicts: AI/Interfaces/Java/bin/jna_wrappEvents.awk AI/Wrappers/LegacyCpp/AIAICallback.cpp rts/ExternalAI/Interface/AISEvents.h rts/ExternalAI/Interface/SSkirmishAICallback.h rts/ExternalAI/SSkirmishAICallbackImpl.cpp rts/ExternalAI/SSkirmishAICallbackImpl.h |
|||
| mod - AI/Skirmish/AAI/AAI.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/KAIK.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/RAI.cpp | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAI.cpp | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICheats.cpp | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICheats.h | [ Diff ] [ File ] | |||
| add - AI/Wrappers/LegacyCpp/Event/AIEnemyCreatedEvent.h | [ Diff ] [ File ] | |||
| add - AI/Wrappers/LegacyCpp/Event/AIEnemyFinishedEvent.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/Event/AIEvents.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/IAICallback.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/IAICheats.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/IGlobalAI.h | [ Diff ] [ File ] | |||
| mod - CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - cont/base/make_gamedata_arch.sh | [ 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/gamedata/resources_map.lua | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/shaders/GLSL/SMFVertProg.glsl | [ 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/AICheats.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICheats.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/EngineOutHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/AISEvents.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/SkirmishAIWrapper.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAIWrapper.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera.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/PreGame.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/GuiHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/HwMouseCursor.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/LuaUI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/MiniMap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/MouseHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/MouseHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/QuitBox.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/WaitCommandsAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaMaterial.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnsyncedCtrl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnsyncedCtrl.h | [ Diff ] [ File ] | |||
| mod - rts/Map/MapInfo.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/MapInfo.h | [ Diff ] [ File ] | |||
| mod - rts/Map/ReadMap.cpp | [ 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/Menu/SelectMenu.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/BumpWater.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/BumpWater.h | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/CubeMapHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Env/CubeMapHandler.h | [ Diff ] [ File ] | |||
| rm - rts/Rendering/FontTexture.cpp | [ Diff ] [ File ] | |||
| rm - rts/Rendering/FontTexture.h | [ 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/ProjectileDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/Textures/Bitmap.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/CommonDefHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/Team.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/TeamHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Projectiles/WeaponProjectiles/LargeBeamLaserProjectile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/COB/CobFile.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/CommandAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/TransportCAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Unit.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDefHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/WeaponDefHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Matrix44f.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Matrix44f.h | [ Diff ] [ File ] | |||
| mod - rts/System/NetProtocol.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Platform/errorhandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/ALShared.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/ALShared.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/AudioChannel.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/ISound.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/ISound.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/Music.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/NullSound.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/NullSound.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 ] | |||
| add - rts/System/Sound/SoundLog.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/SoundLog.h | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/SoundSource.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | |||
| mod - rts/aGui/Gui.cpp | [ Diff ] [ File ] | |||
| mod - rts/build/cmake/FindDevil.cmake | [ Diff ] [ File ] | |||
| add - rts/build/cmake/FindWindres.cmake | [ Diff ] [ File ] | |||
| mod - rts/build/scons/filelist.py | [ Diff ] [ File ] | |||
| mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | |||
| mod - rts/build/vstudio9/rts.vcproj | [ Diff ] [ File ] | |||
| mod - tools/ArchiveMover/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - tools/DedicatedServer/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - tools/DemoTool/CMakeLists.txt | [ Diff ] [ File ] | |||
| rm - tools/FontTexture/GNUmakefile | [ Diff ] [ File ] | |||
| rm - tools/FontTexture/main.cpp | [ Diff ] [ File ] | |||
| mod - tools/unitsync/CMakeLists.txt | [ Diff ] [ File ] | |||
