2025-08-27 09:03 CEST

spring: develop c706fe3e Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
hoijui hoijui develop 2009-08-08 18:37:06 develop 4ba0ab39
Changeset Merge commit 'origin/master' into cppintnew

Conflicts:
    AI/CMakeLists.txt
    AI/SConscript
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/C/src/InterfaceExport.cpp Diff ] File ]
mod - AI/Interfaces/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/Java/CMakeLists.txt Diff ] File ]
mod - AI/Interfaces/Java/bin/java_wrappCallbackOO.awk Diff ] File ]
mod - AI/Interfaces/Java/bin/jna_wrappEvents.awk Diff ] File ]
add - AI/Interfaces/Java/data/jlib/jna.jar Diff ] File ]
rm - AI/Interfaces/Java/data/jlib/jna/freebsd-amd64.jar Diff ] File ]
rm - AI/Interfaces/Java/data/jlib/jna/freebsd-i386.jar Diff ] File ]
rm - AI/Interfaces/Java/data/jlib/jna/jna.jar Diff ] File ]
rm - AI/Interfaces/Java/data/jlib/jna/linux-amd64.jar Diff ] File ]
rm - AI/Interfaces/Java/data/jlib/jna/linux-i386.jar Diff ] File ]
rm - AI/Interfaces/Java/data/jlib/jna/mac-darwin.jar Diff ] File ]
rm - AI/Interfaces/Java/data/jlib/jna/win32-amd64.jar Diff ] File ]
rm - AI/Interfaces/Java/data/jlib/jna/win32-x86.jar Diff ] File ]
mod - AI/Interfaces/Java/src/java/com/springrts/ai/AIEvent.java Diff ] File ]
mod - AI/Interfaces/Java/src/java/com/springrts/ai/AIFloat3.java Diff ] File ]
mod - AI/Interfaces/Java/src/native/JavaBridge.c Diff ] File ]
mod - AI/SConscript Diff ] File ]
mod - AI/Skirmish/AAI/AAIBrain.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIBuildTable.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIExecute.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIMap.cpp Diff ] File ]
mod - AI/Skirmish/AAI/AAIUnitTable.cpp Diff ] File ]
mod - AI/Skirmish/AAI/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/E323AI Diff ] File ]
mod - AI/Skirmish/KAIK/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/KAIK/DGunController.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/UnitTable.cpp Diff ] File ]
mod - AI/Skirmish/NTai/AI/NTai/Engine/COrderRouter.cpp Diff ] File ]
mod - AI/Skirmish/NTai/AI/NTai/Helpers/TdfParser.cpp Diff ] File ]
mod - AI/Skirmish/NTai/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/NullJavaAI/src/nulljavaai/NullJavaAI.java Diff ] File ]
mod - AI/Skirmish/NullLegacyCppAI/CMakeLists.txt Diff ] File ]
mod - AI/Skirmish/NullOOJavaAI/src/nulloojavaai/NullOOJavaAI.java Diff ] File ]
mod - AI/Skirmish/RAI/CMakeLists.txt Diff ] File ]
add - AI/Wrappers/CMakeLists.txt Diff ] File ]
add - AI/Wrappers/CUtils/CMakeLists.txt Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAI.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAI.h Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIGlobalAI.cpp Diff ] File ]
mod - AI/Wrappers/LegacyCpp/AIGlobalAI.h Diff ] File ]
add - AI/Wrappers/LegacyCpp/CMakeLists.txt Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
add - Documentation/HowToBuild.txt Diff ] File ]
mod - Documentation/cmds.txt Diff ] File ]
mod - Documentation/releasechecklist.txt Diff ] File ]
mod - SConstruct Diff ] File ]
mod - game/LuaUI/Widgets/minimap_startbox.lua Diff ] File ]
mod - game/LuaUI/widgets.lua Diff ] File ]
mod - game/cmdcolors.txt Diff ] File ]
add - installer/builddata/bitmaps/bitmaps/ui/background.jpg Diff ] File ]
add - installer/builddata/springcontent/LuaGadgets/Gadgets/unit_script.lua Diff ] File ]
add - installer/builddata/springcontent/LuaGadgets/Gadgets/unit_script_library.lua Diff ] File ]
mod - installer/builddata/springcontent/LuaGadgets/system.lua Diff ] File ]
add - installer/builddata/springcontent/gamedata/unit_script_header.lua Diff ] File ]
add - installer/builddata/springcontent/gamedata/unit_script_library_header.lua Diff ] File ]
mod - installer/builddata/springcontent/shaders/bumpWaterFS.glsl Diff ] File ]
mod - installer/builddata/springcontent/shaders/bumpWaterVS.glsl Diff ] File ]
mod - installer/freedesktop/applications/spring.desktop Diff ] File ]
mod - installer/make_gamedata_arch.sh Diff ] File ]
mod - rts/CMakeLists.txt Diff ] File ]
mod - rts/ExternalAI/AICallback.cpp Diff ] File ]
mod - rts/ExternalAI/AIInterfaceLibrary.cpp Diff ] File ]
mod - rts/ExternalAI/AILibraryManager.cpp Diff ] File ]
mod - rts/ExternalAI/EngineOutHandler.cpp Diff ] File ]
mod - rts/ExternalAI/EngineOutHandler.h Diff ] File ]
mod - rts/ExternalAI/ISkirmishAI.h Diff ] File ]
mod - rts/ExternalAI/Interface/AISEvents.h Diff ] File ]
mod - rts/ExternalAI/Interface/SSkirmishAICallback.h Diff ] File ]
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAI.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAILibrary.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.h Diff ] File ]
mod - rts/Game/Game.cpp Diff ] File ]
mod - rts/Game/GameData.cpp Diff ] File ]
mod - rts/Game/GameData.h 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/PlayerBase.cpp Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/SelectMenu.cpp Diff ] File ]
mod - rts/Game/SelectMenu.h Diff ] File ]
mod - rts/Game/SelectedUnits.cpp Diff ] File ]
mod - rts/Game/SelectedUnits.h Diff ] File ]
add - rts/Game/SelectionWidget.cpp Diff ] File ]
add - rts/Game/SelectionWidget.h Diff ] File ]
mod - rts/Game/Server/GameParticipant.h Diff ] File ]
mod - rts/Game/StartScripts/CommanderScript.cpp Diff ] File ]
mod - rts/Game/StartScripts/ScriptHandler.cpp Diff ] File ]
mod - rts/Game/StartScripts/ScriptHandler.h Diff ] File ]
mod - rts/Game/StartScripts/SkirmishAITestScript.cpp Diff ] File ]
mod - rts/Game/StartScripts/SkirmishAITestScript.h Diff ] File ]
mod - rts/Game/UI/GuiHandler.cpp Diff ] File ]
mod - rts/Game/UI/GuiHandler.h Diff ] File ]
mod - rts/Game/UI/MiniMap.cpp Diff ] File ]
mod - rts/Game/WordCompletion.cpp Diff ] File ]
mod - rts/Lua/LuaConstCMD.cpp Diff ] File ]
mod - rts/Lua/LuaConstCMDTYPE.cpp Diff ] File ]
add - rts/Lua/LuaConstCOB.cpp Diff ] File ]
add - rts/Lua/LuaConstCOB.h Diff ] File ]
mod - rts/Lua/LuaFonts.cpp Diff ] File ]
mod - rts/Lua/LuaHandle.cpp Diff ] File ]
mod - rts/Lua/LuaHandleSynced.cpp Diff ] File ]
mod - rts/Lua/LuaPathFinder.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedCtrl.cpp 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/LuaUnsyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.h Diff ] File ]
mod - rts/Lua/LuaUtils.h Diff ] File ]
mod - rts/Map/BaseGroundDrawer.cpp Diff ] File ]
mod - rts/Map/Ground.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/Lightcalc.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/QuadRenderData.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/Terrain.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainTexEnvCombine.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainTexture.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainTextureGLSL.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainUtil.cpp Diff ] File ]
mod - rts/Map/SM3/terrain/TerrainVertexBuffer.cpp 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/BFGroundTextures.h Diff ] File ]
mod - rts/Rendering/Env/AdvWater.cpp Diff ] File ]
mod - rts/Rendering/Env/BaseTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/BumpWater.cpp Diff ] File ]
mod - rts/Rendering/Env/DynWater.cpp Diff ] File ]
mod - rts/Rendering/GL/FBO.cpp Diff ] File ]
mod - rts/Rendering/GL/glExtra.cpp Diff ] File ]
rm - rts/Rendering/GL/glList.cpp Diff ] File ]
mod - rts/Rendering/GL/myGL.cpp Diff ] File ]
mod - rts/Rendering/GroundFlash.cpp Diff ] File ]
mod - rts/Rendering/InMapDraw.cpp Diff ] File ]
mod - rts/Rendering/InMapDraw.h Diff ] File ]
mod - rts/Rendering/ShadowHandler.cpp Diff ] File ]
mod - rts/Rendering/UnitModels/3DOParser.cpp Diff ] File ]
mod - rts/Rendering/UnitModels/UnitDrawer.cpp Diff ] File ]
mod - rts/Rendering/UnitModels/UnitDrawer.h Diff ] File ]
mod - rts/Rendering/UnitModels/s3oParser.cpp Diff ] File ]
mod - rts/Sim/Misc/CollisionHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/ModInfo.cpp Diff ] File ]
mod - rts/Sim/Misc/ModInfo.h Diff ] File ]
mod - rts/Sim/Misc/ResourceMapAnalyzer.cpp 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/TeamBase.h Diff ] File ]
mod - rts/Sim/Misc/TeamHandler.h Diff ] File ]
mod - rts/Sim/Misc/Wind.cpp 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/MoveInfo.h Diff ] File ]
mod - rts/Sim/MoveTypes/MoveMath/MoveMath.cpp Diff ] File ]
mod - rts/Sim/MoveTypes/TAAirMoveType.cpp Diff ] File ]
mod - rts/Sim/Path/IPath.h Diff ] File ]
mod - rts/Sim/Path/PathEstimator.cpp Diff ] File ]
mod - rts/Sim/Path/PathFinder.cpp Diff ] File ]
mod - rts/Sim/Path/PathFinder.h Diff ] File ]
mod - rts/Sim/Path/PathManager.cpp Diff ] File ]
mod - rts/Sim/Projectiles/ExplosionGenerator.cpp Diff ] File ]
mod - rts/Sim/Projectiles/FireProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Projectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/GeoThermSmokeProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/MuzzleFlame.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/RepulseGfx.cpp Diff ] File ]
mod - rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp Diff ] File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp Diff ] File ]
add - rts/Sim/Units/COB/CobDefines.h Diff ] File ]
mod - rts/Sim/Units/COB/CobInstance.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/UnitScriptNames.cpp Diff ] File ]
mod - rts/Sim/Units/COB/UnitScriptNames.h Diff ] File ]
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp Diff ] File ]
mod - rts/Sim/Units/Unit.cpp Diff ] File ]
mod - rts/Sim/Units/UnitDef.h Diff ] File ]
mod - rts/Sim/Units/UnitDefHandler.cpp Diff ] File ]
mod - rts/Sim/Units/UnitDefHandler.h 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/Weapon.cpp Diff ] File ]
mod - rts/Sim/Weapons/bombdropper.cpp Diff ] File ]
mod - rts/System/BaseNetProtocol.cpp Diff ] File ]
mod - rts/System/BaseNetProtocol.h Diff ] File ]
mod - rts/System/FPUCheck.h Diff ] File ]
mod - rts/System/FastMath.h Diff ] File ]
mod - rts/System/FileSystem/Archive7Zip.cpp Diff ] File ]
mod - rts/System/FileSystem/Archive7Zip.h Diff ] File ]
mod - rts/System/FileSystem/CRC.cpp Diff ] File ]
mod - rts/System/GlobalUnsynced.cpp Diff ] File ]
mod - rts/System/GlobalUnsynced.h Diff ] File ]
add - rts/System/InputHandler.cpp Diff ] File ]
add - rts/System/InputHandler.h Diff ] File ]
mod - rts/System/LoadSaveHandler.cpp Diff ] File ]
mod - rts/System/LogOutput.cpp Diff ] File ]
mod - rts/System/Main.cpp Diff ] File ]
mod - rts/System/MouseInput.cpp Diff ] File ]
mod - rts/System/MouseInput.h Diff ] File ]
mod - rts/System/Net/Socket.cpp Diff ] File ]
mod - rts/System/Net/Socket.h Diff ] File ]
mod - rts/System/Net/UDPConnection.cpp Diff ] File ]
mod - rts/System/Net/UDPListener.cpp Diff ] File ]
mod - rts/System/Platform/Misc.cpp Diff ] File ]
mod - rts/System/Sound/Sound.cpp Diff ] File ]
mod - rts/System/Sound/Sound.h Diff ] File ]
mod - rts/System/SpringApp.cpp Diff ] File ]
mod - rts/System/SpringApp.h Diff ] File ]
mod - rts/System/Sync/SyncDebugger.cpp Diff ] File ]
mod - rts/System/float3.cpp Diff ] File ]
mod - rts/System/float3.h Diff ] File ]
add - rts/aGui/Button.cpp Diff ] File ]
add - rts/aGui/Button.h Diff ] File ]
add - rts/aGui/Gui.cpp Diff ] File ]
add - rts/aGui/Gui.h Diff ] File ]
add - rts/aGui/GuiElement.cpp Diff ] File ]
add - rts/aGui/GuiElement.h Diff ] File ]
add - rts/aGui/HorizontalLayout.cpp Diff ] File ]
add - rts/aGui/HorizontalLayout.h Diff ] File ]
add - rts/aGui/Layout.h Diff ] File ]
add - rts/aGui/LineEdit.cpp Diff ] File ]
add - rts/aGui/LineEdit.h Diff ] File ]
add - rts/aGui/List.cpp Diff ] File ]
add - rts/aGui/Picture.cpp Diff ] File ]
add - rts/aGui/Picture.h Diff ] File ]
add - rts/aGui/TextElement.cpp Diff ] File ]
add - rts/aGui/TextElement.h Diff ] File ]
add - rts/aGui/VerticalLayout.cpp Diff ] File ]
add - rts/aGui/VerticalLayout.h Diff ] File ]
add - rts/aGui/Window.cpp Diff ] File ]
add - rts/aGui/Window.h Diff ] File ]
mod - rts/build/cmake/FindJavaExtended.cmake Diff ] File ]
mod - rts/build/scons/config.py Diff ] File ]
add - rts/lib/7z/7zBuf.c Diff ] File ]
add - rts/lib/7z/7zBuf.h Diff ] File ]
add - rts/lib/7z/7zBuf2.c Diff ] File ]
add - rts/lib/7z/7zCrc.c Diff ] File ]
add - rts/lib/7z/7zCrc.h Diff ] File ]
add - rts/lib/7z/7zFile.c Diff ] File ]
add - rts/lib/7z/7zFile.h Diff ] File ]
add - rts/lib/7z/7zStream.c Diff ] File ]
add - rts/lib/7z/Archive/7z/7zAlloc.h Diff ] File ]
add - rts/lib/7z/Archive/7z/7zDecode.c Diff ] File ]
add - rts/lib/7z/Archive/7z/7zDecode.h Diff ] File ]
add - rts/lib/7z/Archive/7z/7zExtract.c Diff ] File ]
add - rts/lib/7z/Archive/7z/7zIn.c Diff ] File ]
add - rts/lib/7z/Archive/7z/7zIn.h Diff ] File ]
add - rts/lib/7z/Archive/7z/7zItem.c Diff ] File ]
add - rts/lib/7z/Archive/7z/7zItem.h Diff ] File ]
add - rts/lib/7z/Bcj2.c Diff ] File ]
add - rts/lib/7z/Bcj2.h Diff ] File ]
add - rts/lib/7z/Bra.c Diff ] File ]
add - rts/lib/7z/Bra.h Diff ] File ]
add - rts/lib/7z/Bra86.c Diff ] File ]
add - rts/lib/7z/CpuArch.h Diff ] File ]
add - rts/lib/7z/LzmaDec.c Diff ] File ]
add - rts/lib/7z/LzmaDec.h Diff ] File ]
add - rts/lib/7z/Types.h Diff ] File ]
rm - rts/lib/7zip/7zAlloc.h Diff ] File ]
rm - rts/lib/7zip/7zBuffer.c Diff ] File ]
rm - rts/lib/7zip/7zBuffer.h Diff ] File ]
rm - rts/lib/7zip/7zCrc.c Diff ] File ]
rm - rts/lib/7zip/7zCrc.h Diff ] File ]
rm - rts/lib/7zip/7zDecode.c Diff ] File ]
rm - rts/lib/7zip/7zDecode.h Diff ] File ]
rm - rts/lib/7zip/7zExtract.c Diff ] File ]
rm - rts/lib/7zip/7zIn.c Diff ] File ]
rm - rts/lib/7zip/7zIn.h Diff ] File ]
rm - rts/lib/7zip/7zItem.c Diff ] File ]
rm - rts/lib/7zip/7zItem.h Diff ] File ]
rm - rts/lib/7zip/7zMethodID.c Diff ] File ]
rm - rts/lib/7zip/7zMethodID.h Diff ] File ]
rm - rts/lib/7zip/7zTypes.h Diff ] File ]
rm - rts/lib/7zip/LzmaDecode.c Diff ] File ]
rm - rts/lib/7zip/LzmaDecode.h Diff ] File ]
mod - rts/lib/CMakeLists.txt Diff ] File ]
mod - rts/lib/lua/src/lmathlib.cpp Diff ] File ]
mod - rts/lib/streflop/FPUSettings.h Diff ] File ]
mod - rts/lib/streflop/streflop_cond.h Diff ] File ]