Source Control Integration

Author	Committer	Branch	Timestamp	Parent
spring: develop f326bc48			[ Diff ] [ Back to Repository ]
hoijui	hoijui	develop	2009-10-23 09:31:28	develop 0778e516
Changeset	Merge commit 'origin/master' into javaaispeed Conflicts: AI/Interfaces/Java/src/main/native/JavaBridge.c
	mod - AI/CMakeLists.txt			[ Diff ] [ File ]
	mod - AI/Interfaces/Java/CMakeLists.txt			[ Diff ] [ File ]
	mod - AI/Interfaces/Java/bin/build.xml			[ Diff ] [ File ]
	mod - AI/Interfaces/Java/src/main/native/JavaBridge.c			[ Diff ] [ File ]
	mod - AI/SConscript			[ Diff ] [ File ]
	mod - AI/Skirmish/AAI/data/AIOptions.lua			[ Diff ] [ File ]
	add - AI/Skirmish/CppTestAI/data/AIOptions.lua			[ Diff ] [ File ]
	mod - AI/Skirmish/KAIK/Containers.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/KAIK/Containers.h			[ Diff ] [ File ]
	mod - AI/Skirmish/KAIK/DefenseMatrix.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/KAIK/UnitHandler.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/KAIK/data/AIOptions.lua			[ Diff ] [ File ]
	add - AI/Skirmish/NullAI/data/AIOptions.lua			[ Diff ] [ File ]
	mod - AI/Skirmish/NullJavaAI/bin/build.xml			[ Diff ] [ File ]
	mod - AI/Skirmish/NullJavaAI/data/AIOptions.lua			[ Diff ] [ File ]
	mod - AI/Skirmish/NullLegacyCppAI/data/AIOptions.lua			[ Diff ] [ File ]
	mod - AI/Skirmish/NullOOJavaAI/bin/build.xml			[ Diff ] [ File ]
	mod - AI/Skirmish/NullOOJavaAI/data/AIOptions.lua			[ Diff ] [ File ]
	mod - AI/Skirmish/RAI/data/AIOptions.lua			[ Diff ] [ File ]
	mod - AI/Wrappers/Cpp/CMakeLists.txt			[ Diff ] [ File ]
	mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp			[ Diff ] [ File ]
	mod - CMakeLists.txt			[ Diff ] [ File ]
	mod - Documentation/changelog.txt			[ Diff ] [ File ]
	mod - README.AUTHORS			[ Diff ] [ File ]
	mod - installer/builddata/springcontent/shaders/bumpWaterCoastBlurFS.glsl			[ Diff ] [ File ]
	rm - installer/builddata/springcontent/shaders/unit.vp			[ Diff ] [ File ]
	mod - installer/builddata/springcontent/shaders/units3o.vp			[ Diff ] [ File ]
	mod - installer/builddata/springcontent/shaders/units3o2.vp			[ Diff ] [ File ]
	mod - rts/CMakeLists.txt			[ Diff ] [ File ]
	mod - rts/Game/Camera.cpp			[ Diff ] [ File ]
	mod - rts/Game/Camera.h			[ Diff ] [ File ]
	mod - rts/Game/Camera/FPSController.cpp			[ Diff ] [ File ]
	mod - rts/Game/Camera/FreeController.cpp			[ Diff ] [ File ]
	mod - rts/Game/Camera/OverheadController.cpp			[ Diff ] [ File ]
	mod - rts/Game/Camera/RotOverheadController.cpp			[ Diff ] [ File ]
	mod - rts/Game/Camera/SmoothController.cpp			[ Diff ] [ File ]
	mod - rts/Game/Camera/TWController.cpp			[ 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/Player.cpp			[ Diff ] [ File ]
	mod - rts/Game/Player.h			[ Diff ] [ File ]
	mod - rts/Game/PreGame.cpp			[ Diff ] [ File ]
	mod - rts/Game/SelectMenu.cpp			[ Diff ] [ File ]
	mod - rts/Game/SelectMenu.h			[ Diff ] [ File ]
	mod - rts/Game/UI/GameSetupDrawer.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/MouseHandler.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/SelectionKeyHandler.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaFonts.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaOpenGL.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaSyncedCtrl.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaSyncedRead.cpp			[ Diff ] [ File ]
	mod - rts/Map/SMF/BFGroundDrawer.cpp			[ Diff ] [ File ]
	mod - rts/Map/SMF/BFGroundTextures.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/Env/AdvWater.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/Env/BasicWater.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/Env/BumpWater.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/Env/DynWater.cpp			[ Diff ] [ File ]
	add - rts/Rendering/HUDDrawer.cpp			[ Diff ] [ File ]
	add - rts/Rendering/HUDDrawer.h			[ Diff ] [ File ]
	mod - rts/Rendering/Textures/Bitmap.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/Textures/Bitmap.h			[ Diff ] [ File ]
	mod - rts/Rendering/Textures/TextureAtlas.cpp			[ Diff ] [ File ]
mod - rts/Rendering/UnitModels/3DOParser.cpp			[ 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/FeatureHandler.cpp			[ Diff ] [ File ]
mod - rts/Sim/Features/FeatureHandler.h			[ Diff ] [ File ]
mod - rts/Sim/Misc/AirBaseHandler.cpp			[ Diff ] [ File ]
mod - rts/Sim/Misc/AirBaseHandler.h			[ Diff ] [ File ]
mod - rts/Sim/Path/PathFinder.cpp			[ Diff ] [ File ]
mod - rts/Sim/Path/PathFinder.h			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/FlareProjectile.cpp			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/PieceProjectile.cpp			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/Projectile.cpp			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/Projectile.h			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/DirtProjectile.cpp			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/GenericParticleProjectile.cpp			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/GenericParticleProjectile.h			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.h			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/WreckProjectile.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/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/Units/COB/UnitScript.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/COB/UnitScript.h			[ 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/UnitTypes/Builder.cpp			[ Diff ] [ File ]
mod - rts/System/FileSystem/Archive7Zip.cpp			[ Diff ] [ File ]
mod - rts/System/FileSystem/Archive7Zip.h			[ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveBuffered.h			[ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveHPI.cpp			[ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveHPI.h			[ Diff ] [ File ]
mod - rts/System/FileSystem/ArchivePool.cpp			[ Diff ] [ File ]
mod - rts/System/FileSystem/ArchivePool.h			[ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveZip.cpp			[ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveZip.h			[ Diff ] [ File ]
mod - rts/System/LogOutput.cpp			[ Diff ] [ File ]
mod - rts/System/Net/UDPConnection.cpp			[ Diff ] [ File ]
mod - rts/System/Net/UDPListener.cpp			[ Diff ] [ File ]
mod - rts/System/Platform/Win/CrashHandler.cpp			[ Diff ] [ File ]
mod - rts/System/Platform/Win/wsdl.cpp			[ 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 ]
mod - rts/System/Sound/SoundItem.cpp			[ Diff ] [ File ]
mod - rts/System/Sound/SoundItem.h			[ Diff ] [ File ]
mod - rts/System/Sound/SoundSource.cpp			[ Diff ] [ File ]
mod - rts/System/SpringApp.cpp			[ Diff ] [ File ]
mod - rts/System/StdAfx.h			[ Diff ] [ File ]
mod - rts/System/TimeProfiler.cpp			[ Diff ] [ File ]
mod - rts/System/TimeProfiler.h			[ Diff ] [ File ]
add - rts/System/UpdaterWindow.cpp			[ Diff ] [ File ]
add - rts/System/UpdaterWindow.h			[ Diff ] [ File ]
mod - rts/aGui/Window.cpp			[ Diff ] [ File ]
mod - rts/build/scons/rts.py			[ Diff ] [ File ]
mod - rts/build/vstudio8/rts.vcproj			[ Diff ] [ File ]
mod - rts/lib/CMakeLists.txt			[ Diff ] [ File ]
mod - rts/lib/gml/gmlcls.h			[ Diff ] [ File ]
add - rts/lib/liblobby/CMakeLists.txt			[ Diff ] [ File ]
add - rts/lib/liblobby/Connection.cpp			[ Diff ] [ File ]
add - rts/lib/liblobby/Connection.h			[ Diff ] [ File ]
add - rts/lib/liblobby/testapp.cpp			[ Diff ] [ File ]
mod - tools/DedicatedServer/CMakeLists.txt			[ Diff ] [ File ]