Source Control Integration

Author	Committer	Branch	Timestamp	Parent
spring: develop 35e5a009			[ Diff ] [ Back to Repository ]
zerver	zerver	develop	2011-06-03 02:07:28	develop 0186d51b
Changeset	Merge branch 'MT' Conflicts: AI/Skirmish/KAIK rts/Game/Game.cpp rts/Game/UI/GuiHandler.cpp rts/Game/UI/MouseHandler.cpp rts/Game/UnsyncedGameCommands.cpp rts/Lua/LuaHandle.cpp rts/Lua/LuaHandleSynced.cpp rts/Lua/LuaParser.cpp rts/Lua/LuaPathFinder.cpp rts/Lua/LuaShaders.cpp rts/Lua/LuaSyncedCtrl.cpp rts/Lua/LuaSyncedRead.cpp rts/Lua/LuaUnitDefs.cpp rts/Rendering/Textures/S3OTextureHandler.cpp rts/Sim/Units/CommandAI/Command.h rts/Sim/Units/UnitHandler.cpp rts/Sim/Units/UnitLoader.cpp rts/System/Main.cpp rts/System/Platform/CrashHandler.h rts/System/Platform/Linux/CrashHandler.cpp rts/System/Platform/Threading.cpp rts/System/Platform/Threading.h rts/System/Platform/Win/CrashHandler.cpp rts/System/SpringApp.cpp
	rm - AI/Skirmish/KAIK			[ Diff ] [ File ]
	mod - cont/LuaUI/actions.lua			[ Diff ] [ File ]
	mod - cont/LuaUI/widgets.lua			[ 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/GameServer.h			[ Diff ] [ File ]
	mod - rts/Game/LoadScreen.h			[ Diff ] [ File ]
	mod - rts/Game/NetCommands.cpp			[ Diff ] [ File ]
	mod - rts/Game/SelectedUnits.cpp			[ Diff ] [ File ]
	mod - rts/Game/Server/GameParticipant.cpp			[ Diff ] [ File ]
	mod - rts/Game/Server/GameParticipant.h			[ Diff ] [ File ]
	mod - rts/Game/UI/GuiHandler.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/GuiHandler.h			[ Diff ] [ File ]
	mod - rts/Game/UI/KeyAutoBinder.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/KeyAutoBinder.h			[ Diff ] [ File ]
	mod - rts/Game/UI/LuaUI.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/LuaUI.h			[ Diff ] [ File ]
	mod - rts/Game/UI/MiniMap.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/MouseHandler.cpp			[ Diff ] [ File ]
	mod - rts/Game/UnsyncedGameCommands.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaCallInCheck.h			[ Diff ] [ File ]
	add - rts/Lua/LuaEventBatch.h			[ Diff ] [ File ]
	mod - rts/Lua/LuaFBOs.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaGaia.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaGaia.h			[ Diff ] [ File ]
	mod - rts/Lua/LuaHandle.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaHandle.h			[ Diff ] [ File ]
	mod - rts/Lua/LuaHandleSynced.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaHandleSynced.h			[ Diff ] [ File ]
	add - rts/Lua/LuaHelper.h			[ Diff ] [ File ]
	mod - rts/Lua/LuaIO.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaLobby.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaLobby.h			[ Diff ] [ File ]
	mod - rts/Lua/LuaOpenGL.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaParser.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaPathFinder.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaRBOs.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaRBOs.h			[ Diff ] [ File ]
	mod - rts/Lua/LuaRules.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaRules.h			[ Diff ] [ File ]
	mod - rts/Lua/LuaShaders.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaSyncedCtrl.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaSyncedMoveCtrl.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaSyncedRead.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaSyncedTable.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaUnitDefs.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaUnitRendering.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaUnsyncedCtrl.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaUnsyncedRead.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaUtils.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaUtils.h			[ Diff ] [ File ]
	mod - rts/Lua/LuaVFS.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaWeaponDefs.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/DebugDrawerAI.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/GL/myGL.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/Models/IModelParser.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/Models/IModelParser.h			[ Diff ] [ File ]
	mod - rts/Rendering/Models/WorldObjectModelRenderer.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/ProjectileDrawer.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/Textures/S3OTextureHandler.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/UnitDrawer.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Features/FeatureHandler.cpp			[ Diff ] [ File ]
mod - rts/Sim/Misc/GroundBlockingObjectMap.cpp			[ Diff ] [ File ]
mod - rts/Sim/Misc/GroundBlockingObjectMap.h			[ Diff ] [ File ]
mod - rts/Sim/Misc/ModInfo.cpp			[ Diff ] [ File ]
mod - rts/Sim/Misc/ModInfo.h			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/Projectile.h			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/ProjectileHandler.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/Command.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/Command.h			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/CommandQueue.h			[ Diff ] [ File ]
mod - rts/Sim/Units/Scripts/LuaUnitScript.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/Unit.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/UnitHandler.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/UnitLoader.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/FileHandler.cpp			[ Diff ] [ File ]
mod - rts/System/GlobalConfig.cpp			[ Diff ] [ File ]
mod - rts/System/GlobalConfig.h			[ Diff ] [ File ]
mod - rts/System/LogOutput.cpp			[ Diff ] [ File ]
mod - rts/System/Main.cpp			[ Diff ] [ File ]
mod - rts/System/Net/PackPacket.h			[ Diff ] [ File ]
mod - rts/System/NetProtocol.cpp			[ Diff ] [ File ]
mod - rts/System/Platform/CrashHandler.h			[ Diff ] [ File ]
mod - rts/System/Platform/Linux/CrashHandler.cpp			[ Diff ] [ File ]
mod - rts/System/Platform/Mac/CrashHandler.cpp			[ Diff ] [ File ]
mod - rts/System/Platform/Synchro.h			[ Diff ] [ File ]
mod - rts/System/Platform/Threading.cpp			[ Diff ] [ File ]
mod - rts/System/Platform/Threading.h			[ Diff ] [ File ]
mod - rts/System/Platform/Win/CrashHandler.cpp			[ Diff ] [ File ]
mod - rts/System/SpringApp.cpp			[ Diff ] [ File ]
mod - rts/System/SpringApp.h			[ Diff ] [ File ]
mod - rts/System/TimeProfiler.cpp			[ Diff ] [ File ]
mod - rts/build/vstudio8/rts.vcproj			[ Diff ] [ File ]
mod - rts/lib/gml/ThreadSafeContainers.h			[ Diff ] [ File ]
mod - rts/lib/gml/gml.cpp			[ Diff ] [ File ]
mod - rts/lib/gml/gml.h			[ Diff ] [ File ]
mod - rts/lib/gml/gmlcls.h			[ Diff ] [ File ]
add - rts/lib/gml/gmlcnf.h			[ Diff ] [ File ]
mod - rts/lib/gml/gmldef.h			[ Diff ] [ File ]
mod - rts/lib/gml/gmlfun.h			[ Diff ] [ File ]
add - rts/lib/gml/gmlmut.h			[ Diff ] [ File ]
add - rts/lib/gml/gmlque.h			[ Diff ] [ File ]
mod - rts/lib/gml/gmlsrv.h			[ Diff ] [ File ]
mod - rts/lib/lua/include/LuaInclude.h			[ Diff ] [ File ]
mod - rts/lib/lua/src/lstate.cpp			[ Diff ] [ File ]
mod - rts/lib/lua/src/lstate.h			[ Diff ] [ File ]