2025-08-04 01:40 CEST
  

spring: develop 0eac9f5f [ Diff ] [ Back to Repository ]
Author Committer Branch Timestamp Parent
jK jK develop 2014-01-13 00:18:14 develop 059f13cb
Changeset Merge branch 'luasynced_split' into develop

Conflicts:
    rts/Lua/LuaContextData.h
    rts/Lua/LuaEventBatch.h
    rts/Lua/LuaHandle.cpp
    rts/Lua/LuaHandle.h
    rts/Lua/LuaHandleSynced.cpp
    rts/Lua/LuaRules.cpp
    rts/Lua/LuaUI.cpp
    rts/Lua/LuaUtils.h
    rts/Sim/Features/Feature.cpp
    rts/Sim/Misc/ModInfo.cpp
    rts/Sim/Projectiles/Unsynced/ShieldProjectile.cpp
    rts/Sim/Units/Scripts/LuaUnitScript.cpp
    rts/Sim/Units/Unit.cpp
    rts/System/EventHandler.h
    rts/System/GlobalConfig.cpp
    rts/System/GlobalConfig.h
    rts/System/Platform/Linux/myX11.cpp
    rts/lib/lua/include/LuaUser.cpp
    rts/lib/lua/src/lmathlib.cpp
mod - rts/Game/Game.cpp [ Diff ] [ File ]
mod - rts/Game/GameHelper.cpp [ Diff ] [ File ]
mod - rts/Game/Players/Player.cpp [ Diff ] [ File ]
mod - rts/Game/SyncedGameCommands.cpp [ 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/MiniMap.cpp [ Diff ] [ File ]
mod - rts/Game/UI/MouseHandler.cpp [ Diff ] [ File ]
mod - rts/Game/UnsyncedGameCommands.cpp [ Diff ] [ File ]
mod - rts/Lua/CMakeLists.txt [ Diff ] [ File ]
rm - rts/Lua/LuaCallInCheck.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaCallInCheck.h [ Diff ] [ File ]
mod - rts/Lua/LuaConfig.h [ Diff ] [ File ]
mod - rts/Lua/LuaContextData.h [ Diff ] [ File ]
mod - rts/Lua/LuaEventBatch.h [ 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 ]
rm - rts/Lua/LuaHelper.h [ Diff ] [ File ]
mod - rts/Lua/LuaIntro.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaIntro.h [ Diff ] [ File ]
mod - rts/Lua/LuaOpenGL.h [ Diff ] [ File ]
mod - rts/Lua/LuaParser.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaRules.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaRules.h [ Diff ] [ File ]
mod - rts/Lua/LuaShaders.cpp [ Diff ] [ File ]
rm - rts/Lua/LuaSyncedCall.cpp [ Diff ] [ File ]
rm - rts/Lua/LuaSyncedCall.h [ 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/LuaUI.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUI.h [ Diff ] [ File ]
mod - rts/Lua/LuaUnitDefs.cpp [ Diff ] [ File ]
rm - rts/Lua/LuaUnsyncedCall.cpp [ Diff ] [ File ]
rm - rts/Lua/LuaUnsyncedCall.h [ 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/Net/NetCommands.cpp [ Diff ] [ File ]
mod - rts/Rendering/FeatureDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/ProjectileDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/UnitDrawer.cpp [ Diff ] [ File ]
mod - rts/Sim/Features/Feature.cpp [ Diff ] [ File ]
mod - rts/Sim/Features/FeatureHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/InterceptHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/ModInfo.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/ModInfo.h [ Diff ] [ File ]
mod - rts/Sim/Misc/Team.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/ScriptMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/ShieldProjectile.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/CommandAI.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/Scripts/CobThread.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/Scripts/CobThread.h [ Diff ] [ File ]
mod - rts/Sim/Units/Scripts/LuaUnitScript.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/Unit.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/Weapon.cpp [ Diff ] [ File ]
mod - rts/System/EventBatchHandler.cpp [ Diff ] [ File ]
mod - rts/System/EventBatchHandler.h [ 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/Events.def [ Diff ] [ File ]
mod - rts/System/GlobalConfig.cpp [ Diff ] [ File ]
mod - rts/System/GlobalConfig.h [ Diff ] [ File ]
mod - rts/lib/lua/include/LuaInclude.h [ Diff ] [ File ]
mod - rts/lib/lua/include/LuaUser.cpp [ Diff ] [ File ]
mod - rts/lib/lua/include/luaconf.h [ Diff ] [ File ]
mod - rts/lib/lua/src/lmathlib.cpp [ Diff ] [ File ]