2025-08-31 17:19 CEST

spring: develop 4eca4ec3 Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
Tobi Vollebregt Tobi Vollebregt develop 2011-07-16 17:11:24 develop 0ad6a3e7
Changeset Merge branch 'master' into features/config-rework

Conflicts:
    rts/ExternalAI/EngineOutHandler.cpp
    rts/Game/Camera/OverheadController.cpp
    rts/Game/Camera/RotOverheadController.cpp
    rts/Game/ClientSetup.cpp
    rts/Game/UI/GameSetupDrawer.cpp
    rts/Game/UI/InfoConsole.cpp
    rts/Game/UI/LuaUI.cpp
    rts/Lua/LuaHandleSynced.cpp
    rts/Map/HeightLinePalette.cpp
    rts/Map/HeightMapTexture.cpp
    rts/Map/MetalMap.cpp
    rts/Menu/LobbyConnection.cpp
    rts/Menu/SelectionWidget.cpp
    rts/Menu/UpdaterWindow.cpp
    rts/Rendering/GlobalRendering.cpp
    rts/Rendering/VerticalSync.cpp
    rts/System/ConfigHandler.cpp
    rts/System/FileSystem/DataDirLocater.cpp
    rts/System/GlobalConfig.cpp
    rts/System/LogOutput.cpp
    rts/System/Sound/EFX.cpp
    rts/System/Sound/ISound.cpp
    rts/System/Sound/Sound.cpp
    rts/System/SpringApp.cpp
