| spring: develop 4536d4ce | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| Tarendai | Tarendai | develop | 2009-03-11 22:52:31 | develop 9c23f0f1 |
| Changeset | Merge branch 'master' of git://github.com/spring/spring into origin/ntai Conflicts: AI/Skirmish/NTai/AI/NTai/Helpers/CConfigData.cpp |
|||
| mod - AI/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/C/Interface.cpp | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/C/Interface.h | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/C/InterfaceExport.cpp | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/C/InterfaceExport.h | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/InterfaceExport.c | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/InterfaceExport.h | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/JavaBridge.c | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/JavaBridge.h | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/bin/build.xml | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/bin/common.awk | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/bin/commonDoc.awk | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/bin/commonOOCallback.awk | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/bin/java_generateWrappers.bat | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/bin/java_generateWrappers.sh | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/bin/java_wrappCallbackOO.awk | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/bin/jna_wrappCallback.awk | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/bin/jna_wrappEvents.awk | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/bin/native_createCallbackFPInitializations.awk | [ Diff ] [ File ] | |||
| add - AI/Interfaces/Java/bin/native_createCallbackFunctionImpls.awk | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/data/jvm.properties | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/java/src/com/clan_sy/spring/ai/AI.java | [ Diff ] [ File ] | |||
| mod - AI/SConscript | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/AIExport.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/AIExport.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/aidef.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/data/AIInfo.lua | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/AIExport.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/AIExport.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/Defines.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/data/AIInfo.lua | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/NTai/AI/NTai/Core/AIExport.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/NTai/AI/NTai/Core/AIExport.h | [ Diff ] [ File ] | |||
| rm - AI/Skirmish/NTai/AI/NTai/Core/Interface.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/NTai/AI/NTai/Helpers/CConfigData.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/NTai/data/AIInfo.lua | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/NullAI/AIExport.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/NullAI/data/AIInfo.lua | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/NullJavaAI/data/AIInfo.lua | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/NullJavaAI/src/nulljavaai/NullJavaAI.java | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/NullLegacyCppAI/AIExport.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/NullLegacyCppAI/AIExport.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/NullLegacyCppAI/data/AIInfo.lua | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/NullOOJavaAI/data/AIInfo.lua | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/NullOOJavaAI/src/nulloojavaai/NullOOJavaAI.java | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/NullOOJavaAI/src/nulloojavaai/NullOOJavaAIFactory.java | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/AIExport.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/AIExport.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/BuilderPlacement.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/GResourceMap.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/GTerrainMap.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/LogFile.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/LogFile.h | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/RAI.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/SWeaponManager.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/RAI/data/AIInfo.lua | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/CUtils/Util.c | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/CUtils/Util.h | [ 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 ] | |||
| mod - AI/Wrappers/LegacyCpp/AIGlobalAICallback.cpp | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIGlobalAICallback.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/Event/AIEvents.h | [ Diff ] [ File ] | |||
| mod - Documentation/SpringStartScript.txt | [ Diff ] [ File ] | |||
| mod - installer/sections/sectiondesc.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/springlobby.nsh | [ Diff ] [ File ] | |||
| mod - installer/spring.nsi | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICheats.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AIInterfaceLibrary.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AIInterfaceLibraryInfo.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AIInterfaceLibraryInfo.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AILibraryManager.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AILibraryManager.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/EngineOutHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/EngineOutHandler.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/GlobalAICallback.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/IAICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/IAICheats.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/IAILibraryManager.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/IGlobalAI.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/IGlobalAICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/AISCommands.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/AISEvents.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/SAIInterfaceCallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/SAIInterfaceLibrary.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/aidefines.h | [ Diff ] [ File ] | |||
| rm - rts/ExternalAI/SAICallback.cpp | [ Diff ] [ File ] | |||
| rm - rts/ExternalAI/SAIInterfaceCallback.cpp | [ Diff ] [ File ] | |||
| add - rts/ExternalAI/SAIInterfaceCallbackImpl.cpp | [ Diff ] [ File ] | |||
| add - rts/ExternalAI/SAIInterfaceCallbackImpl.h | [ Diff ] [ File ] | |||
| add - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | |||
| add - rts/ExternalAI/SSkirmishAICallbackImpl.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAILibrary.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAILibrary.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAILibraryInfo.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAILibraryInfo.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAIWrapper.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAIWrapper.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/aibase.h | [ 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/GameSetup.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameSetup.h | [ Diff ] [ File ] | |||
| mod - rts/Game/StartScripts/SkirmishAITestScript.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/InfoConsole.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/InfoConsole.h | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnsyncedCtrl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUnsyncedRead.cpp | [ Diff ] [ File ] | |||
| mod - rts/Map/SM3/terrain/TerrainTexture.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/ModInfo.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/AAirMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/AirMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/TAAirMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/PlasmaRepulser.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/StarburstLauncher.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Weapons/WeaponDefHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/FileHandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/FileSystem.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/FileSystem.h | [ Diff ] [ File ] | |||
| mod - rts/System/GlobalUnsynced.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/MemPool.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/MemPool.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/ALShared.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Sound/ALShared.h | [ Diff ] [ File ] | |||
| add - rts/System/Sound/Music.cpp | [ Diff ] [ File ] | |||
| add - rts/System/Sound/Music.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/creg/Serializer.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/creg/creg.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/maindefines.h | [ 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/lib/hpiutil2/hpientry.cpp | [ Diff ] [ File ] | |||
| mod - rts/lib/hpiutil2/hpifile.cpp | [ Diff ] [ File ] | |||
| mod - rts/lib/hpiutil2/scrambledfile.cpp | [ Diff ] [ File ] | |||
| mod - rts/lib/hpiutil2/sqshstream.cpp | [ Diff ] [ File ] | |||
| mod - rts/lib/hpiutil2/substream.cpp | [ Diff ] [ File ] | |||
| mod - tools/DedicatedServer/main.cpp | [ Diff ] [ File ] | |||
| mod - tools/unitsync/unitsync.cpp | [ Diff ] [ File ] | |||
| mod - tools/unitsync/unitsync_api.h | [ Diff ] [ File ] | |||
