2025-09-02 03:05 CEST

spring: develop 3972e0b8 Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
Tobi Vollebregt Tobi Vollebregt develop 2011-07-12 20:39:50 develop 50729054
Changeset Merge branch 'master' into features/config-rework

Conflicts:
    rts/System/Input/Joystick.cpp
    rts/System/NetProtocol.cpp
    rts/System/Platform/Watchdog.cpp
    rts/System/SpringApp.cpp
    tools/unitsync/CMakeLists.txt
mod - AI/Wrappers/CUtils/Util.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/DamageArray.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/IAICallback.h Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
mod - Doxyfile Diff ] File ]
mod - buildbot/master/master.cfg Diff ] File ]
mod - buildbot/slave/update-docs.sh Diff ] File ]
mod - buildbot/stacktrace_translator/frontend/index.php Diff ] File ]
rm - buildbot/stacktrace_translator/frontend/lastrun Diff ] File ]
mod - buildbot/stacktrace_translator/stacktrace_translator.py Diff ] File ]
rm - cont/LuaUI/Fonts/README Diff ] File ]
rm - cont/LuaUI/README.txt Diff ] File ]
mod - cont/LuaUI/widgets.lua Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic00.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic01.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic02.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic03.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic04.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic05.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic06.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic07.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic08.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic09.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic10.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic11.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic12.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic13.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic14.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic15.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic16.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic17.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic18.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic19.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic20.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic21.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic22.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic23.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic24.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic25.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic26.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic27.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic28.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic29.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic30.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/caustics/caustic31.jpg Diff ] File ]
mod - cont/base/bitmaps/bitmaps/waterbump.png Diff ] File ]
mod - cont/base/springcontent/gamedata/explosions.lua Diff ] File ]
mod - doc/changelog.txt Diff ] File ]
add - doc/logApi.dia Diff ] File ]
mod - rts/CMakeLists.txt Diff ] File ]
mod - rts/ExternalAI/Interface/AISCommands.h Diff ] File ]
mod - rts/Game/CameraHandler.h Diff ] File ]
mod - rts/Game/Game.cpp Diff ] File ]
mod - rts/Game/GameHelper.cpp 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/PlayerHandler.h Diff ] File ]
mod - rts/Game/TraceRay.cpp Diff ] File ]
mod - rts/Game/TraceRay.h Diff ] File ]
mod - rts/Game/UnsyncedGameCommands.cpp 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 ]
mod - rts/Lua/LuaSyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaVFS.cpp Diff ] File ]
mod - rts/Lua/LuaZip.cpp Diff ] File ]
mod - rts/Lua/LuaZip.h Diff ] File ]
mod - rts/Map/Ground.cpp Diff ] File ]
mod - rts/Map/ReadMap.cpp Diff ] File ]
mod - rts/Map/ReadMap.h Diff ] File ]
mod - rts/Map/SM3/SM3Map.cpp Diff ] File ]
mod - rts/Map/SM3/SM3Map.h Diff ] File ]
mod - rts/Map/SMF/SMFReadMap.cpp Diff ] File ]
mod - rts/Map/SMF/SMFReadMap.h Diff ] File ]
mod - rts/Rendering/CMakeLists.txt Diff ] File ]
mod - rts/Rendering/DefaultPathDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/BumpWater.h Diff ] File ]
mod - rts/Rendering/FarTextureHandler.cpp Diff ] File ]
mod - rts/Rendering/FeatureDrawer.cpp Diff ] File ]
mod - rts/Rendering/GroundDecalHandler.cpp Diff ] File ]
mod - rts/Rendering/InMapDrawView.cpp Diff ] File ]
mod - rts/Rendering/Models/3DModel.cpp Diff ] File ]
mod - rts/Rendering/Models/3DModel.h Diff ] File ]
mod - rts/Rendering/Models/AssParser.cpp Diff ] File ]
mod - rts/Rendering/Models/AssParser.h Diff ] File ]
mod - rts/Rendering/Models/IModelParser.cpp Diff ] File ]
mod - rts/Rendering/Models/WorldObjectModelRenderer.cpp Diff ] File ]
mod - rts/Rendering/Models/WorldObjectModelRenderer.h Diff ] File ]
mod - rts/Rendering/ProjectileDrawer.cpp Diff ] File ]
mod - rts/Rendering/Shaders/ShaderHandler.cpp Diff ] File ]
mod - rts/Rendering/Textures/Bitmap.cpp Diff ] File ]
mod - rts/Rendering/Textures/Bitmap.h Diff ] File ]
mod - rts/Rendering/Textures/S3OTextureHandler.h Diff ] File ]
mod - rts/Rendering/UnitDrawer.cpp Diff ] File ]
mod - rts/Rendering/glFont.h Diff ] File ]
mod - rts/Sim/Misc/GuiSoundSet.h Diff ] File ]
mod - rts/Sim/Misc/LosMap.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveInfo.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/MoveMath.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/MoveMath.h Diff ] File ]
mod - rts/Sim/MoveTypes/ScriptMoveType.cpp Diff ] File ]
mod - rts/Sim/Path/Default/PathEstimator.h Diff ] File ]
mod - rts/Sim/Projectiles/ExpGenSpawner.h Diff ] File ]
mod - rts/Sim/Projectiles/ExplosionGenerator.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Projectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Projectile.h Diff ] File ]
mod - rts/Sim/Projectiles/ProjectileHandler.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/HeatCloudProjectile.h 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/FireBallProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/FlameProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/LaserProjectile.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/Scripts/CobEngine.cpp Diff ] File ]
mod - rts/Sim/Units/Scripts/CobInstance.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/UnitScript.cpp Diff ] File ]
mod - rts/Sim/Units/Scripts/UnitScript.h Diff ] File ]
mod - rts/Sim/Units/Scripts/UnitScriptEngine.cpp Diff ] File ]
mod - rts/Sim/Units/Scripts/UnitScriptEngine.h Diff ] File ]
mod - rts/Sim/Units/UnitDef.h Diff ] File ]
mod - rts/Sim/Weapons/BeamLaser.cpp Diff ] File ]
mod - rts/Sim/Weapons/Cannon.cpp Diff ] File ]
mod - rts/Sim/Weapons/EmgCannon.cpp Diff ] File ]
mod - rts/Sim/Weapons/FlameThrower.cpp Diff ] File ]
mod - rts/Sim/Weapons/LaserCannon.cpp Diff ] File ]
mod - rts/Sim/Weapons/LightningCannon.cpp Diff ] File ]
mod - rts/Sim/Weapons/MissileLauncher.cpp Diff ] File ]
mod - rts/Sim/Weapons/Rifle.cpp Diff ] File ]
mod - rts/Sim/Weapons/Weapon.cpp Diff ] File ]
mod - rts/Sim/Weapons/Weapon.h Diff ] File ]
mod - rts/System/AutohostInterface.h Diff ] File ]
mod - rts/System/CMakeLists.txt Diff ] File ]
mod - rts/System/EventClient.h Diff ] File ]
mod - rts/System/FPUCheck.h Diff ] File ]
mod - rts/System/FastMath.h Diff ] File ]
mod - rts/System/FileSystem/ArchiveScanner.cpp Diff ] File ]
mod - rts/System/FileSystem/CacheDir.h Diff ] File ]
mod - rts/System/FileSystem/DataDirLocater.cpp Diff ] File ]
mod - rts/System/FileSystem/DataDirLocater.h Diff ] File ]
mod - rts/System/FileSystem/FileFilter.cpp Diff ] File ]
mod - rts/System/FileSystem/FileSystem.cpp Diff ] File ]
mod - rts/System/FileSystem/FileSystemHandler.cpp Diff ] File ]
mod - rts/System/FileSystem/PoolArchive.cpp Diff ] File ]
mod - rts/System/FileSystem/PoolArchive.h Diff ] File ]
mod - rts/System/FileSystem/SevenZipArchive.cpp Diff ] File ]
mod - rts/System/FileSystem/SevenZipArchive.h Diff ] File ]
mod - rts/System/FileSystem/VFSHandler.cpp Diff ] File ]
mod - rts/System/FileSystem/VFSHandler.h Diff ] File ]
mod - rts/System/FileSystem/ZipArchive.cpp Diff ] File ]
mod - rts/System/Input/Joystick.cpp Diff ] File ]
mod - rts/System/Input/MouseInput.cpp Diff ] File ]
mod - rts/System/LoadSave/LuaLoadSaveHandler.h Diff ] File ]
add - rts/System/Log/DefaultFilter.cpp Diff ] File ]
add - rts/System/Log/DefaultFilter.h Diff ] File ]
add - rts/System/Log/ILog.h Diff ] File ]
add - rts/System/Log/LogOutputSink.cpp Diff ] File ]
add - rts/System/Log/LogUtil.c Diff ] File ]
add - rts/System/Log/LogUtil.h Diff ] File ]
mod - rts/System/Main.cpp Diff ] File ]
mod - rts/System/Net/LocalConnection.cpp Diff ] File ]
mod - rts/System/Net/PackPacket.cpp Diff ] File ]
mod - rts/System/Net/Socket.cpp Diff ] File ]
mod - rts/System/Net/UDPConnection.cpp Diff ] File ]
mod - rts/System/Net/UDPListener.cpp Diff ] File ]
mod - rts/System/NetProtocol.cpp Diff ] File ]
mod - rts/System/NetProtocol.h Diff ] File ]
mod - rts/System/Object.cpp Diff ] File ]
mod - rts/System/OffscreenGLContext.cpp Diff ] File ]
mod - rts/System/Platform/Linux/CrashHandler.cpp Diff ] File ]
mod - rts/System/Platform/Linux/myX11.cpp Diff ] File ]
mod - rts/System/Platform/Linux/myX11.h Diff ] File ]
mod - rts/System/Platform/Linux/thread_backtrace.cpp Diff ] File ]
mod - rts/System/Platform/Misc.cpp Diff ] File ]
mod - rts/System/Platform/SharedLib.cpp Diff ] File ]
mod - rts/System/Platform/Watchdog.cpp Diff ] File ]
mod - rts/System/Platform/Win/CrashHandler.cpp Diff ] File ]
mod - rts/System/Platform/errorhandler.cpp Diff ] File ]
mod - rts/System/Platform/errorhandler.h Diff ] File ]
mod - rts/System/SafeVector.cpp Diff ] File ]
mod - rts/System/SpringApp.cpp Diff ] File ]
mod - rts/System/TdfParser.cpp Diff ] File ]
mod - rts/System/TimeProfiler.cpp Diff ] File ]
mod - rts/System/bitops.h Diff ] File ]
mod - rts/System/creg/creg.h Diff ] File ]
mod - rts/System/myMath.cpp Diff ] File ]
mod - rts/build/vstudio8/rts.vcproj Diff ] File ]
mod - rts/builds/DS/CMakeLists.txt Diff ] File ]
mod - rts/lib/7z/7zBuf.c Diff ] File ]
mod - rts/lib/7z/7zBuf.h Diff ] File ]
mod - rts/lib/7z/7zBuf2.c Diff ] File ]
mod - rts/lib/7z/7zCrc.c Diff ] File ]
mod - rts/lib/7z/7zCrc.h Diff ] File ]
mod - rts/lib/7z/7zFile.c Diff ] File ]
mod - rts/lib/7z/7zFile.h Diff ] File ]
mod - rts/lib/7z/7zStream.c Diff ] File ]
mod - rts/lib/7z/Archive/7z/7zAlloc.c Diff ] File ]
mod - rts/lib/7z/Archive/7z/7zAlloc.h Diff ] File ]
mod - rts/lib/7z/Archive/7z/7zDecode.c Diff ] File ]
mod - rts/lib/7z/Archive/7z/7zDecode.h Diff ] File ]
mod - rts/lib/7z/Archive/7z/7zExtract.c Diff ] File ]
mod - rts/lib/7z/Archive/7z/7zExtract.h Diff ] File ]
mod - rts/lib/7z/Archive/7z/7zHeader.c Diff ] File ]
mod - rts/lib/7z/Archive/7z/7zHeader.h Diff ] File ]
mod - rts/lib/7z/Archive/7z/7zIn.c Diff ] File ]
mod - rts/lib/7z/Archive/7z/7zIn.h Diff ] File ]
mod - rts/lib/7z/Archive/7z/7zItem.c Diff ] File ]
mod - rts/lib/7z/Archive/7z/7zItem.h Diff ] File ]
mod - rts/lib/7z/Bcj2.c Diff ] File ]
mod - rts/lib/7z/Bcj2.h Diff ] File ]
mod - rts/lib/7z/Bra.c Diff ] File ]
mod - rts/lib/7z/Bra.h Diff ] File ]
mod - rts/lib/7z/Bra86.c Diff ] File ]
mod - rts/lib/7z/CpuArch.h Diff ] File ]
mod - rts/lib/7z/LzmaDec.c Diff ] File ]
mod - rts/lib/7z/LzmaDec.h Diff ] File ]
mod - rts/lib/7z/Types.h Diff ] File ]
mod - rts/lib/CMakeLists.txt Diff ] File ]
add - rts/lib/assimp/.gitignore Diff ] File ]
rm - rts/lib/assimp/CREDITS Diff ] File ]
rm - rts/lib/assimp/INSTALL Diff ] File ]
mod - rts/lib/assimp/README_SPRING Diff ] File ]
mod - rts/lib/assimp/code/3DSConverter.cpp Diff ] File ]
mod - rts/lib/assimp/code/3DSLoader.cpp Diff ] File ]
mod - rts/lib/assimp/code/ACLoader.cpp Diff ] File ]
mod - rts/lib/assimp/code/ASEParser.cpp Diff ] File ]
mod - rts/lib/assimp/code/Assimp.cpp Diff ] File ]
add - rts/lib/assimp/code/AssimpCExport.cpp Diff ] File ]
mod - rts/lib/assimp/code/AssimpPCH.h Diff ] File ]
mod - rts/lib/assimp/code/B3DImporter.cpp Diff ] File ]
mod - rts/lib/assimp/code/BVHLoader.cpp Diff ] File ]
mod - rts/lib/assimp/code/BaseImporter.cpp Diff ] File ]
mod - rts/lib/assimp/code/BaseProcess.cpp Diff ] File ]
mod - rts/lib/assimp/code/BlenderDNA.cpp Diff ] File ]
mod - rts/lib/assimp/code/BlenderDNA.h Diff ] File ]
mod - rts/lib/assimp/code/BlenderDNA.inl Diff ] File ]
mod - rts/lib/assimp/code/BlenderLoader.cpp Diff ] File ]
mod - rts/lib/assimp/code/BlenderLoader.h Diff ] File ]
mod - rts/lib/assimp/code/BlenderModifier.cpp Diff ] File ]
mod - rts/lib/assimp/code/BlenderModifier.h Diff ] File ]
mod - rts/lib/assimp/code/BlenderScene.cpp Diff ] File ]
mod - rts/lib/assimp/code/BlenderScene.h Diff ] File ]
add - rts/lib/assimp/code/BlobIOSystem.h Diff ] File ]
mod - rts/lib/assimp/code/BoostWorkaround/boost/foreach.hpp Diff ] File ]
mod - rts/lib/assimp/code/BoostWorkaround/boost/format.hpp Diff ] File ]
mod - rts/lib/assimp/code/BoostWorkaround/boost/lexical_cast.hpp Diff ] File ]
add - rts/lib/assimp/code/BoostWorkaround/boost/make_shared.hpp Diff ] File ]
add - rts/lib/assimp/code/BoostWorkaround/boost/noncopyable.hpp Diff ] File ]
mod - rts/lib/assimp/code/BoostWorkaround/boost/shared_ptr.hpp Diff ] File ]
mod - rts/lib/assimp/code/BoostWorkaround/boost/static_assert.hpp Diff ] File ]
mod - rts/lib/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp Diff ] File ]
mod - rts/lib/assimp/code/ByteSwap.h Diff ] File ]
add - rts/lib/assimp/code/CInterfaceIOWrapper.h Diff ] File ]
mod - rts/lib/assimp/code/CMakeLists.txt Diff ] File ]
mod - rts/lib/assimp/code/COBLoader.cpp Diff ] File ]
mod - rts/lib/assimp/code/COBScene.h Diff ] File ]
mod - rts/lib/assimp/code/CSMLoader.cpp Diff ] File ]
mod - rts/lib/assimp/code/CalcTangentsProcess.cpp Diff ] File ]
mod - rts/lib/assimp/code/CalcTangentsProcess.h Diff ] File ]
add - rts/lib/assimp/code/ColladaExporter.cpp Diff ] File ]
add - rts/lib/assimp/code/ColladaExporter.h Diff ] File ]
mod - rts/lib/assimp/code/ColladaHelper.h Diff ] File ]
mod - rts/lib/assimp/code/ColladaLoader.cpp Diff ] File ]
mod - rts/lib/assimp/code/ColladaParser.cpp Diff ] File ]
mod - rts/lib/assimp/code/ComputeUVMappingProcess.cpp Diff ] File ]
add - rts/lib/assimp/code/DXFHelper.h Diff ] File ]
mod - rts/lib/assimp/code/DXFLoader.cpp Diff ] File ]
mod - rts/lib/assimp/code/DXFLoader.h Diff ] File ]
add - rts/lib/assimp/code/DeboneProcess.cpp Diff ] File ]
add - rts/lib/assimp/code/DeboneProcess.h Diff ] File ]
mod - rts/lib/assimp/code/DefaultIOStream.cpp Diff ] File ]
mod - rts/lib/assimp/code/DefaultIOStream.h Diff ] File ]
mod - rts/lib/assimp/code/DefaultLogger.cpp Diff ] File ]
mod - rts/lib/assimp/code/DefaultProgressHandler.h Diff ] File ]
mod - rts/lib/assimp/code/Exceptional.h Diff ] File ]
add - rts/lib/assimp/code/Exporter.cpp Diff ] File ]
mod - rts/lib/assimp/code/FileSystemFilter.h Diff ] File ]
mod - rts/lib/assimp/code/FindInstancesProcess.cpp Diff ] File ]
mod - rts/lib/assimp/code/FindInvalidDataProcess.cpp Diff ] File ]
mod - rts/lib/assimp/code/FixNormalsStep.cpp Diff ] File ]
mod - rts/lib/assimp/code/Hash.h Diff ] File ]
add - rts/lib/assimp/code/IFCGeometry.cpp Diff ] File ]
add - rts/lib/assimp/code/IFCLoader.cpp Diff ] File ]
add - rts/lib/assimp/code/IFCLoader.h Diff ] File ]
add - rts/lib/assimp/code/IFCMaterial.cpp Diff ] File ]
add - rts/lib/assimp/code/IFCProfile.cpp Diff ] File ]
add - rts/lib/assimp/code/IFCReaderGen.cpp Diff ] File ]
add - rts/lib/assimp/code/IFCReaderGen.h Diff ] File ]