2025-08-27 08:33 CEST

spring: develop d26ae4b3 Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
Andrea Piras Andrea Piras develop 2010-08-17 19:36:12 develop a01cf107
Changeset Merge branch 'master' into assimp

Conflicts:
    rts/Rendering/Models/IModelParser.cpp
mod - AI/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/Python Diff ] File ]
mod - AI/Skirmish/AAI/aidef.h Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/BA704.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/Balanced_Annihilation_V7.1.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/Balanced_Annihilation_V7.11.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/Balanced_Annihilation_V7.12.cfg Diff ] File ]
rm - AI/Skirmish/AAI/data/cfg/mod/XTAPEV958.cfg Diff ] File ]
mod - AI/Skirmish/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/E323AI Diff ] File ]
mod - AI/Skirmish/HughAI Diff ] File ]
mod - AI/Skirmish/KAIK/AIClasses.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/AIClasses.hpp Diff ] File ]
mod - AI/Skirmish/KAIK/AttackGroup.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/AttackHandler.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/BuildUp.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/CommandTracker.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/DGunController.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/Defines.h Diff ] File ]
mod - AI/Skirmish/KAIK/IncEngine.h Diff ] File ]
mod - AI/Skirmish/KAIK/IncExternAI.h Diff ] File ]
mod - AI/Skirmish/KAIK/KAIK.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/Unit.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/Unit.h Diff ] File ]
mod - AI/Skirmish/KAIK/UnitHandler.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/UnitTable.cpp Diff ] File ]
mod - AI/Skirmish/RAI/Builder.cpp Diff ] File ]
mod - AI/Skirmish/RAI/Builder.h Diff ] File ]
mod - AI/Skirmish/RAI/BuilderPlacement.cpp Diff ] File ]
mod - AI/Skirmish/RAI/GTerrainMap.h Diff ] File ]
mod - AI/Skirmish/RAI/PowerManager.cpp Diff ] File ]
mod - AI/Skirmish/RAI/RAI.cpp Diff ] File ]
mod - AI/Skirmish/RAI/RAI.h Diff ] File ]
mod - AI/Skirmish/RAI/UnitDefHandler.h Diff ] File ]
mod - AI/Skirmish/RAI/UnitManager.h Diff ] File ]
mod - AI/Wrappers/CUtils/Util.c Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp Diff ] File ]
add - AI/Wrappers/LegacyCpp/UnitDef.cpp Diff ] File ]
add - AI/Wrappers/LegacyCpp/UnitDef.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/aibase.h Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
add - buildbot/master/buildbot.mk Diff ] File ]
add - buildbot/slave/ld Diff ] File ]
mod - cont/LuaUI/selector.lua Diff ] File ]
mod - cont/base/maphelper/maphelper/mapdefaults.lua Diff ] File ]
mod - cont/base/springcontent/EngineOptions.lua Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/Gadgets/game_spawn.lua Diff ] File ]
add - cont/base/springcontent/LuaGadgets/Gadgets/object_statusbars_default.lua Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/Gadgets/unit_script.lua Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/callins.lua Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/gadgets.lua Diff ] File ]
mod - directories.txt Diff ] File ]
mod - doc/changelog.txt Diff ] File ]
rm - installer/checkdotnet.nsh Diff ] File ]
add - installer/include/Registry.nsh Diff ] File ]
add - installer/include/checkDotNetInstalled.nsh Diff ] File ]
mod - installer/include/checkrunning.nsh Diff ] File ]
mod - installer/make_source_package.sh Diff ] File ]
add - installer/nsis_plugins/registry.dll Diff ] File ]
add - installer/sections/ensureDotNet.nsh Diff ] File ]
mod - installer/sections/sectiondesc.nsh Diff ] File ]
add - installer/sections/shortcuts_desktop.nsh Diff ] File ]
mod - installer/sections/springDownloader.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/AIInterfaceLibraryInfo.cpp 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/ExternalAI/SkirmishAILibraryInfo.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.cpp Diff ] File ]
mod - rts/Game/Camera.cpp Diff ] File ]
mod - rts/Game/Camera.h Diff ] File ]
mod - rts/Game/CameraHandler.cpp Diff ] File ]
mod - rts/Game/CameraHandler.h Diff ] File ]
mod - rts/Game/Game.cpp Diff ] File ]
mod - rts/Game/Game.h Diff ] File ]
mod - rts/Game/GameData.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/GameSetup.cpp Diff ] File ]
mod - rts/Game/GameSetup.h Diff ] File ]
mod - rts/Game/GameVersion.cpp Diff ] File ]
mod - rts/Game/OSCStatsSender.cpp Diff ] File ]
mod - rts/Game/PlayerBase.cpp Diff ] File ]
mod - rts/Game/PlayerHandler.cpp Diff ] File ]
mod - rts/Game/PlayerHandler.h Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/SelectedUnits.cpp Diff ] File ]
mod - rts/Game/SelectedUnitsAI.cpp Diff ] File ]
mod - rts/Game/SelectedUnitsAI.h Diff ] File ]
mod - rts/Game/Server/GameParticipant.cpp Diff ] File ]
mod - rts/Game/Server/GameParticipant.h Diff ] File ]
mod - rts/Game/TeamController.h Diff ] File ]
mod - rts/Game/UI/EndGameBox.cpp Diff ] File ]
mod - rts/Game/UI/EndGameBox.h Diff ] File ]
mod - rts/Game/UI/GuiHandler.cpp Diff ] File ]
mod - rts/Game/UI/GuiHandler.h Diff ] File ]
mod - rts/Game/UI/KeyBindings.cpp Diff ] File ]
mod - rts/Game/UI/MiniMap.cpp Diff ] File ]
mod - rts/Game/UI/MouseHandler.cpp Diff ] File ]
mod - rts/Game/UI/MouseHandler.h Diff ] File ]
mod - rts/Game/UI/QuitBox.cpp Diff ] File ]
mod - rts/Game/UI/SelectionKeyHandler.cpp Diff ] File ]
mod - rts/Game/UI/SelectionKeyHandler.h Diff ] File ]
mod - rts/Game/WordCompletion.cpp Diff ] File ]
mod - rts/Lua/LuaGaia.cpp Diff ] File ]
mod - rts/Lua/LuaGaia.h Diff ] File ]
mod - rts/Lua/LuaHandleSynced.cpp Diff ] File ]
mod - rts/Lua/LuaHandleSynced.h Diff ] File ]
mod - rts/Lua/LuaOpenGL.cpp 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/LuaSyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedCtrl.h Diff ] File ]
mod - rts/Lua/LuaSyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedRead.h Diff ] File ]
mod - rts/Lua/LuaUnitDefs.cpp Diff ] File ]
mod - rts/Lua/LuaUnitRendering.cpp Diff ] File ]
mod - rts/Lua/LuaUnitRendering.h Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedRead.h Diff ] File ]
mod - rts/Lua/LuaUtils.cpp Diff ] File ]
mod - rts/Map/Ground.cpp Diff ] File ]
mod - rts/Map/MapInfo.cpp Diff ] File ]
mod - rts/Map/ReadMap.cpp Diff ] File ]
mod - rts/Map/ReadMap.h Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainBase.h Diff ] File ]
mod - rts/Map/SM3/terrain/Textures.cpp Diff ] File ]
mod - rts/Map/SMF/BFGroundDrawer.cpp Diff ] File ]
mod - rts/Map/SMF/BFGroundTextures.cpp Diff ] File ]
mod - rts/Map/SMF/SmfReadMap.cpp Diff ] File ]
mod - rts/Rendering/DebugDrawerAI.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/BasicTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/BumpWater.cpp Diff ] File ]
mod - rts/Rendering/FarTextureHandler.cpp Diff ] File ]
mod - rts/Rendering/FeatureDrawer.cpp Diff ] File ]
mod - rts/Rendering/FeatureDrawer.h Diff ] File ]
mod - rts/Rendering/GL/myGL.cpp Diff ] File ]
mod - rts/Rendering/GroundFlash.cpp Diff ] File ]
mod - rts/Rendering/Models/3DModel.cpp Diff ] File ]
mod - rts/Rendering/Models/3DModel.h Diff ] File ]
mod - rts/Rendering/Models/3DOParser.cpp Diff ] File ]
mod - rts/Rendering/Models/3DOParser.h Diff ] File ]
mod - rts/Rendering/Models/IModelParser.cpp Diff ] File ]
mod - rts/Rendering/Models/IModelParser.h Diff ] File ]
mod - rts/Rendering/Models/OBJParser.cpp Diff ] File ]
mod - rts/Rendering/Models/OBJParser.h Diff ] File ]
mod - rts/Rendering/Models/S3OParser.cpp Diff ] File ]
mod - rts/Rendering/Models/S3OParser.h Diff ] File ]
mod - rts/Rendering/PathDrawer.cpp Diff ] File ]
mod - rts/Rendering/ProjectileDrawer.cpp Diff ] File ]
mod - rts/Rendering/ShadowHandler.cpp Diff ] File ]
mod - rts/Rendering/ShadowHandler.h Diff ] File ]
mod - rts/Rendering/TeamHighlight.cpp Diff ] File ]
mod - rts/Rendering/Textures/3DOTextureHandler.cpp Diff ] File ]
mod - rts/Rendering/Textures/Bitmap.cpp Diff ] File ]
mod - rts/Rendering/Textures/Bitmap.h Diff ] File ]
mod - rts/Rendering/Textures/ColorMap.h Diff ] File ]
mod - rts/Rendering/Textures/S3OTextureHandler.cpp Diff ] File ]
mod - rts/Rendering/Textures/TAPalette.cpp Diff ] File ]
mod - rts/Rendering/Textures/TAPalette.h Diff ] File ]
mod - rts/Rendering/UnitDrawer.cpp Diff ] File ]
mod - rts/Rendering/UnitDrawer.h Diff ] File ]
mod - rts/Rendering/glFont.cpp Diff ] File ]
mod - rts/Sim/Features/Feature.cpp Diff ] File ]
mod - rts/Sim/Features/Feature.h Diff ] File ]
mod - rts/Sim/Features/FeatureDef.h Diff ] File ]
mod - rts/Sim/Features/FeatureHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/CategoryHandler.h Diff ] File ]
mod - rts/Sim/Misc/CollisionHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/CollisionVolume.cpp Diff ] File ]
mod - rts/Sim/Misc/CollisionVolume.h Diff ] File ]
mod - rts/Sim/Misc/GeometricObjects.cpp Diff ] File ]
mod - rts/Sim/Misc/GeometricObjects.h Diff ] File ]
mod - rts/Sim/Misc/GlobalSynced.cpp Diff ] File ]
mod - rts/Sim/Misc/GroundBlockingObjectMap.cpp Diff ] File ]
mod - rts/Sim/Misc/GroundBlockingObjectMap.h Diff ] File ]
mod - rts/Sim/Misc/LosHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/LosHandler.h Diff ] File ]
mod - rts/Sim/Misc/ModInfo.h Diff ] File ]
mod - rts/Sim/Misc/QuadField.cpp Diff ] File ]
mod - rts/Sim/Misc/RadarHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/ResourceMapAnalyzer.cpp Diff ] File ]
mod - rts/Sim/Misc/ResourceMapAnalyzer.h Diff ] File ]
mod - rts/Sim/Misc/Team.cpp Diff ] File ]
mod - rts/Sim/Misc/Team.h Diff ] File ]
mod - rts/Sim/Misc/TeamBase.cpp Diff ] File ]
mod - rts/Sim/Misc/TeamHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/TeamHandler.h Diff ] File ]
mod - rts/Sim/Misc/TeamStatistics.h Diff ] File ]
mod - rts/Sim/Misc/Wind.cpp Diff ] File ]
mod - rts/Sim/Misc/Wind.h Diff ] File ]
mod - rts/Sim/MoveTypes/AirMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/GroundMoveType.h Diff ] File ]
mod - rts/Sim/MoveTypes/MoveInfo.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/GroundMoveMath.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/GroundMoveMath.h Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/HoverMoveMath.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/HoverMoveMath.h Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/MoveMath.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/MoveMath.h Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/ShipMoveMath.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/ShipMoveMath.h Diff ] File ]
mod - rts/Sim/MoveTypes/ScriptMoveType.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/ScriptMoveType.h Diff ] File ]
mod - rts/Sim/MoveTypes/TAAirMoveType.cpp Diff ] File ]
mod - rts/Sim/Objects/SolidObject.h Diff ] File ]
mod - rts/Sim/Objects/WorldObject.h Diff ] File ]
mod - rts/Sim/Path/PathEstimator.cpp Diff ] File ]
mod - rts/Sim/Path/PathFinder.cpp Diff ] File ]
mod - rts/Sim/Path/PathManager.cpp Diff ] File ]
mod - rts/Sim/Path/PathManager.h Diff ] File ]
mod - rts/Sim/Projectiles/ExpGenSpawner.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ExpGenSpawner.h Diff ] File ]
mod - rts/Sim/Projectiles/ExplosionGenerator.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ExplosionGenerator.h Diff ] File ]
mod - rts/Sim/Projectiles/PieceProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Projectile.h Diff ] File ]
mod - rts/Sim/Projectiles/ProjectileHandler.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/BitmapMuzzleFlame.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/BitmapMuzzleFlame.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/BubbleProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/DirtProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/DirtProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/ExploSpikeProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/ExploSpikeProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.hpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/GenericParticleProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/GenericParticleProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/GeoSquareProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/GeoSquareProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/GeoThermSmokeProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/GeoThermSmokeProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/GfxProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/HeatCloudProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/MuzzleFlame.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/MuzzleFlame.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/RepulseGfx.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/RepulseGfx.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/ShieldPartProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/ShieldPartProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile2.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SmokeProjectile2.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SpherePartProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/TracerProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/TracerProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/WakeProjectile.h Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/WreckProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/WreckProjectile.h 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/Units/COB/CobEngine.cpp Diff ] File ]
mod - rts/Sim/Units/COB/CobThread.cpp Diff ] File ]
mod - rts/Sim/Units/COB/LuaUnitScript.cpp Diff ] File ]
mod - rts/Sim/Units/COB/LuaUnitScript.h Diff ] File ]
mod - rts/Sim/Units/COB/UnitScript.cpp Diff ] File ]
mod - rts/Sim/Units/COB/UnitScript.h Diff ] File ]
mod - rts/Sim/Units/COB/UnitScriptEngine.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/AirCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/BuilderCAI.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/Command.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/CommandAI.cpp Diff ] File ]
mod - rts/Sim/Units/CommandAI/FactoryCAI.cpp Diff ] File ]