mod - AI/Interfaces/Java/bin/jni_wrappEvents.awk Diff ] File ]
mod - AI/Interfaces/Java/bin/native_wrappCommands.awk Diff ] File ]
mod - AI/Wrappers/Cpp/bin/combine_wrappCommands.awk Diff ] File ]
mod - AI/Wrappers/Cpp/bin/wrappCommands.awk Diff ] File ]
mod - AI/Wrappers/Cpp/bin/wrappEvents.awk Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
mod - buildbot/slave/cppcheck.sh Diff ] File ]
mod - cont/base/bitmaps/README.txt Diff ] File ]
mod - cont/base/springcontent/LuaGadgets/Gadgets/README.txt Diff ] File ]
mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl Diff ] File ]
mod - doc/changelog.txt Diff ] File ]
mod - rts/CMakeLists.txt Diff ] File ]
mod - rts/ExternalAI/AICallback.cpp Diff ] File ]
mod - rts/ExternalAI/AICallback.h Diff ] File ]
mod - rts/ExternalAI/AICheats.cpp Diff ] File ]
mod - rts/ExternalAI/AICheats.h Diff ] File ]
mod - rts/ExternalAI/AIInterfaceKey.h Diff ] File ]
mod - rts/ExternalAI/AIInterfaceLibrary.cpp Diff ] File ]
mod - rts/ExternalAI/AIInterfaceLibrary.h Diff ] File ]
mod - rts/ExternalAI/AIInterfaceLibraryInfo.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/Interface/AISCommands.h Diff ] File ]
mod - rts/ExternalAI/Interface/AISEvents.h Diff ] File ]
mod - rts/ExternalAI/LuaAIImplHandler.h Diff ] File ]
mod - rts/ExternalAI/SAIInterfaceCallbackImpl.cpp Diff ] File ]
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAI.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIData.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIData.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAIHandler.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIHandler.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAIKey.h Diff ] File ]
mod - rts/ExternalAI/SkirmishAILibrary.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAILibraryInfo.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.cpp Diff ] File ]
mod - rts/ExternalAI/SkirmishAIWrapper.h Diff ] File ]
mod - rts/Game/Action.cpp Diff ] File ]
mod - rts/Game/AviVideoCapturing.cpp Diff ] File ]
mod - rts/Game/Camera.cpp Diff ] File ]
mod - rts/Game/Camera/CameraController.cpp Diff ] File ]
mod - rts/Game/Camera/CameraController.h Diff ] File ]
mod - rts/Game/Camera/FPSController.cpp Diff ] File ]
mod - rts/Game/Camera/FreeController.cpp Diff ] File ]
mod - rts/Game/Camera/OrbitController.cpp Diff ] File ]
mod - rts/Game/Camera/OverheadController.cpp Diff ] File ]
mod - rts/Game/Camera/OverviewController.cpp Diff ] File ]
mod - rts/Game/Camera/RotOverheadController.cpp Diff ] File ]
mod - rts/Game/Camera/SmoothController.cpp Diff ] File ]
mod - rts/Game/Camera/TWController.cpp Diff ] File ]
mod - rts/Game/CameraHandler.cpp Diff ] File ]
mod - rts/Game/ChatMessage.cpp Diff ] File ]
mod - rts/Game/ClientSetup.cpp Diff ] File ]
mod - rts/Game/CommandMessage.cpp Diff ] File ]
mod - rts/Game/Console.cpp Diff ] File ]
mod - rts/Game/ConsoleHistory.cpp Diff ] File ]
mod - rts/Game/Game.cpp Diff ] File ]
mod - rts/Game/Game.h Diff ] File ]
mod - rts/Game/GameController.cpp 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/GameSetup.cpp Diff ] File ]
mod - rts/Game/GlobalUnsynced.cpp Diff ] File ]
mod - rts/Game/InMapDraw.cpp Diff ] File ]
mod - rts/Game/InMapDrawModel.cpp Diff ] File ]
mod - rts/Game/LoadScreen.cpp Diff ] File ]
mod - rts/Game/LoadScreen.h Diff ] File ]
mod - rts/Game/Messages.cpp Diff ] File ]
mod - rts/Game/NetCommands.cpp Diff ] File ]
mod - rts/Game/OSCStatsSender.cpp Diff ] File ]
mod - rts/Game/Player.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/PlayerRoster.cpp Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Game/SelectedUnits.cpp Diff ] File ]
mod - rts/Game/SelectedUnits.h 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/SyncedGameCommands.cpp Diff ] File ]
mod - rts/Game/TeamController.h Diff ] File ]
mod - rts/Game/TraceRay.cpp Diff ] File ]
mod - rts/Game/UI/CommandColors.cpp Diff ] File ]
mod - rts/Game/UI/CursorIcons.cpp Diff ] File ]
mod - rts/Game/UI/CursorIcons.h Diff ] File ]
mod - rts/Game/UI/EndGameBox.cpp Diff ] File ]
mod - rts/Game/UI/GameInfo.cpp Diff ] File ]
mod - rts/Game/UI/GameSetupDrawer.cpp Diff ] File ]
mod - rts/Game/UI/GuiHandler.cpp Diff ] File ]
mod - rts/Game/UI/HwMouseCursor.cpp Diff ] File ]
mod - rts/Game/UI/InfoConsole.cpp Diff ] File ]
mod - rts/Game/UI/InfoConsole.h Diff ] File ]
mod - rts/Game/UI/InputReceiver.cpp Diff ] File ]
mod - rts/Game/UI/KeyAutoBinder.cpp Diff ] File ]
mod - rts/Game/UI/KeyBindings.cpp Diff ] File ]
mod - rts/Game/UI/KeyCodes.cpp Diff ] File ]
mod - rts/Game/UI/KeySet.cpp Diff ] File ]
mod - rts/Game/UI/LuaUI.cpp Diff ] File ]
mod - rts/Game/UI/MiniMap.cpp Diff ] File ]
mod - rts/Game/UI/MouseCursor.cpp Diff ] File ]
mod - rts/Game/UI/MouseHandler.cpp Diff ] File ]
mod - rts/Game/UI/MouseHandler.h Diff ] File ]
mod - rts/Game/UI/ProfileDrawer.cpp Diff ] File ]
mod - rts/Game/UI/QuitBox.cpp Diff ] File ]
mod - rts/Game/UI/ResourceBar.cpp Diff ] File ]
mod - rts/Game/UI/SelectionKeyHandler.cpp Diff ] File ]
mod - rts/Game/UI/ShareBox.cpp Diff ] File ]
mod - rts/Game/UI/StartPosSelecter.cpp Diff ] File ]
mod - rts/Game/UI/StartPosSelecter.h Diff ] File ]
mod - rts/Game/UI/TooltipConsole.cpp Diff ] File ]
mod - rts/Game/UI/UnitTracker.cpp Diff ] File ]
mod - rts/Game/UI/UnitTracker.h Diff ] File ]
mod - rts/Game/UnsyncedGameCommands.cpp Diff ] File ]
mod - rts/Game/WaitCommandsAI.cpp Diff ] File ]
mod - rts/Game/WaitCommandsAI.h Diff ] File ]
mod - rts/Game/WordCompletion.cpp Diff ] File ]
mod - rts/Lua/LuaBitOps.cpp Diff ] File ]
mod - rts/Lua/LuaCallInCheck.cpp Diff ] File ]
mod - rts/Lua/LuaConstCMD.cpp Diff ] File ]
mod - rts/Lua/LuaConstCMDTYPE.cpp Diff ] File ]
mod - rts/Lua/LuaConstCOB.cpp Diff ] File ]
mod - rts/Lua/LuaConstGL.cpp Diff ] File ]
mod - rts/Lua/LuaConstGame.cpp Diff ] File ]
mod - rts/Lua/LuaFBOs.cpp Diff ] File ]
mod - rts/Lua/LuaFeatureDefs.cpp Diff ] File ]
mod - rts/Lua/LuaFonts.cpp Diff ] File ]
mod - rts/Lua/LuaGaia.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/LuaIO.cpp Diff ] File ]
mod - rts/Lua/LuaInputReceiver.cpp Diff ] File ]
mod - rts/Lua/LuaLobby.cpp Diff ] File ]
mod - rts/Lua/LuaMaterial.cpp Diff ] File ]
mod - rts/Lua/LuaOpenGL.cpp Diff ] File ]
mod - rts/Lua/LuaOpenGLUtils.cpp Diff ] File ]
mod - rts/Lua/LuaParser.cpp Diff ] File ]
mod - rts/Lua/LuaParser.h Diff ] File ]
mod - rts/Lua/LuaPathFinder.cpp Diff ] File ]
mod - rts/Lua/LuaRBOs.cpp Diff ] File ]
mod - rts/Lua/LuaRules.cpp Diff ] File ]
mod - rts/Lua/LuaRulesParams.h Diff ] File ]
mod - rts/Lua/LuaScream.cpp Diff ] File ]
mod - rts/Lua/LuaShaders.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedCall.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedMoveCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaSyncedTable.cpp Diff ] File ]
mod - rts/Lua/LuaTextures.cpp Diff ] File ]
mod - rts/Lua/LuaUnitDefs.cpp Diff ] File ]
mod - rts/Lua/LuaUnitRendering.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedCall.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp Diff ] File ]
mod - rts/Lua/LuaUnsyncedRead.cpp Diff ] File ]
mod - rts/Lua/LuaUtils.cpp Diff ] File ]
mod - rts/Lua/LuaVFS.cpp Diff ] File ]
mod - rts/Lua/LuaWeaponDefs.cpp Diff ] File ]
mod - rts/Lua/LuaZip.cpp Diff ] File ]
mod - rts/Map/BaseGroundDrawer.cpp Diff ] File ]
mod - rts/Map/BaseGroundDrawer.h Diff ] File ]
mod - rts/Map/BasicMapDamage.cpp Diff ] File ]
mod - rts/Map/Ground.cpp Diff ] File ]
mod - rts/Map/Ground.h Diff ] File ]
mod - rts/Map/HeightMapTexture.cpp Diff ] File ]
mod - rts/Map/MapDamage.cpp Diff ] File ]
mod - rts/Map/MapDamage.h Diff ] File ]
mod - rts/Map/MapInfo.cpp Diff ] File ]
mod - rts/Map/MapInfo.h Diff ] File ]
mod - rts/Map/MapParser.cpp Diff ] File ]
mod - rts/Map/MetalMap.cpp Diff ] File ]
mod - rts/Map/MetalMap.h Diff ] File ]
mod - rts/Map/NoMapDamage.cpp Diff ] File ]
mod - rts/Map/ReadMap.cpp Diff ] File ]
mod - rts/Map/ReadMap.h Diff ] File ]
mod - rts/Map/SM3/Frustum.cpp Diff ] File ]
mod - rts/Map/SM3/Plane.cpp Diff ] File ]
mod - rts/Map/SM3/Plane.h Diff ] File ]
mod - rts/Map/SM3/SM3GroundDrawer.cpp Diff ] File ]
mod - rts/Map/SM3/SM3Map.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/TerrainBase.h 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/SMFGroundDrawer.cpp Diff ] File ]
mod - rts/Map/SMF/SMFGroundTextures.cpp Diff ] File ]
mod - rts/Map/SMF/SMFMapFile.cpp Diff ] File ]
mod - rts/Map/SMF/SMFMapFile.h Diff ] File ]
mod - rts/Map/SMF/SMFReadMap.cpp Diff ] File ]
mod - rts/Map/SMF/mapfile.h Diff ] File ]
mod - rts/Menu/LobbyConnection.cpp Diff ] File ]
mod - rts/Menu/SelectMenu.cpp Diff ] File ]
mod - rts/Menu/SelectionWidget.cpp Diff ] File ]
mod - rts/Menu/UpdaterWindow.cpp Diff ] File ]
mod - rts/Rendering/AVIGenerator.cpp Diff ] File ]
mod - rts/Rendering/CommandDrawer.cpp Diff ] File ]
mod - rts/Rendering/DebugColVolDrawer.cpp Diff ] File ]
mod - rts/Rendering/DefaultPathDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvSky.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvTreeGenerator.cpp Diff ] File ]
mod - rts/Rendering/Env/AdvWater.cpp Diff ] File ]
mod - rts/Rendering/Env/BaseSky.cpp Diff ] File ]
mod - rts/Rendering/Env/BaseWater.cpp Diff ] File ]
mod - rts/Rendering/Env/BaseWater.h Diff ] File ]
mod - rts/Rendering/Env/BasicSky.cpp Diff ] File ]
mod - rts/Rendering/Env/BasicTreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/BasicWater.cpp Diff ] File ]
mod - rts/Rendering/Env/BumpWater.cpp Diff ] File ]
mod - rts/Rendering/Env/DynWater.cpp Diff ] File ]
mod - rts/Rendering/Env/GrassDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/ITreeDrawer.cpp Diff ] File ]
mod - rts/Rendering/Env/ITreeDrawer.h Diff ] File ]
mod - rts/Rendering/Env/RefractWater.cpp Diff ] File ]
mod - rts/Rendering/Env/SkyBox.cpp Diff ] File ]
mod - rts/Rendering/FarTextureHandler.cpp Diff ] File ]
mod - rts/Rendering/FarTextureHandler.h Diff ] File ]
mod - rts/Rendering/FeatureDrawer.cpp Diff ] File ]
mod - rts/Rendering/FeatureDrawer.h Diff ] File ]
mod - rts/Rendering/GL/FBO.cpp Diff ] File ]
mod - rts/Rendering/GL/PBO.cpp Diff ] File ]
mod - rts/Rendering/GL/VertexArray.cpp Diff ] File ]
mod - rts/Rendering/GL/VertexArray.h Diff ] File ]
mod - rts/Rendering/GL/VertexArrayRange.cpp Diff ] File ]
mod - rts/Rendering/GL/glExtra.cpp Diff ] File ]
mod - rts/Rendering/GL/myGL.cpp Diff ] File ]
mod - rts/Rendering/GL/myGL.h Diff ] File ]
mod - rts/Rendering/GLContext.cpp Diff ] File ]
mod - rts/Rendering/GlobalRendering.cpp Diff ] File ]
mod - rts/Rendering/GlobalRendering.h Diff ] File ]
mod - rts/Rendering/GroundDecalHandler.cpp Diff ] File ]
mod - rts/Rendering/GroundFlash.cpp Diff ] File ]
mod - rts/Rendering/GroundFlash.h Diff ] File ]
mod - rts/Rendering/IconHandler.cpp Diff ] File ]
mod - rts/Rendering/IconHandler.h Diff ] File ]
mod - rts/Rendering/InMapDrawView.cpp Diff ] File ]
mod - rts/Rendering/LineDrawer.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/AssIO.cpp 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/IModelParser.h Diff ] File ]
mod - rts/Rendering/Models/ModelDrawer.cpp Diff ] File ]
mod - rts/Rendering/Models/OBJParser.cpp Diff ] File ]
mod - rts/Rendering/Models/S3OParser.cpp Diff ] File ]
mod - rts/Rendering/Models/s3o.h Diff ] File ]
mod - rts/Rendering/ProjectileDrawer.cpp Diff ] File ]
mod - rts/Rendering/Screenshot.cpp Diff ] File ]
mod - rts/Rendering/ShadowHandler.cpp 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/ColorMap.cpp Diff ] File ]
mod - rts/Rendering/Textures/ColorMap.h Diff ] File ]
mod - rts/Rendering/Textures/NamedTextures.cpp Diff ] File ]
mod - rts/Rendering/Textures/S3OTextureHandler.cpp Diff ] File ]
mod - rts/Rendering/Textures/TAPalette.cpp Diff ] File ]
mod - rts/Rendering/Textures/TextureAtlas.cpp Diff ] File ]
mod - rts/Rendering/Textures/TextureAtlas.h Diff ] File ]
mod - rts/Rendering/Textures/nv_dds.cpp Diff ] File ]
mod - rts/Rendering/UnitDrawer.cpp Diff ] File ]
mod - rts/Rendering/VerticalSync.cpp Diff ] File ]
mod - rts/Rendering/WorldDrawer.cpp Diff ] File ]
mod - rts/Rendering/glFont.cpp Diff ] File ]
mod - rts/Rendering/glFont.h Diff ] File ]
mod - rts/Sim/Features/Feature.cpp Diff ] File ]
mod - rts/Sim/Features/Feature.h Diff ] File ]
mod - rts/Sim/Features/FeatureHandler.cpp Diff ] File ]
mod - rts/Sim/Features/FeatureHandler.h Diff ] File ]
mod - rts/Sim/Misc/AirBaseHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/CategoryHandler.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/CommonDefHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/DamageArrayHandler.cpp Diff ] File ]
mod - rts/Sim/Misc/DamageArrayHandler.h Diff ] File ]
mod - rts/Sim/Misc/GeometricObjects.cpp Diff ] File ]
mod - rts/Sim/Misc/GeometricObjects.h Diff ] File ]
mod - rts/Sim/Misc/GlobalConstants.h Diff ] File ]
mod - rts/Sim/Misc/GlobalSynced.cpp Diff ] File ]
mod - rts/Sim/Misc/GlobalSynced.h Diff ] File ]
mod - rts/Sim/Misc/GroundBlockingObjectMap.cpp Diff ] File ]
mod - rts/Sim/Misc/GroundBlockingObjectMap.h Diff ] File ]
mod - rts/Sim/Misc/InterceptHandler.cpp Diff ] File ]