2025-08-28 06:57 CEST

spring: develop ef6f71fd Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
hoijui hoijui develop 2010-06-21 19:22:44 develop ce8e5aac
Changeset Merge remote branch 'masterLocal/master' into pureint

Conflicts:
    AI/Wrappers/CMakeLists.txt
mod - AI/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/C/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/Java/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/Python Diff ] File ]
mod - AI/Skirmish/CMakeLists.txt Diff ] File ]
mod - AI/Wrappers/CMakeLists.txt Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
mod - cont/CMakeLists.txt Diff ] File ]
mod - doc/changelog.txt Diff ] File ]
mod - installer/sections/sectiondesc.nsh Diff ] File ]
mod - installer/sections/shortcuts.nsh Diff ] File ]
mod - installer/spring.nsi Diff ] File ]
mod - rts/Game/Game.cpp Diff ] File ]
mod - rts/Game/GameServer.cpp Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/Server/MsgStrings.h Diff ] File ]
mod - rts/Lua/LuaSyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedCtrl.h Diff ] File ]
mod - rts/Map/SMF/BFGroundDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/SkyBox.cpp Diff ] File ]
mod - rts/Rendering/Env/SkyBox.h Diff ] File ]
mod - rts/Rendering/GL/myGL.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/WeaponProjectiles/BeamLaserProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/EmgProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/ExplosiveProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/ExplosiveProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/FireBallProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/FlameProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/LargeBeamLaserProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/LaserProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/LightningProjectile.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/Projectiles/WeaponProjectiles/WeaponProjectile.cpp Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Factory.cpp Diff ] File ]
mod - rts/Sim/Units/UnitTypes/Factory.h Diff ] File ]
mod - rts/System/GlobalConfig.cpp Diff ] File ]
mod - rts/System/GlobalConfig.h Diff ] File ]
mod - rts/System/Net/UDPConnection.cpp Diff ] File ]
mod - rts/System/Net/UDPConnection.h Diff ] File ]
mod - rts/System/NetProtocol.cpp Diff ] File ]
mod - rts/System/Platform/CrashHandler.cpp Diff ] File ]
mod - rts/System/Platform/CrashHandler.h Diff ] File ]
mod - rts/System/Platform/Win/CrashHandler.cpp Diff ] File ]
mod - rts/System/Platform/Win/CrashHandler.h Diff ] File ]
mod - rts/System/SpringApp.cpp Diff ] File ]
mod - rts/System/TimeProfiler.cpp Diff ] File ]
mod - rts/build/vstudio8/rts.vcproj Diff ] File ]
mod - rts/builds/DS/main.cpp Diff ] File ]