| spring: develop 1010a6f1 | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| hoijui | hoijui | develop | 2010-04-28 16:19:08 | develop d17c69a9 |
| Changeset | Merge remote branch 'spring/master' into springheadless Conflicts: AI/Skirmish/E323AI AI/Skirmish/KAIK/CMakeLists.txt AI/Skirmish/KAIK/UnitTable.cpp AI/Skirmish/KAIK/Util.cpp AI/Wrappers/LegacyCpp/IAICallback.h doc/changelog.txt installer/builddata/springcontent/LuaGadgets/Gadgets/unit_script.lua installer/make_source_package.sh installer/spring.nsi rts/CMakeLists.txt rts/Game/Game.cpp rts/Game/GameServer.cpp rts/Game/GameServer.h rts/Game/PreGame.cpp rts/Game/SelectedUnits.cpp rts/Game/UI/CommandColors.cpp rts/Map/BaseGroundDrawer.cpp rts/Menu/LobbyConnection.cpp rts/Menu/SelectionWidget.cpp rts/Rendering/GL/VertexArray.h rts/Rendering/GL/VertexArray.inl rts/Rendering/ShadowHandler.cpp rts/Rendering/UnitModels/UnitDrawer.cpp rts/Rendering/glFont.cpp rts/Sim/Misc/TeamBase.cpp rts/Sim/Projectiles/ProjectileHandler.cpp rts/Sim/Projectiles/ProjectileHandler.h rts/Sim/Units/COB/UnitScript.cpp rts/Sim/Units/CommandAI/BuilderCAI.cpp rts/Sim/Units/CommandAI/LineDrawer.cpp rts/Sim/Units/CommandAI/LineDrawer.h rts/Sim/Units/Unit.cpp rts/Sim/Units/UnitHandler.cpp rts/Sim/Weapons/LightningCannon.cpp rts/System/BaseNetProtocol.cpp rts/System/BaseNetProtocol.h rts/System/FileSystem/DataDirLocater.cpp rts/System/GlobalUnsynced.cpp rts/System/LogOutput.cpp rts/System/LogOutput.h rts/System/Platform/CrashHandler.cpp rts/System/Platform/Misc.cpp rts/System/SpringApp.cpp |
|||
| mod - AI/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/data/jvm.properties | [ Diff ] [ File ] | |||
| mod - AI/Interfaces/Java/src/main/native/JavaBridge.c | [ Diff ] [ File ] | |||
| mod - AI/SConscript | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/AAI.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/AAIMap.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/AAI/aidef.h | [ 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 ] | |||
| mod - AI/Skirmish/E323AI | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/HughAI | [ Diff ] [ File ] | |||
| add - AI/Skirmish/KAIK/AIClasses.cpp | [ 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 ] | |||
| mod - AI/Skirmish/KAIK/DGunController.cpp | [ Diff ] [ File ] | |||
| mod - AI/Skirmish/KAIK/DGunController.h | [ 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/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/SpotFinder.cpp | [ 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/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/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.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIGlobalAI.cpp | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIGlobalAICallback.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/Event/AIEvent.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/Event/AIInitEvent.h | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/Event/AIWeaponFiredEvent.h | [ Diff ] [ File ] | |||
| add - AUTHORS | [ Diff ] [ File ] | |||
| mod - CMakeLists.txt | [ Diff ] [ File ] | |||
| add - COPYING | [ 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 - doc/gpl-3.0.html | [ Diff ] [ File ] | |||
| add - doc/gpl-3.0.txt | [ Diff ] [ File ] | |||
| add - game/LuaUI/Widgets/gui_buildspacing.lua | [ Diff ] [ File ] | |||
| mod - game/LuaUI/system.lua | [ Diff ] [ File ] | |||
| mod - game/LuaUI/widgets.lua | [ Diff ] [ File ] | |||
| mod - installer/builddata/maphelper/maphelper/mapdefaults.lua | [ Diff ] [ File ] | |||
| mod - installer/builddata/maphelper/maphelper/parse_tdf_map.lua | [ Diff ] [ File ] | |||
| mod - installer/builddata/springcontent/EngineOptions.lua | [ Diff ] [ File ] | |||
| add - installer/builddata/springcontent/LuaGadgets/Gadgets/game_spawn.lua | [ Diff ] [ File ] | |||
| mod - installer/builddata/springcontent/LuaGadgets/Gadgets/unit_script.lua | [ Diff ] [ File ] | |||
| mod - installer/builddata/springcontent/LuaGadgets/gadgets.lua | [ Diff ] [ File ] | |||
| add - installer/builddata/springcontent/shaders/GLSL/GrassVertProg.glsl | [ Diff ] [ File ] | |||
| add - installer/builddata/springcontent/shaders/GLSL/S3OFragProg.glsl | [ Diff ] [ File ] | |||
| add - installer/builddata/springcontent/shaders/GLSL/S3OVertProg.glsl | [ Diff ] [ File ] | |||
| add - installer/builddata/springcontent/shaders/GLSL/SMFFragProg.glsl | [ Diff ] [ File ] | |||
| add - installer/builddata/springcontent/shaders/GLSL/SMFVertProg.glsl | [ Diff ] [ File ] | |||
| add - installer/builddata/springcontent/shaders/GLSL/ShadowGenVertProg.glsl | [ Diff ] [ File ] | |||
| add - installer/builddata/springcontent/shaders/GLSL/TreeFragProg.glsl | [ Diff ] [ File ] | |||
| add - installer/builddata/springcontent/shaders/GLSL/TreeVertProg.glsl | [ Diff ] [ File ] | |||
| rm - installer/builddata/springcontent/shaders/unit.fp | [ Diff ] [ File ] | |||
| rm - installer/gpl.txt | [ Diff ] [ File ] | |||
| mod - installer/make_source_package.sh | [ Diff ] [ File ] | |||
| rm - installer/sections/AIs/AAI.nsh | [ Diff ] [ File ] | |||
| rm - installer/sections/AIs/E323AI.nsh | [ Diff ] [ File ] | |||
| rm - installer/sections/AIs/KAIK.nsh | [ Diff ] [ File ] | |||
| rm - installer/sections/AIs/RAI.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/docs.nsh | [ Diff ] [ File ] | |||
| mod - installer/sections/main.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/AICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICheats.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICheats.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AIInterfaceKey.cpp | [ 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/AIInterfaceLibraryInfo.h | [ Diff ] [ File ] | |||
| add - rts/ExternalAI/AILegacySupport.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AILibraryManager.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AILibraryManager.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AISCommands.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/EngineOutHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/EngineOutHandler.h | [ Diff ] [ File ] | |||
| rm - rts/ExternalAI/GlobalAICallback.cpp | [ Diff ] [ File ] | |||
| rm - rts/ExternalAI/GlobalAICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/IAILibraryManager.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/IAILibraryManager.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/AISCommands.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/AISEvents.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/ELevelOfSupport.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/SAIFloat3.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/SAIInterfaceCallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/SAIInterfaceLibrary.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/SSkirmishAICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/SSkirmishAILibrary.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/aidefines.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/LuaAIImplHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/LuaAIImplHandler.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SAIInterfaceCallbackImpl.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SAIInterfaceCallbackImpl.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAI.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAIBase.h | [ 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.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAIKey.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAILibrary.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAILibrary.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAILibraryInfo.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SkirmishAILibraryInfo.h | [ 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/Action.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera.h | [ 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/FPSController.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera/FreeController.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera/FreeController.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera/OrbitController.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera/OrbitController.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera/OverheadController.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera/OverheadController.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera/OverviewController.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera/OverviewController.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera/RotOverheadController.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera/RotOverheadController.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera/SmoothController.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera/SmoothController.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera/TWController.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Camera/TWController.h | [ Diff ] [ File ] | |||
| mod - rts/Game/CameraHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/CameraHandler.h | [ Diff ] [ File ] | |||
| mod - rts/Game/ChatMessage.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/ChatMessage.h | [ Diff ] [ File ] | |||
| mod - rts/Game/ClientSetup.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/ClientSetup.h | [ Diff ] [ File ] | |||
| mod - rts/Game/CommandMessage.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/CommandMessage.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Console.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Console.h | [ Diff ] [ File ] | |||
| mod - rts/Game/ConsoleHistory.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/ConsoleHistory.h | [ 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/GameController.h | [ Diff ] [ File ] | |||
| mod - rts/Game/GameData.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameData.h | [ Diff ] [ File ] | |||
| mod - rts/Game/GameHelper.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameHelper.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/GameVersion.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameVersion.h | [ Diff ] [ File ] | |||
| mod - rts/Game/OSCStatsSender.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/OSCStatsSender.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Player.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Player.h | [ Diff ] [ File ] | |||
| mod - rts/Game/PlayerBase.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/PlayerBase.h | [ 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/PlayerRoster.h | [ Diff ] [ File ] | |||
| mod - rts/Game/PlayerStatistics.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/PlayerStatistics.h | [ Diff ] [ File ] | |||
| mod - rts/Game/PreGame.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/PreGame.h | [ 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/Server/GameParticipant.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Server/GameSkirmishAI.h | [ Diff ] [ File ] | |||
| mod - rts/Game/Server/MsgStrings.h | [ Diff ] [ File ] | |||
