2025-08-25 15:35 CEST
  

spring: develop fce131cc [ Diff ] [ Back to Repository ]
Author Committer Branch Timestamp Parent
Andrea Piras Andrea Piras develop 2010-09-09 18:45:35 develop 676edef6
Changeset Merge remote branch 'origin/master' into gameEnd

Conflicts:
    rts/Game/Game.cpp
    rts/Game/GameServer.cpp
    rts/Lua/LuaConstGame.cpp
    rts/System/AutohostInterface.cpp
mod - AI/Skirmish/AAI/AAI.cpp [ Diff ] [ File ]
mod - AI/Skirmish/E323AI [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.h [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/IAICallback.h [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/UnitDef.cpp [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/UnitDef.h [ Diff ] [ File ]
mod - cont/LuaUI/Widgets/unit_metal_maker.lua [ Diff ] [ File ]
mod - cont/base/make_gamedata_arch.bat [ Diff ] [ File ]
mod - cont/base/make_gamedata_arch.sh [ Diff ] [ File ]
add - cont/base/springcontent/LuaGadgets/Gadgets/unit_limit_dgun.lua [ Diff ] [ File ]
mod - cont/base/springcontent/LuaGadgets/callins.lua [ Diff ] [ File ]
mod - cont/base/springcontent/LuaGadgets/gadgets.lua [ Diff ] [ File ]
mod - doc/changelog.txt [ Diff ] [ File ]
mod - doc/releasechecklist.txt [ Diff ] [ File ]
add - installer/include/fileMisc.nsh [ Diff ] [ File ]
mod - installer/sections/main.nsh [ Diff ] [ File ]
add - installer/sections/portable.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/AICheats.cpp [ Diff ] [ File ]
mod - rts/ExternalAI/AILegacySupport.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/Game/Game.cpp [ 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/GameSetup.h [ Diff ] [ File ]
mod - rts/Game/GameVersion.cpp [ Diff ] [ File ]
mod - rts/Game/LoadScreen.cpp [ Diff ] [ File ]
add - rts/Game/NetCommands.cpp [ Diff ] [ File ]
mod - rts/Game/Player.cpp [ Diff ] [ File ]
mod - rts/Game/PlayerHandler.cpp [ Diff ] [ File ]
mod - rts/Game/PlayerHandler.h [ Diff ] [ File ]
mod - rts/Game/PreGame.cpp [ Diff ] [ File ]
add - rts/Game/SyncedGameCommands.cpp [ 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/MiniMap.cpp [ Diff ] [ File ]
add - rts/Game/UnsyncedGameCommands.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaConstGame.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaPathFinder.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaRules.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaRules.h [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedCtrl.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedRead.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnitDefs.cpp [ Diff ] [ File ]
mod - rts/Map/BaseGroundDrawer.cpp [ Diff ] [ File ]
mod - rts/Map/BaseGroundDrawer.h [ Diff ] [ File ]
mod - rts/Map/BasicMapDamage.cpp [ Diff ] [ File ]
mod - rts/Map/MapInfo.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/CubeMapHandler.cpp [ Diff ] [ File ]
add - rts/Rendering/IPathDrawer.cpp [ Diff ] [ File ]
add - rts/Rendering/IPathDrawer.h [ Diff ] [ File ]
mod - rts/Rendering/InMapDraw.cpp [ Diff ] [ File ]
mod - rts/Rendering/ProjectileDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/UnitDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/UnitDrawer.h [ Diff ] [ File ]
mod - rts/Sim/Misc/GroundBlockingObjectMap.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/LosHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/LosHandler.h [ Diff ] [ File ]
mod - rts/Sim/Misc/LosMap.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/GroundMoveType.h [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/TAAirMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/Objects/WorldObject.h [ Diff ] [ File ]
add - rts/Sim/Path/Default/PathFinderDef.h [ Diff ] [ File ]
add - rts/Sim/Path/IPathManager.cpp [ Diff ] [ File ]
add - rts/Sim/Path/IPathManager.h [ Diff ] [ File ]
mod - rts/Sim/Units/COB/UnitScript.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/Unit.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/Unit.h [ Diff ] [ File ]
mod - rts/Sim/Units/UnitDef.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitDef.h [ Diff ] [ File ]
mod - rts/Sim/Units/UnitHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitHandler.h [ Diff ] [ File ]
mod - rts/Sim/Units/UnitLoader.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/Weapon.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/Weapon.h [ Diff ] [ File ]
mod - rts/System/AutohostInterface.cpp [ Diff ] [ File ]
mod - rts/System/BaseNetProtocol.cpp [ Diff ] [ File ]
mod - rts/System/BaseNetProtocol.h [ Diff ] [ File ]
mod - rts/System/EventHandler.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/FileSystemHandler.cpp [ Diff ] [ File ]
mod - rts/System/GlobalUnsynced.cpp [ Diff ] [ File ]
mod - rts/System/GlobalUnsynced.h [ Diff ] [ File ]
mod - rts/System/NetProtocol.cpp [ Diff ] [ File ]
mod - rts/System/NetProtocol.h [ Diff ] [ File ]
mod - rts/System/OffscreenGLContext.cpp [ Diff ] [ File ]
mod - rts/System/Platform/errorhandler.cpp [ Diff ] [ File ]
mod - rts/System/Platform/errorhandler.h [ Diff ] [ File ]
mod - rts/System/SpringApp.cpp [ Diff ] [ File ]
mod - rts/build/vstudio8/rts.vcproj [ Diff ] [ File ]
mod - rts/lib/gml/gml.cpp [ Diff ] [ File ]
mod - rts/lib/gml/gml.h [ Diff ] [ File ]
mod - tools/unitsync/unitsync.h [ Diff ] [ File ]