Source Control Integration

Author	Committer	Branch	Timestamp	Parent
spring: develop e97d1754			[ Diff ] [ Back to Repository ]
hoijui	hoijui	develop	2009-12-15 20:26:38	develop c558b24e
Changeset	Merge commit 'originSpring/master' into pureint Conflicts: AI/Interfaces/Java/bin/java_wrappCallbackOO.awk AI/Skirmish/NullLegacyCppAI/src/AIExport.cpp AI/Skirmish/NullLegacyCppAI/src/AIExport.h rts/ExternalAI/SSkirmishAICallbackImpl.cpp rts/Game/Game.cpp
	mod - .gitmodules			[ Diff ] [ File ]
	mod - AI/Interfaces/Java/src/main/native/JvmLocater_windows.c			[ Diff ] [ File ]
	mod - AI/Skirmish/AAI/data/AIInfo.lua			[ Diff ] [ File ]
	add - AI/Skirmish/AAI/data/cfg/mod/BA704.cfg			[ Diff ] [ File ]
	mod - AI/Skirmish/E323AI			[ Diff ] [ File ]
	mod - AI/Skirmish/KAIK/AttackHandler.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/KAIK/AttackHandler.h			[ Diff ] [ File ]
	mod - AI/Skirmish/KAIK/BuildUp.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/KAIK/DGunController.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/KAIK/PathFinder.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/KAIK/PathFinder.h			[ Diff ] [ File ]
	mod - AI/Skirmish/KAIK/ThreatMap.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/KAIK/ThreatMap.h			[ Diff ] [ File ]
	mod - AI/Skirmish/KAIK/Unit.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/KAIK/data/AIInfo.lua			[ Diff ] [ File ]
	rm - AI/Skirmish/NTai			[ Diff ] [ File ]
	mod - AI/Skirmish/NullAI/data/AIInfo.lua			[ Diff ] [ File ]
	rm - AI/Skirmish/NullLegacyCppAI/CMakeLists.txt			[ Diff ] [ File ]
	rm - AI/Skirmish/NullLegacyCppAI/VERSION			[ Diff ] [ File ]
	rm - AI/Skirmish/NullLegacyCppAI/data/AIInfo.lua			[ Diff ] [ File ]
	rm - AI/Skirmish/NullLegacyCppAI/data/AIOptions.lua			[ Diff ] [ File ]
	rm - AI/Skirmish/NullLegacyCppAI/src/AIExport.cpp			[ Diff ] [ File ]
	rm - AI/Skirmish/NullLegacyCppAI/src/AIExport.h			[ Diff ] [ File ]
	rm - AI/Skirmish/NullLegacyCppAI/src/TestGlobalAI.cpp			[ Diff ] [ File ]
	rm - AI/Skirmish/NullLegacyCppAI/src/TestGlobalAI.h			[ Diff ] [ File ]
	mod - AI/Skirmish/RAI/GResourceMap.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/RAI/GResourceMap.h			[ 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/RAI.h			[ Diff ] [ File ]
	mod - AI/Skirmish/RAI/data/AIInfo.lua			[ Diff ] [ File ]
	mod - CMakeLists.txt			[ Diff ] [ File ]
	mod - Documentation/changelog.txt			[ Diff ] [ File ]
	add - Documentation/manpages/make_manpages.sh			[ Diff ] [ File ]
	add - Documentation/manpages/spring-dedicated.6.txt			[ Diff ] [ File ]
	add - Documentation/manpages/spring.6.txt			[ Diff ] [ File ]
	mod - SConstruct			[ Diff ] [ File ]
	mod - installer/builddata/springcontent/shaders/terrainCommon.glsl			[ Diff ] [ File ]
	mod - installer/builddata/springcontent/shaders/terrainFragmentShader.glsl			[ Diff ] [ File ]
	mod - installer/builddata/springcontent/shaders/terrainSimpleCopyFS.glsl			[ Diff ] [ File ]
	mod - installer/freedesktop/applications/spring.desktop			[ Diff ] [ File ]
	mod - installer/make_gamedata_arch.bat			[ Diff ] [ File ]
	mod - installer/make_gamedata_arch.sh			[ Diff ] [ File ]
	rm - installer/make_portable.sh			[ Diff ] [ File ]
	mod - installer/make_source_package.sh			[ Diff ] [ File ]
	rm - installer/pkzip.exe			[ Diff ] [ File ]
	add - installer/sections/AIs/E323AI.nsh			[ Diff ] [ File ]
	mod - installer/sections/sectiondesc.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/EngineOutHandler.h			[ Diff ] [ File ]
	mod - rts/ExternalAI/Interface/AISCommands.h			[ Diff ] [ File ]
	mod - rts/ExternalAI/Interface/SAIInterfaceCallback.h			[ Diff ] [ File ]
	mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp			[ Diff ] [ File ]
	mod - rts/ExternalAI/SkirmishAIHandler.cpp			[ Diff ] [ File ]
	mod - rts/ExternalAI/SkirmishAIHandler.h			[ Diff ] [ File ]
	mod - rts/ExternalAI/SkirmishAIWrapper.h			[ Diff ] [ File ]
	mod - rts/Game/Console.h			[ 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/GameHelper.h			[ 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/GameVersion.cpp			[ Diff ] [ File ]
mod - rts/Game/PreGame.cpp			[ Diff ] [ File ]
mod - rts/Game/PreGame.h			[ Diff ] [ File ]
mod - rts/Game/SelectMenu.cpp			[ Diff ] [ File ]
mod - rts/Game/SelectMenu.h			[ Diff ] [ File ]
mod - rts/Game/SelectedUnits.cpp			[ Diff ] [ File ]
mod - rts/Game/SelectionWidget.cpp			[ Diff ] [ File ]
mod - rts/Game/SelectionWidget.h			[ Diff ] [ File ]
mod - rts/Game/Server/GameParticipant.cpp			[ Diff ] [ File ]
mod - rts/Game/Server/GameParticipant.h			[ Diff ] [ File ]
mod - rts/Game/Server/MsgStrings.h			[ Diff ] [ File ]
mod - rts/Game/StartScripts/CommanderScript.cpp			[ Diff ] [ File ]
mod - rts/Game/StartScripts/LoadScript.cpp			[ Diff ] [ File ]
mod - rts/Game/StartScripts/LoadScript.h			[ Diff ] [ File ]
mod - rts/Game/StartScripts/Script.cpp			[ Diff ] [ File ]
mod - rts/Game/StartScripts/Script.h			[ Diff ] [ File ]
mod - rts/Game/UI/GameInfo.cpp			[ Diff ] [ File ]
mod - rts/Game/UI/GuiHandler.cpp			[ Diff ] [ File ]
mod - rts/Game/UI/GuiHandler.h			[ Diff ] [ File ]
mod - rts/Game/UI/LuaUI.cpp			[ Diff ] [ File ]
mod - rts/Game/UI/QuitBox.cpp			[ Diff ] [ File ]
mod - rts/Game/UI/TooltipConsole.cpp			[ Diff ] [ File ]
mod - rts/Lua/LuaConstGL.cpp			[ Diff ] [ File ]
mod - rts/Lua/LuaHandle.cpp			[ Diff ] [ File ]
mod - rts/Lua/LuaHandle.h			[ Diff ] [ File ]
mod - rts/Lua/LuaOpenGL.cpp			[ Diff ] [ File ]
mod - rts/Lua/LuaSyncedCtrl.cpp			[ Diff ] [ File ]
mod - rts/Lua/LuaSyncedCtrl.h			[ Diff ] [ File ]
mod - rts/Lua/LuaSyncedRead.cpp			[ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedRead.cpp			[ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedRead.h			[ Diff ] [ File ]
mod - rts/Map/BaseGroundDrawer.cpp			[ Diff ] [ File ]
mod - rts/Map/BasicMapDamage.cpp			[ Diff ] [ File ]
mod - rts/Map/BasicMapDamage.h			[ 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/ReadMap.h			[ Diff ] [ File ]
mod - rts/Map/SM3/Sm3GroundDrawer.cpp			[ Diff ] [ File ]
mod - rts/Map/SM3/Sm3Map.cpp			[ Diff ] [ File ]
mod - rts/Map/SM3/Sm3Map.h			[ Diff ] [ File ]
mod - rts/Map/SM3/terrain/Terrain.cpp			[ Diff ] [ File ]
mod - rts/Map/SM3/terrain/Terrain.h			[ Diff ] [ File ]
mod - rts/Map/SM3/terrain/TerrainTexture.cpp			[ Diff ] [ File ]
mod - rts/Map/SM3/terrain/TerrainTexture.h			[ Diff ] [ File ]
mod - rts/Map/SM3/terrain/TerrainTextureGLSL.cpp			[ Diff ] [ File ]
mod - rts/Map/SM3/terrain/TerrainTextureGLSL.h			[ Diff ] [ File ]
mod - rts/Map/SMF/BFGroundDrawer.cpp			[ Diff ] [ File ]
mod - rts/Map/SMF/BFGroundTextures.cpp			[ Diff ] [ File ]
mod - rts/Map/SMF/SmfMapFile.cpp			[ Diff ] [ File ]
mod - rts/Map/SMF/SmfMapFile.h			[ Diff ] [ File ]
mod - rts/Map/SMF/SmfReadMap.cpp			[ Diff ] [ File ]
mod - rts/Map/SMF/SmfReadMap.h			[ Diff ] [ File ]
mod - rts/Rendering/Env/AdvTreeDrawer.cpp			[ Diff ] [ File ]
mod - rts/Rendering/Env/AdvWater.cpp			[ Diff ] [ File ]
mod - rts/Rendering/Env/BaseTreeDrawer.cpp			[ Diff ] [ File ]
mod - rts/Rendering/Env/BaseTreeDrawer.h			[ Diff ] [ File ]
mod - rts/Rendering/Env/BasicTreeDrawer.cpp			[ Diff ] [ File ]
mod - rts/Rendering/Env/BumpWater.cpp			[ Diff ] [ File ]
mod - rts/Rendering/Env/DynWater.cpp			[ Diff ] [ File ]
mod - rts/Rendering/FartextureHandler.cpp			[ Diff ] [ File ]
mod - rts/Rendering/FartextureHandler.h			[ Diff ] [ File ]
mod - rts/Rendering/GL/myGL.cpp			[ Diff ] [ File ]
mod - rts/Rendering/GL/myGL.h			[ Diff ] [ File ]
mod - rts/Rendering/GroundDecalHandler.cpp			[ Diff ] [ File ]
mod - rts/Rendering/InMapDraw.cpp			[ Diff ] [ File ]
mod - rts/Rendering/InMapDraw.h			[ Diff ] [ File ]
add - rts/Rendering/Screenshot.cpp			[ Diff ] [ File ]
add - rts/Rendering/Screenshot.h			[ Diff ] [ File ]
mod - rts/Rendering/ShadowHandler.cpp			[ Diff ] [ File ]
mod - rts/Rendering/Textures/3DOTextureHandler.cpp			[ Diff ] [ File ]
mod - rts/Rendering/Textures/Bitmap.cpp			[ Diff ] [ File ]
mod - rts/Rendering/Textures/Bitmap.h			[ Diff ] [ File ]
mod - rts/Rendering/Textures/S3OTextureHandler.cpp			[ Diff ] [ File ]
mod - rts/Rendering/Textures/TAPalette.cpp			[ Diff ] [ File ]
mod - rts/Rendering/Textures/TAPalette.h			[ Diff ] [ File ]
add - rts/Rendering/UnitModels/FeatureDrawer.cpp			[ Diff ] [ File ]
add - rts/Rendering/UnitModels/FeatureDrawer.h			[ Diff ] [ File ]
mod - rts/Rendering/UnitModels/UnitDrawer.cpp			[ Diff ] [ File ]
mod - rts/Rendering/UnitModels/UnitDrawer.h			[ Diff ] [ File ]
mod - rts/Rendering/glFont.cpp			[ Diff ] [ File ]
mod - rts/Rendering/glFont.h			[ Diff ] [ File ]
mod - rts/Sim/Features/Feature.cpp			[ Diff ] [ File ]
mod - rts/Sim/Features/FeatureHandler.cpp			[ Diff ] [ File ]
mod - rts/Sim/Features/FeatureHandler.h			[ Diff ] [ File ]
mod - rts/Sim/Misc/ModInfo.cpp			[ Diff ] [ File ]
mod - rts/Sim/Misc/ModInfo.h			[ Diff ] [ File ]
mod - rts/Sim/Misc/QuadField.cpp			[ Diff ] [ File ]
mod - rts/Sim/Misc/Team.cpp			[ Diff ] [ File ]
mod - rts/Sim/Misc/Team.h			[ Diff ] [ File ]
mod - rts/Sim/Misc/TeamBase.cpp			[ Diff ] [ File ]
mod - rts/Sim/Misc/TeamBase.h			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/AirMoveType.cpp			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveInfo.cpp			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveInfo.h			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveMath/GroundMoveMath.cpp			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveMath/GroundMoveMath.h			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveMath/HoverMoveMath.cpp			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveMath/HoverMoveMath.h			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveMath/MoveMath.cpp			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveMath/MoveMath.h			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveMath/ShipMoveMath.cpp			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveMath/ShipMoveMath.h			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveType.cpp			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveType.h			[ Diff ] [ File ]
add - rts/Sim/MoveTypes/StaticMoveType.cpp			[ Diff ] [ File ]
add - rts/Sim/MoveTypes/StaticMoveType.h			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/TAAirMoveType.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/WeaponProjectile.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/AirCAI.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/AirCAI.h			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/Command.h			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.h			[ Diff ] [ File ]
mod - rts/Sim/Units/Unit.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/UnitDefHandler.h			[ Diff ] [ File ]
mod - rts/Sim/Units/UnitHandler.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/TransportUnit.cpp			[ Diff ] [ File ]
mod - rts/System/BaseNetProtocol.cpp			[ Diff ] [ File ]
mod - rts/System/BaseNetProtocol.h			[ Diff ] [ File ]
mod - rts/System/ConfigHandler.cpp			[ Diff ] [ File ]
mod - rts/System/ConfigHandler.h			[ Diff ] [ File ]
mod - rts/System/DemoReader.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/DataDirLocater.cpp			[ 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/LoadSaveHandler.cpp			[ Diff ] [ File ]
mod - rts/System/LogOutput.cpp			[ Diff ] [ File ]
mod - rts/System/LogOutput.h			[ Diff ] [ File ]
mod - rts/System/Matrix44f.cpp			[ Diff ] [ File ]
mod - rts/System/Matrix44f.h			[ Diff ] [ File ]
mod - rts/System/MouseInput.h			[ Diff ] [ File ]
mod - rts/System/Net/UDPConnection.cpp			[ Diff ] [ File ]
mod - rts/System/Net/UDPConnection.h			[ Diff ] [ File ]
mod - rts/System/Net/UDPListener.cpp			[ Diff ] [ File ]
mod - rts/System/NetProtocol.cpp			[ Diff ] [ File ]
mod - rts/System/Option.cpp			[ Diff ] [ File ]
mod - rts/System/Option.h			[ Diff ] [ File ]
mod - rts/System/Platform/CrashHandler.cpp			[ Diff ] [ File ]
mod - rts/System/Platform/CrashHandler.h			[ Diff ] [ File ]
mod - rts/System/Platform/Misc.h			[ Diff ] [ File ]
mod - rts/System/Platform/Win/CrashHandler.cpp			[ Diff ] [ File ]
mod - rts/System/Platform/Win/WinVersion.cpp			[ Diff ] [ File ]
mod - rts/System/SpringApp.cpp			[ Diff ] [ File ]
mod - rts/System/Util.cpp			[ Diff ] [ File ]
add - rts/System/booldefines.h			[ Diff ] [ File ]
mod - rts/System/creg/Serializer.cpp			[ Diff ] [ File ]
mod - rts/System/maindefines.h			[ Diff ] [ File ]
mod - rts/System/myMath.h			[ Diff ] [ File ]
mod - rts/aGui/LineEdit.cpp			[ Diff ] [ File ]
mod - rts/aGui/LineEdit.h			[ Diff ] [ File ]
mod - rts/aGui/List.cpp			[ Diff ] [ File ]
mod - rts/aGui/List.h			[ Diff ] [ File ]
mod - rts/aGui/Window.h			[ Diff ] [ File ]
add - rts/build/cmake/Find7zip.cmake			[ Diff ] [ File ]
add - rts/build/cmake/FindAsciiDoc.cmake			[ Diff ] [ File ]
mod - rts/build/cmake/FindZLIB.cmake			[ Diff ] [ File ]
mod - rts/build/vstudio8/rts.vcproj			[ Diff ] [ File ]
mod - rts/lib/gml/gml.h			[ Diff ] [ File ]
mod - rts/lib/liblobby/Connection.cpp			[ Diff ] [ File ]
mod - rts/lib/lua/src/lvm.cpp			[ Diff ] [ File ]
mod - rts/lib/streflop/streflopC.cpp			[ Diff ] [ File ]
mod - rts/lib/streflop/streflop_cond.h			[ Diff ] [ File ]
mod - tools/DedicatedServer/CMakeLists.txt			[ Diff ] [ File ]
mod - tools/DemoAnalyser/CMakeLists.txt			[ Diff ] [ File ]
mod - tools/DemoDumper/CMakeLists.txt			[ Diff ] [ File ]
rm - tools/nedmalloc/License.txt			[ Diff ] [ File ]
rm - tools/nedmalloc/Readme.txt			[ Diff ] [ File ]
rm - tools/nedmalloc/SConscript			[ Diff ] [ File ]
rm - tools/nedmalloc/malloc.c.h			[ Diff ] [ File ]
rm - tools/nedmalloc/nedmalloc.c			[ Diff ] [ File ]
rm - tools/nedmalloc/nedmalloc.h			[ Diff ] [ File ]
rm - tools/nedmalloc/nedmalloc.sln			[ Diff ] [ File ]
rm - tools/nedmalloc/nedmalloc.vcproj			[ Diff ] [ File ]
rm - tools/nedmalloc/test.c			[ Diff ] [ File ]
rm - tools/nedmalloc/testlist.cpp			[ Diff ] [ File ]