spring: develop 4a54d7a5 | [ Diff ] [ Back to Repository ] | |||
Author | Committer | Branch | Timestamp | Parent |
---|---|---|---|---|
hoijui | hoijui | develop | 2009-10-09 11:49:11 | develop 8f12b67a |
Changeset | Merge commit 'origin/master' into javaaispeed Conflicts: AI/Interfaces/Java/CMakeLists.txt AI/Interfaces/Java/bin/java_wrappCallbackOO.awk AI/Interfaces/Java/bin/jna_wrappCallback.awk AI/Interfaces/Java/bin/jna_wrappCommands.awk AI/Interfaces/Java/bin/jna_wrappEvents.awk AI/SConscript |
|||
mod - AI/CMakeLists.txt | [ Diff ] [ File ] | |||
mod - AI/Interfaces/Java/CMakeLists.txt | [ Diff ] [ File ] | |||
mod - AI/Interfaces/Java/bin/ant.properties | [ Diff ] [ File ] | |||
mod - AI/Interfaces/Java/bin/build.xml | [ Diff ] [ File ] | |||
mod - AI/Interfaces/Java/bin/java_compile.bat | [ Diff ] [ File ] | |||
mod - AI/Interfaces/Java/bin/java_compile.sh | [ 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_wrappCommands.awk | [ Diff ] [ File ] | |||
mod - AI/Interfaces/Java/bin/jna_wrappEvents.awk | [ Diff ] [ File ] | |||
mod - AI/SConscript | [ Diff ] [ File ] | |||
mod - AI/Skirmish/AAI/AAI ReadMe.txt | [ Diff ] [ File ] | |||
mod - AI/Skirmish/AAI/AAIExecute.h | [ Diff ] [ File ] | |||
mod - AI/Skirmish/AAI/AAIMap.cpp | [ Diff ] [ File ] | |||
mod - AI/Skirmish/AAI/data/ReadMe.txt | [ Diff ] [ File ] | |||
add - AI/Skirmish/CppTestAI/CMakeLists.txt | [ Diff ] [ File ] | |||
add - AI/Skirmish/CppTestAI/VERSION | [ Diff ] [ File ] | |||
add - AI/Skirmish/CppTestAI/data/AIInfo.lua | [ Diff ] [ File ] | |||
add - AI/Skirmish/CppTestAI/src/AIExport.cpp | [ Diff ] [ File ] | |||
add - AI/Skirmish/CppTestAI/src/AIExport.h | [ Diff ] [ File ] | |||
add - AI/Skirmish/CppTestAI/src/CppTestAI.cpp | [ Diff ] [ File ] | |||
add - AI/Skirmish/CppTestAI/src/CppTestAI.h | [ Diff ] [ File ] | |||
mod - AI/Skirmish/E323AI | [ Diff ] [ File ] | |||
mod - AI/Skirmish/HughAI | [ Diff ] [ File ] | |||
mod - AI/Skirmish/KAIK/KAIK.cpp | [ Diff ] [ File ] | |||
add - AI/Wrappers/Cpp/CMakeLists.txt | [ Diff ] [ File ] | |||
add - AI/Wrappers/Cpp/bin/wrappCallback.awk | [ Diff ] [ File ] | |||
add - AI/Wrappers/Cpp/bin/wrappCommands.awk | [ Diff ] [ File ] | |||
add - AI/Wrappers/Cpp/bin/wrappEvents.awk | [ Diff ] [ File ] | |||
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp | [ Diff ] [ File ] | |||
mod - AI/Wrappers/LegacyCpp/AIAICallback.h | [ Diff ] [ File ] | |||
mod - CMakeLists.txt | [ Diff ] [ File ] | |||
mod - Doxyfile | [ Diff ] [ File ] | |||
mod - installer/builddata/springcontent/LuaGadgets/Gadgets/unit_script.lua | [ Diff ] [ File ] | |||
mod - installer/freedesktop/applications/spring.desktop | [ 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/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/AISCommands.cpp | [ Diff ] [ File ] | |||
mod - rts/ExternalAI/EngineOutHandler.cpp | [ Diff ] [ File ] | |||
mod - rts/ExternalAI/EngineOutHandler.h | [ Diff ] [ File ] | |||
mod - rts/ExternalAI/IAICallback.h | [ Diff ] [ File ] | |||
rm - rts/ExternalAI/IAIInterfaceLibrary.h | [ Diff ] [ File ] | |||
mod - rts/ExternalAI/IAILibraryManager.h | [ Diff ] [ File ] | |||
rm - rts/ExternalAI/ISkirmishAI.h | [ Diff ] [ File ] | |||
rm - rts/ExternalAI/ISkirmishAILibrary.h | [ 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/SkirmishAIHandler.cpp | [ Diff ] [ File ] | |||
mod - rts/ExternalAI/SkirmishAIHandler.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/Game/Game.cpp | [ Diff ] [ File ] | |||
mod - rts/Game/Game.h | [ Diff ] [ File ] | |||
mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | |||
mod - rts/Game/GameSetup.cpp | [ Diff ] [ File ] | |||
mod - rts/Game/PlayerBase.h | [ Diff ] [ File ] | |||
mod - rts/Game/PlayerHandler.cpp | [ Diff ] [ File ] | |||
mod - rts/Game/PreGame.cpp | [ Diff ] [ File ] | |||
mod - rts/Game/Server/MsgStrings.h | [ Diff ] [ File ] | |||
rm - rts/Game/StartScripts/CommanderScript2.cpp | [ Diff ] [ File ] | |||
rm - rts/Game/StartScripts/CommanderScript2.h | [ Diff ] [ File ] | |||
mod - rts/Game/StartScripts/ScriptHandler.cpp | [ 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/Game/UI/SelectionKeyHandler.cpp | [ Diff ] [ File ] | |||
mod - rts/Game/UI/SelectionKeyHandler.h | [ Diff ] [ File ] | |||
mod - rts/Lua/LuaMaterial.cpp | [ Diff ] [ File ] | |||
mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | |||
mod - rts/Map/Ground.cpp | [ 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/SM3/terrain/TerrainTexture.cpp | [ Diff ] [ File ] | |||
mod - rts/Map/SM3/terrain/TerrainTextureGLSL.cpp | [ Diff ] [ File ] | |||
mod - rts/Map/SMF/BFGroundTextures.cpp | [ Diff ] [ File ] | |||
mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | |||
mod - rts/Rendering/UnitModels/3DModel.cpp | [ Diff ] [ File ] | |||
mod - rts/Rendering/UnitModels/3DModel.h | [ Diff ] [ File ] | |||
mod - rts/Rendering/UnitModels/UnitDrawer.cpp | [ Diff ] [ File ] | |||
mod - rts/Rendering/UnitModels/UnitDrawer.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Features/FeatureHandler.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Features/FeatureHandler.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Misc/GeometricObjects.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Misc/GroundBlockingObjectMap.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Misc/QuadField.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Misc/ResourceMapAnalyzer.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Misc/Team.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Misc/Team.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Misc/TeamHandler.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Objects/SolidObject.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Objects/SolidObject.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Objects/WorldObject.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Path/PathFinder.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Path/PathFinder.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Path/PathManager.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/ExpGenSpawner.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/ExplosionGenerator.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/FireProjectile.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/FlareProjectile.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/PieceProjectile.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/WeaponProjectiles/BeamLaserProjectile.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/WeaponProjectiles/EmgProjectile.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/WeaponProjectiles/ExplosiveProjectile.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/WeaponProjectiles/FireBallProjectile.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/WeaponProjectiles/FlameProjectile.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/WeaponProjectiles/LargeBeamLaserProjectile.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/WeaponProjectiles/LaserProjectile.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/WeaponProjectiles/LightningProjectile.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/WeaponProjectiles/TorpedoProjectile.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/COB/CobInstance.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/COB/CobInstance.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/COB/LuaUnitScript.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/COB/LuaUnitScript.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/COB/NullUnitScript.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/COB/NullUnitScript.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/COB/UnitScript.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/COB/UnitScript.h | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/CommandAI/CommandAI.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/Unit.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Units/Unit.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/Weapons/PlasmaRepulser.cpp | [ Diff ] [ File ] | |||
mod - rts/Sim/Weapons/WeaponDef.h | [ Diff ] [ File ] | |||
mod - rts/System/EventHandler.cpp | [ Diff ] [ File ] | |||
mod - rts/System/FastMath.h | [ Diff ] [ File ] | |||
mod - rts/System/FileSystem/ArchiveScanner.cpp | [ Diff ] [ File ] | |||
mod - rts/System/FileSystem/FileSystem.cpp | [ Diff ] [ File ] | |||
mod - rts/System/FileSystem/FileSystem.h | [ Diff ] [ File ] | |||
mod - rts/System/LogOutput.cpp | [ Diff ] [ File ] | |||
mod - rts/System/LogOutput.h | [ Diff ] [ File ] | |||
mod - rts/System/Platform/CrashHandler.cpp | [ Diff ] [ File ] | |||
mod - rts/System/Platform/CrashHandler.h | [ Diff ] [ File ] | |||
mod - rts/System/Platform/Win/CrashHandler.cpp | [ Diff ] [ File ] | |||
mod - rts/System/Platform/Win/CrashHandler.h | [ Diff ] [ File ] | |||
mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | |||
mod - rts/System/creg/creg.cpp | [ Diff ] [ File ] | |||
mod - rts/System/creg/creg.h | [ Diff ] [ File ] | |||
mod - rts/System/creg/creg_cond.h | [ Diff ] [ File ] | |||
mod - rts/System/float3.h | [ Diff ] [ File ] | |||
mod - rts/System/maindefines.h | [ Diff ] [ File ] | |||
mod - rts/build/scons/config.py | [ Diff ] [ File ] | |||
mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | |||
mod - rts/build/vstudio9/rts.vcproj | [ Diff ] [ File ] | |||
mod - rts/lib/gml/gmlsrv.h | [ Diff ] [ File ] | |||
mod - tools/DemoAnalyser/CMakeLists.txt | [ Diff ] [ File ] | |||
mod - tools/unitsync/unitsync.cpp | [ Diff ] [ File ] |