2025-08-27 15:06 CEST
  

spring: develop a01cf107 [ Diff ] [ Back to Repository ]
Author Committer Branch Timestamp Parent
Andrea Piras Andrea Piras develop 2010-07-16 14:12:26 develop 60d9f01e
Changeset Merge remote branch 'origin/master' into assimp

Conflicts:
    rts/CMakeLists.txt
    rts/Rendering/Models/3DModel.cpp
    rts/Rendering/Models/3DModel.h
    rts/Rendering/Models/IModelParser.cpp
    rts/Rendering/Models/IModelParser.h
    rts/lib/CMakeLists.txt
mod - .gitignore [ Diff ] [ File ]
mod - .gitmodules [ Diff ] [ File ]
mod - AI/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Interfaces/C/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Interfaces/C/src/Interface.cpp [ Diff ] [ File ]
mod - AI/Interfaces/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Interfaces/Java/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Interfaces/Java/bin/ant.properties [ Diff ] [ File ]
mod - AI/Interfaces/Java/bin/build.xml [ Diff ] [ File ]
mod - AI/Interfaces/Java/bin/java_install.bat [ Diff ] [ File ]
mod - AI/Interfaces/Java/bin/java_install.sh [ Diff ] [ File ]
mod - AI/Interfaces/Java/bin/jna_wrappEvents.awk [ Diff ] [ File ]
mod - AI/Interfaces/Java/data/jvm.properties [ Diff ] [ File ]
mod - AI/Interfaces/Java/src/main/native/InterfaceExport.c [ Diff ] [ File ]
mod - AI/Interfaces/Java/src/main/native/JavaBridge.c [ Diff ] [ File ]
mod - AI/Interfaces/Java/src/main/native/JvmLocater_common.c [ Diff ] [ File ]
add - AI/Interfaces/Python [ Diff ] [ File ]
mod - AI/SConscript [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAI.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIAttackManager.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIBrain.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIBuildTable.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIConfig.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIConfig.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIExecute.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIExecute.h [ Diff ] [ File ]
mod - AI/Skirmish/AAI/AAIMap.cpp [ Diff ] [ File ]
mod - AI/Skirmish/AAI/aidef.h [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/2Lakes.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/AATA-RumblingForest.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/AavikkoV2.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Altored_Divide.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Aquatic_Divide_TNM05-V2.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Archers_Valley_v5.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Ashap_Plateau.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Battle_Holms_v4.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/BlackLake_Swamp_v_1.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Blue Planet.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Canyon_Wasteland-v02.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/CenterrockV11.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/CenterrockV12.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Cliff Run-v01.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Coast To Coast Remake.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Comet Catcher Redux.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Comet Catcher Remake-v02.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Comet Catcher Remake.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Cooper_Hill_TNM02-V1.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Core_Prime_Industrial_Area.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Craggy Hills v1.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Crimson_Paradise.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Crossing_4_final.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/DarkSide Remake.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Dead Reef v3.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/DeltaSiegeDry.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Deserted_Gully-v02.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Dueling_Bases-v01.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Evergreen_Haven-Redux-v02.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Evergreen_Haven-v03.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Expandation v01.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/ExpandedTropics.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/FF-AsteroidBattle.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/FF-Surrounded.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Flooded_Canyon-v2.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Flooded_Canyon-v3.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Foothill_Basin_Redux-v02.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Foothills-v08.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Four_Lakes_V2.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/FunTA-Battle_for_Aqua_Prime-v03.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Gods Of War 2 Remake V2.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Green Comet Basic.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Hells Pass.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Ice_Bergs_V2.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Iron_Craters_V1.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/IslandAlpha.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/IslandDivide.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Islands_In_War_1.0.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Long_Division-v01.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Moon Quartet Remake.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/MoonQ20.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/MoonQ20x.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Mountain Siege.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Mountain_Range-v07.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/No_Mans_Land-V03.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Painted Desert Remake V2.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Painted Desert Remake.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Plains_and_passes.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Raised_Divide_v1.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/River Dale-v01.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Road_To_Rome.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Rush_Hour-By_Wired.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/SailAway.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Shore2Shore_Remake-v01.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Small Supreme Battlefield.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Small Supreme Islands V2.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/SmallDivide.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Supreme Battlefield.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Surrounded_Grounds-v2.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Tabula-v2.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Tactical_Divide_v2.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Tangerine.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Tempest.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/The Oasis.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Tropical.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Twilight_Canyon-v01.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Vegan_Canyons-v01.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Verdant v3.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Whakamutunga_Riri-v01.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/Winter_Wonderland.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/aftershock.cfg [ Diff ] [ File ]
rm - AI/Skirmish/AAI/data/cfg/map/cathralda.cfg [ Diff ] [ File ]
add - AI/Skirmish/AAI/data/cfg/mod/Balanced_Annihilation_V7.1.cfg [ Diff ] [ File ]
add - AI/Skirmish/AAI/data/cfg/mod/Balanced_Annihilation_V7.11.cfg [ Diff ] [ File ]
add - AI/Skirmish/AAI/data/cfg/mod/Balanced_Annihilation_V7.12.cfg [ Diff ] [ File ]
mod - AI/Skirmish/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Skirmish/CppTestAI/src/CppTestAI.cpp [ Diff ] [ File ]
mod - AI/Skirmish/E323AI [ Diff ] [ File ]
mod - AI/Skirmish/HughAI [ Diff ] [ File ]
add - AI/Skirmish/KAIK/AIClasses.cpp [ Diff ] [ File ]
add - 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/CMakeLists.txt [ Diff ] [ File ]
rm - AI/Skirmish/KAIK/Containers.cpp [ Diff ] [ File ]
rm - AI/Skirmish/KAIK/Containers.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/DGunController.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/DGunController.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/DefenseMatrix.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/Defines.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/EconomyTracker.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/IncExternAI.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/IncGlobalAI.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/KAIK.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/KAIK.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/Logger.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/Logger.h [ Diff ] [ File ]
add - AI/Skirmish/KAIK/LuaParser.cpp [ Diff ] [ File ]
add - AI/Skirmish/KAIK/LuaParser.hpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/MetalMap.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/MetalMap.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/SpotFinder.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/ThreatMap.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/ThreatMap.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/UnitHandler.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/UnitHandler.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/UnitTable.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/UnitTable.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/Util.cpp [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/Util.h [ Diff ] [ File ]
mod - AI/Skirmish/KAIK/data/AIInfo.lua [ Diff ] [ File ]
mod - AI/Skirmish/NullAI/src/AIExport.c [ Diff ] [ File ]
mod - AI/Skirmish/NullAI/src/AIExport.h [ Diff ] [ File ]
mod - AI/Skirmish/NullJavaAI/bin/ant.dependent.properties [ Diff ] [ File ]
mod - AI/Skirmish/NullJavaAI/bin/build.xml [ Diff ] [ File ]
mod - AI/Skirmish/NullOOJavaAI/bin/ant.dependent.properties [ Diff ] [ File ]
mod - AI/Skirmish/NullOOJavaAI/bin/build.xml [ Diff ] [ File ]
mod - AI/Skirmish/RAI/Builder.cpp [ Diff ] [ File ]
mod - AI/Skirmish/RAI/BuilderPlacement.cpp [ Diff ] [ File ]
mod - AI/Skirmish/RAI/CombatManager.cpp [ Diff ] [ File ]
mod - AI/Skirmish/RAI/GResourceMap.cpp [ Diff ] [ File ]
mod - AI/Skirmish/RAI/GResourceMap.h [ Diff ] [ File ]
mod - AI/Skirmish/RAI/GTerrainMap.cpp [ Diff ] [ File ]
mod - AI/Skirmish/RAI/GTerrainMap.h [ Diff ] [ File ]
mod - AI/Skirmish/RAI/LogFile.cpp [ Diff ] [ File ]
mod - AI/Skirmish/RAI/RAI.cpp [ Diff ] [ File ]
mod - AI/Skirmish/RAI/RAI.h [ Diff ] [ File ]
mod - AI/Skirmish/RAI/UnitManager.cpp [ Diff ] [ File ]
mod - AI/Wrappers/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Wrappers/CUtils/SharedLibrary.c [ Diff ] [ File ]
mod - AI/Wrappers/CUtils/SimpleLog.c [ Diff ] [ File ]
mod - AI/Wrappers/CUtils/SimpleLog.h [ Diff ] [ File ]
mod - AI/Wrappers/CUtils/Util.c [ Diff ] [ File ]
mod - AI/Wrappers/Cpp/CMakeLists.txt [ Diff ] [ File ]
mod - AI/Wrappers/Cpp/bin/wrappCallback.awk [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/AIAI.cpp [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.h [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/AIAICheats.cpp [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/AIAICheats.h [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/AIGlobalAI.cpp [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/AIGlobalAICallback.h [ Diff ] [ File ]
add - AI/Wrappers/LegacyCpp/Event/AIEnemyCreatedEvent.h [ Diff ] [ File ]
add - AI/Wrappers/LegacyCpp/Event/AIEnemyFinishedEvent.h [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/Event/AIEvent.h [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/Event/AIEvents.h [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/Event/AIInitEvent.h [ Diff ] [ File ]
mod - AI/Wrappers/LegacyCpp/Event/AIWeaponFiredEvent.h [ Diff ] [ File ]
add - AI/Wrappers/LegacyCpp/IAICallback.h [ Diff ] [ File ]
add - AI/Wrappers/LegacyCpp/IAICheats.h [ Diff ] [ File ]
add - AI/Wrappers/LegacyCpp/IGlobalAI.h [ Diff ] [ File ]
add - AI/Wrappers/LegacyCpp/IGlobalAICallback.h [ Diff ] [ File ]
add - AI/Wrappers/LegacyCpp/aibase.h [ Diff ] [ File ]
add - AUTHORS [ Diff ] [ File ]
mod - CMakeLists.txt [ Diff ] [ File ]
add - COPYING [ Diff ] [ File ]
rm - Documentation/StartScriptFormat.txt [ Diff ] [ File ]
rm - Documentation/changelog.txt [ Diff ] [ File ]
rm - Documentation/cmds.txt [ Diff ] [ File ]
rm - Documentation/manpages/make_manpages.sh [ Diff ] [ File ]
mod - Doxyfile [ Diff ] [ File ]
add - FAQ [ Diff ] [ File ]
add - LICENSE [ Diff ] [ File ]
add - License.html [ Diff ] [ File ]
rm - README.AUTHORS [ Diff ] [ File ]
add - README.markdown [ Diff ] [ File ]
mod - SConstruct [ Diff ] [ File ]
add - THANKS [ Diff ] [ File ]
add - buildbot/buildbot.css [ Diff ] [ File ]
add - buildbot/create-build-dirs.sh [ Diff ] [ File ]
add - buildbot/make_installer.sh [ Diff ] [ File ]
add - buildbot/makensis [ Diff ] [ File ]
add - buildbot/master.cfg [ Diff ] [ File ]
add - buildbot/no-msync.c [ Diff ] [ File ]
add - buildbot/prepare.sh [ Diff ] [ File ]
add - buildbot/rsync.sh [ Diff ] [ File ]
add - buildbot/stacktrace_translator.py [ Diff ] [ File ]
add - buildbot/update-docs.sh [ Diff ] [ File ]
add - buildbot/update-version.sh [ Diff ] [ File ]
add - cont/CMakeLists.txt [ Diff ] [ File ]
add - cont/LuaUI/Widgets/gui_buildspacing.lua [ Diff ] [ File ]
add - cont/LuaUI/Widgets/headless_setup.lua [ Diff ] [ File ]
add - cont/LuaUI/Widgets/ingame_lobby.example.lua [ Diff ] [ File ]
add - cont/LuaUI/system.lua [ Diff ] [ File ]
add - cont/LuaUI/widgets.lua [ Diff ] [ File ]