2025-08-27 09:47 CEST
  

spring: develop dc2a80f0 [ Diff ] [ Back to Repository ]
Author Committer Branch Timestamp Parent
hoijui hoijui develop 2010-07-07 19:44:15 develop ef6f71fd
Changeset Merge remote branch 'masterLocal/master' into pureint

Conflicts:
    rts/ExternalAI/Interface/SSkirmishAICallback.h
    rts/ExternalAI/SSkirmishAICallbackImpl.cpp
mod - AI/Interfaces/Python [ Diff ] [ File ]
mod - buildbot/master.cfg [ Diff ] [ File ]
mod - cont/LuaUI/Widgets/headless_setup.lua [ Diff ] [ File ]
mod - directories.txt [ Diff ] [ File ]
mod - doc/changelog.txt [ Diff ] [ File ]
mod - doc/cmds.txt [ Diff ] [ File ]
add - include/GL/gl.h [ Diff ] [ File ]
add - include/GL/glew.h [ Diff ] [ File ]
add - include/GL/glext.h [ Diff ] [ File ]
add - include/GL/glu.h [ Diff ] [ File ]
add - include/GL/glu_mangle.h [ Diff ] [ File ]
add - include/GL/glxext.h [ Diff ] [ File ]
add - include/SDL/SDL.h [ Diff ] [ File ]
add - include/SDL/SDL_active.h [ Diff ] [ File ]
add - include/SDL/SDL_audio.h [ Diff ] [ File ]
add - include/SDL/SDL_byteorder.h [ Diff ] [ File ]
add - include/SDL/SDL_cdrom.h [ Diff ] [ File ]
add - include/SDL/SDL_config.h [ Diff ] [ File ]
add - include/SDL/SDL_cpuinfo.h [ Diff ] [ File ]
add - include/SDL/SDL_endian.h [ Diff ] [ File ]
add - include/SDL/SDL_error.h [ Diff ] [ File ]
add - include/SDL/SDL_events.h [ Diff ] [ File ]
add - include/SDL/SDL_getenv.h [ Diff ] [ File ]
add - include/SDL/SDL_joystick.h [ Diff ] [ File ]
add - include/SDL/SDL_keyboard.h [ Diff ] [ File ]
add - include/SDL/SDL_keysym.h [ Diff ] [ File ]
add - include/SDL/SDL_loadso.h [ Diff ] [ File ]
add - include/SDL/SDL_main.h [ Diff ] [ File ]
add - include/SDL/SDL_mouse.h [ Diff ] [ File ]
add - include/SDL/SDL_mutex.h [ Diff ] [ File ]
add - include/SDL/SDL_name.h [ Diff ] [ File ]
add - include/SDL/SDL_opengl.h [ Diff ] [ File ]
add - include/SDL/SDL_platform.h [ Diff ] [ File ]
add - include/SDL/SDL_quit.h [ Diff ] [ File ]
add - include/SDL/SDL_rwops.h [ Diff ] [ File ]
add - include/SDL/SDL_stdinc.h [ Diff ] [ File ]
add - include/SDL/SDL_syswm.h [ Diff ] [ File ]
add - include/SDL/SDL_thread.h [ Diff ] [ File ]
add - include/SDL/SDL_timer.h [ Diff ] [ File ]
add - include/SDL/SDL_types.h [ Diff ] [ File ]
add - include/SDL/SDL_version.h [ Diff ] [ File ]
add - include/SDL/SDL_video.h [ Diff ] [ File ]
add - include/SDL/begin_code.h [ Diff ] [ File ]
add - include/SDL/close_code.h [ Diff ] [ File ]
mod - rts/ExternalAI/AICallback.cpp [ Diff ] [ File ]
mod - rts/ExternalAI/AICheats.cpp [ Diff ] [ File ]
mod - rts/ExternalAI/AICheats.h [ Diff ] [ File ]
mod - rts/ExternalAI/EngineOutHandler.cpp [ Diff ] [ File ]
mod - rts/ExternalAI/Interface/SSkirmishAICallback.h [ Diff ] [ File ]
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp [ Diff ] [ File ]
mod - rts/Game/Camera.cpp [ Diff ] [ File ]
mod - rts/Game/Camera/OverviewController.cpp [ Diff ] [ File ]
mod - rts/Game/ClientSetup.cpp [ 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/GameServer.cpp [ Diff ] [ File ]
mod - rts/Game/GameServer.h [ Diff ] [ File ]
mod - rts/Game/GameSetup.cpp [ Diff ] [ File ]
mod - rts/Game/Player.cpp [ Diff ] [ File ]
mod - rts/Game/Player.h [ Diff ] [ File ]
mod - rts/Game/PlayerRoster.h [ Diff ] [ File ]
mod - rts/Game/SelectedUnitsAI.cpp [ Diff ] [ File ]
mod - rts/Game/Server/GameParticipant.h [ Diff ] [ File ]
mod - rts/Game/Server/GameSkirmishAI.h [ Diff ] [ File ]
mod - rts/Game/UI/EndGameBox.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GameSetupDrawer.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GuiHandler.cpp [ Diff ] [ File ]
mod - rts/Game/UI/GuiHandler.h [ Diff ] [ File ]
mod - rts/Game/UI/HwMouseCursor.cpp [ Diff ] [ File ]
mod - rts/Game/UI/KeyBindings.cpp [ Diff ] [ File ]
mod - rts/Game/UI/MouseCursor.h [ 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/ResourceBar.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaConstGL.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaFBOs.h [ Diff ] [ File ]
mod - rts/Lua/LuaFonts.h [ Diff ] [ File ]
mod - rts/Lua/LuaHandle.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaLobby.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaLobby.h [ Diff ] [ File ]
mod - rts/Lua/LuaMaterial.h [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedCtrl.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaSyncedRead.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaUnsyncedCtrl.cpp [ Diff ] [ File ]
mod - rts/Lua/LuaWeaponDefs.cpp [ Diff ] [ File ]
mod - rts/Map/BaseGroundDrawer.cpp [ Diff ] [ File ]
mod - rts/Map/BaseGroundDrawer.h [ Diff ] [ File ]
mod - rts/Map/SM3/Sm3GroundDrawer.cpp [ Diff ] [ File ]
mod - rts/Map/SMF/BFGroundDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/AdvTreeGenerator.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/AdvTreeGenerator.h [ Diff ] [ File ]
mod - rts/Rendering/Env/BaseSky.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/BumpWater.cpp [ Diff ] [ File ]
mod - rts/Rendering/Env/GrassDrawer.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/GL/FBO.cpp [ Diff ] [ File ]
mod - rts/Rendering/GL/FBO.h [ 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/VertexArrayRange.h [ Diff ] [ File ]
mod - rts/Rendering/GroundDecalHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/InMapDraw.cpp [ Diff ] [ File ]
mod - rts/Rendering/InMapDraw.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/ModelDrawer.hpp [ Diff ] [ File ]
mod - rts/Rendering/Models/WorldObjectModelRenderer.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/Textures/S3OTextureHandler.cpp [ Diff ] [ File ]
mod - rts/Rendering/Textures/S3OTextureHandler.h [ Diff ] [ File ]
mod - rts/Rendering/UnitDrawer.cpp [ Diff ] [ File ]
mod - rts/Rendering/UnitDrawer.h [ Diff ] [ File ]
mod - rts/Rendering/VerticalSync.cpp [ Diff ] [ File ]
mod - rts/Rendering/VerticalSync.h [ 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/FeatureHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Features/FeatureHandler.h [ Diff ] [ File ]
mod - rts/Sim/Misc/DamageArray.h [ Diff ] [ File ]
mod - rts/Sim/Misc/GroundBlockingObjectMap.h [ Diff ] [ File ]
mod - rts/Sim/Misc/QuadField.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/RadarHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/SmoothHeightMesh.h [ Diff ] [ File ]
mod - rts/Sim/Misc/Team.cpp [ Diff ] [ File ]
mod - rts/Sim/Misc/Team.h [ Diff ] [ File ]
mod - rts/Sim/Misc/TeamHandler.h [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/MoveTypes/GroundMoveType.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/ScriptMoveType.cpp [ Diff ] [ File ]
mod - rts/Sim/Objects/SolidObject.cpp [ Diff ] [ File ]
mod - rts/Sim/Path/IPath.h [ Diff ] [ File ]
mod - rts/Sim/Path/PathEstimator.cpp [ Diff ] [ File ]
mod - rts/Sim/Path/PathEstimator.h [ 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/Path/PathManager.h [ Diff ] [ File ]
mod - rts/Sim/Projectiles/ExpGenSpawner.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/FlyingPiece.cpp [ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.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/Command.h [ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/CommandAI.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/FactoryCAI.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/LineDrawer.h [ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/TransportCAI.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/Unit.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/Unit.h [ Diff ] [ File ]
mod - rts/Sim/Units/UnitDef.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitDefHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitHandler.h [ Diff ] [ File ]
mod - rts/Sim/Units/UnitLoader.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitTracker.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitTracker.h [ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/Builder.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/Building.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/Building.h [ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/Factory.cpp [ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/TransportUnit.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/BeamLaser.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/Cannon.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/Weapon.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/WeaponDefHandler.cpp [ Diff ] [ File ]
mod - rts/Sim/Weapons/WeaponDefHandler.h [ 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/ConfigHandler.cpp [ Diff ] [ File ]
mod - rts/System/ConfigHandler.h [ Diff ] [ File ]
mod - rts/System/EventBatchHandler.cpp [ Diff ] [ File ]
mod - rts/System/EventBatchHandler.h [ Diff ] [ File ]
mod - rts/System/EventClient.cpp [ Diff ] [ File ]
mod - rts/System/EventClient.h [ Diff ] [ File ]
mod - rts/System/EventHandler.h [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveBase.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveBase.h [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchiveBuffered.h [ Diff ] [ File ]
mod - rts/System/FileSystem/ArchivePool.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/DataDirLocater.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/FileHandler.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/SimpleParser.cpp [ Diff ] [ File ]
mod - rts/System/FileSystem/SimpleParser.h [ Diff ] [ File ]
mod - rts/System/GlobalConfig.cpp [ Diff ] [ File ]
mod - rts/System/LoadSave/Demo.h [ Diff ] [ File ]
mod - rts/System/LogOutput.cpp [ Diff ] [ File ]
mod - rts/System/LogOutput.h [ 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/Option.h [ Diff ] [ File ]
mod - rts/System/Platform/errorhandler.cpp [ Diff ] [ File ]
mod - rts/System/Sound/IAudioChannel.h [ Diff ] [ File ]
mod - rts/System/Sound/OggStream.cpp [ Diff ] [ File ]
mod - rts/System/Sound/OggStream.h [ Diff ] [ File ]
mod - rts/System/Sound/Sound.cpp [ Diff ] [ File ]
mod - rts/System/Sound/Sound.h [ Diff ] [ File ]
mod - rts/System/Sound/SoundSource.cpp [ Diff ] [ File ]
mod - rts/System/Sound/SoundSource.h [ Diff ] [ File ]
mod - rts/System/SpringApp.cpp [ Diff ] [ File ]
mod - rts/System/SpringApp.h [ Diff ] [ File ]
mod - rts/System/Sync/Logger.cpp [ Diff ] [ File ]
mod - rts/System/Vec2.h [ Diff ] [ File ]
mod - rts/System/float3.h [ Diff ] [ File ]
mod - rts/System/float4.h [ Diff ] [ File ]
mod - rts/System/myMath.h [ Diff ] [ File ]
mod - rts/builds/DS/CMakeLists.txt [ Diff ] [ File ]
mod - rts/builds/DS/main.cpp [ Diff ] [ File ]
mod - rts/builds/HL/CMakeLists.txt [ Diff ] [ File ]
mod - rts/lib/gml/ThreadSafeContainers.h [ Diff ] [ File ]
mod - rts/lib/gml/gml.cpp [ Diff ] [ File ]
mod - rts/lib/gml/gml.h [ Diff ] [ File ]
mod - rts/lib/gml/gmlfun.h [ Diff ] [ File ]
mod - rts/lib/headlessStubs/CMakeLists.txt [ Diff ] [ File ]
mod - rts/lib/lobby/Connection.cpp [ Diff ] [ File ]
mod - rts/lib/lobby/Connection.h [ Diff ] [ File ]