2025-08-29 04:23 CEST
  

spring: develop f2fbf1f8 [ Diff ] [ Back to Repository ]
Author Committer Branch Timestamp Parent
hoijui hoijui develop 2010-04-02 23:01:11 develop 29bbde21
Changeset Merge remote branch 'origin/master' into structure_cleanup

Conflicts:
    installer/spring.nsi
    rts/build/vstudio8/rts.vcproj
    tools/unitsync/test/test.cpp
mod - AI/Interfaces/Java/data/jvm.properties [ Diff ] [ File ]
mod - AI/Skirmish/E323AI [ Diff ] [ File ]
rm - README [ Diff ] [ File ]
mod - cont/base/maphelper/maphelper/mapdefaults.lua [ Diff ] [ File ]
mod - cont/base/maphelper/maphelper/parse_tdf_map.lua [ Diff ] [ File ]
mod - cont/base/springcontent/LuaGadgets/gadgets.lua [ Diff ] [ File ]
mod - cont/base/springcontent/shaders/GLSL/GrassVertProg.glsl [ Diff ] [ File ]
mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl [ Diff ] [ File ]
mod - cont/base/springcontent/shaders/GLSL/SMFVertProg.glsl [ Diff ] [ File ]
mod - cont/base/springcontent/shaders/GLSL/TreeFragProg.glsl [ Diff ] [ File ]
mod - cont/base/springcontent/shaders/GLSL/TreeVertProg.glsl [ 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.cpp [ Diff ] [ File ]
mod - rts/ExternalAI/Interface/AISCommands.h [ Diff ] [ File ]
mod - rts/Game/Camera.cpp [ Diff ] [ File ]
mod - rts/Game/Camera.h [ Diff ] [ File ]
mod - rts/Game/Game.cpp [ Diff ] [ File ]
mod - rts/Game/GameServer.cpp [ Diff ] [ File ]
mod - rts/Game/SelectedUnits.cpp [ Diff ] [ File ]
mod - rts/Game/UI/CursorIcons.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GuiHandler.cpp [ Diff ] [ File ]
mod - rts/Game/UI/MiniMap.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaFeatureDefs.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaGaia.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaLobby.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaMaterial.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaOpenGL.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaParser.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaParser.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/LuaSyncedRead.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnitDefs.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnitRendering.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedRead.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaZip.cpp [ Diff ] [ File ]
mod - rts/Map/MapInfo.cpp [ Diff ] [ File ]
mod - rts/Map/MapInfo.h [ Diff ] [ File ]
mod - rts/Map/SM3/Sm3GroundDrawer.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/BFGroundDrawer.cpp [ 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/BumpWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/BumpWater.h [ Diff ] [ File ]
mod - rts/Rendering/Env/CubeMapHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/DynWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/GrassDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/GrassDrawer.h [ Diff ] [ File ]
mod - rts/Rendering/Env/SkyBox.cpp [ Diff ] [ File ]
mod - rts/Rendering/FarTextureHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/GroundDecalHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/GroundDecalHandler.h [ Diff ] [ File ]
mod - rts/Rendering/HUDDrawer.cpp [ Diff ] [ File ]
add - rts/Rendering/Models/OBJParser.cpp [ Diff ] [ File ]
add - rts/Rendering/Models/OBJParser.h [ Diff ] [ File ]
mod - rts/Rendering/ProjectileDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/ProjectileDrawer.hpp [ Diff ] [ File ]
mod - rts/Rendering/ShadowHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/ShadowHandler.h [ Diff ] [ File ]
mod - rts/Rendering/Textures/3DOTextureHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/Textures/3DOTextureHandler.h [ Diff ] [ File ]
mod - rts/Rendering/Textures/S3OTextureHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/Textures/S3OTextureHandler.h [ Diff ] [ File ]
mod - rts/Sim/Features/Feature.cpp [ Diff ] [ File ]
mod - rts/Sim/Features/Feature.h [ Diff ] [ File ]
mod - rts/Sim/Features/FeatureDef.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/CollisionHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/CollisionHandler.h [ Diff ] [ File ]
mod - rts/Sim/Misc/QuadField.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/RadarHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/AirMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/ScriptMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/TAAirMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/FireProjectile.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/PieceProjectile.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.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/COB/CobInstance.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/COB/UnitScript.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/FactoryCAI.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/TransportCAI.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/Unit.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitDef.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitDefHandler.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/Factory.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/Cannon.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/LightningCannon.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/PlasmaRepulser.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/Weapon.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/WeaponDef.cpp [ Diff ] [ File ]
mod - rts/System/EventHandler.cpp [ Diff ] [ File ]
mod - rts/System/GlobalUnsynced.cpp [ Diff ] [ File ]
mod - rts/System/LuaLoadSaveHandler.cpp [ Diff ] [ File ]
mod - rts/System/float3.cpp [ Diff ] [ File ]
mod - rts/System/float4.cpp [ Diff ] [ File ]
mod - rts/System/float4.h [ Diff ] [ File ]
mod - rts/build/vstudio8/rts.vcproj [ Diff ] [ File ]
mod - rts/lib/gml/gmlcls.h [ Diff ] [ File ]
mod - tools/DedicatedServer/CMakeLists.txt [ Diff ] [ File ]
mod - tools/unitsync/CMakeLists.txt [ Diff ] [ File ]
mod - tools/unitsync/test/lua2php.cpp [ Diff ] [ File ]
mod - tools/unitsync/test/test.cpp [ Diff ] [ File ]