Changesets: spring
develop 5d15de95
Timestamp: 2009-11-14 10:08:40 Author: hoijui [ Details ] [ Diff ] |
Merge commit 'spring/master' into springheadless Conflicts: rts/Game/Game.cpp |
||
mod - AI/Interfaces/Java/src/main/native/JvmLocater_windows.c | [ Diff ] [ File ] | ||
mod - AI/Skirmish/AAI/data/AIInfo.lua | [ Diff ] [ File ] | ||
add - AI/Skirmish/AAI/data/cfg/mod/BA704.cfg | [ Diff ] [ File ] | ||
mod - AI/Skirmish/E323AI | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/DGunController.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/PathFinder.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/PathFinder.h | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/ThreatMap.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/Unit.cpp | [ Diff ] [ File ] | ||
mod - AI/Skirmish/KAIK/data/AIInfo.lua | [ Diff ] [ File ] | ||
mod - AI/Skirmish/NullAI/data/AIInfo.lua | [ Diff ] [ File ] | ||
mod - AI/Skirmish/RAI/data/AIInfo.lua | [ Diff ] [ File ] | ||
mod - CMakeLists.txt | [ Diff ] [ File ] | ||
mod - Documentation/changelog.txt | [ Diff ] [ File ] | ||
mod - SConstruct | [ Diff ] [ File ] | ||
mod - installer/freedesktop/applications/spring.desktop | [ Diff ] [ File ] | ||
mod - installer/make_gamedata_arch.bat | [ Diff ] [ File ] | ||
mod - installer/make_gamedata_arch.sh | [ Diff ] [ File ] | ||
mod - installer/make_source_package.sh | [ Diff ] [ File ] | ||
add - installer/sections/AIs/E323AI.nsh | [ Diff ] [ File ] | ||
mod - installer/sections/sectiondesc.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/EngineOutHandler.h | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/Interface/SAIInterfaceCallback.h | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SkirmishAIHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SkirmishAIHandler.h | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SkirmishAIWrapper.h | [ Diff ] [ File ] | ||
mod - rts/Game/Console.h | [ Diff ] [ File ] | ||
mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/Game.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/GameVersion.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/OSCStatsSender.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/PreGame.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/PreGame.h | [ 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/SelectionWidget.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/SelectionWidget.h | [ Diff ] [ File ] | ||
mod - rts/Game/Server/GameParticipant.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/Server/GameParticipant.h | [ Diff ] [ File ] | ||
mod - rts/Game/UI/GameInfo.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/GuiHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/TooltipConsole.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaSyncedCtrl.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaSyncedCtrl.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/BasicMapDamage.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/BasicMapDamage.h | [ Diff ] [ File ] | ||
mod - rts/Map/MapInfo.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/MapInfo.h | [ Diff ] [ File ] | ||
mod - rts/Map/ReadMap.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/SM3/terrain/Terrain.h | [ Diff ] [ File ] | ||
mod - rts/Map/SM3/terrain/TerrainTexture.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/Textures/Bitmap.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/glFont.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/glFont.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Features/FeatureHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Misc/Team.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Misc/Team.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Misc/TeamBase.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/Units/CommandAI/BuilderCAI.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/MobileCAI.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitDefHandler.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/Builder.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/EventHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/System/FileSystem/FileSystem.cpp | [ Diff ] [ File ] | ||
mod - rts/System/FileSystem/FileSystem.h | [ Diff ] [ File ] | ||
mod - rts/System/MouseInput.h | [ Diff ] [ File ] | ||
mod - rts/System/Net/UDPConnection.cpp | [ Diff ] [ File ] | ||
mod - rts/System/Net/UDPConnection.h | [ Diff ] [ File ] | ||
mod - rts/System/NetProtocol.cpp | [ Diff ] [ File ] | ||
mod - rts/System/Option.cpp | [ Diff ] [ File ] | ||
mod - rts/System/Option.h | [ Diff ] [ File ] | ||
mod - rts/System/Platform/Win/CrashHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | ||
mod - rts/System/creg/Serializer.cpp | [ Diff ] [ File ] | ||
mod - rts/aGui/LineEdit.cpp | [ Diff ] [ File ] | ||
mod - rts/aGui/LineEdit.h | [ Diff ] [ File ] | ||
mod - rts/aGui/List.cpp | [ Diff ] [ File ] | ||
mod - rts/aGui/List.h | [ Diff ] [ File ] | ||
mod - rts/aGui/Window.h | [ Diff ] [ File ] | ||
add - rts/build/cmake/Find7zip.cmake | [ Diff ] [ File ] | ||
mod - rts/build/cmake/FindZLIB.cmake | [ Diff ] [ File ] | ||
mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | ||
mod - rts/lib/gml/gml.h | [ Diff ] [ File ] | ||
develop 324c8d59
Timestamp: 2009-11-14 01:32:12 Author: kloot [ Details ] [ Diff ] |
* fix infinite loop in CglFont::WrapTextConsole | ||
mod - rts/Rendering/glFont.cpp | [ Diff ] [ File ] | ||
develop 93a41a7b
Timestamp: 2009-11-13 19:41:45 Author: hoijui [ Details ] [ Diff ] |
GameHelper docu addition and constification plus minor cleanup ('so' was both an int and a CSolidObject) no code logic changes (except constification) |
||
mod - rts/Game/GameHelper.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/GameHelper.h | [ Diff ] [ File ] | ||
develop 2ade6adb
Timestamp: 2009-11-13 19:28:12 Author: hoijui [ Details ] [ Diff ] |
AI: When an option that is defined in a Skirmish AI's AIOptions.lua is not specified, set its default value This applies for specifying the AI in script.txt or any other ways, like eg /aicontrol, which has no support for options yet. This ensures that the AI will always get a value for each option that is defined in its AIOptions.lua file. |
||
mod - rts/ExternalAI/SkirmishAIHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SkirmishAIHandler.h | [ Diff ] [ File ] | ||
develop 689064c7
Timestamp: 2009-11-13 19:23:22 Author: Karl-Robert Ernst [ Details ] [ Diff ] |
quick and dirty fix for submodules in the source tarball | ||
mod - installer/make_source_package.sh | [ Diff ] [ File ] | ||
develop 3d3e79c7
Timestamp: 2009-11-13 19:21:32 Author: hoijui [ Details ] [ Diff ] |
simplify retrieval of the default value of an Option | ||
mod - rts/System/Option.cpp | [ Diff ] [ File ] | ||
mod - rts/System/Option.h | [ Diff ] [ File ] | ||
develop 3d64a7e8
Timestamp: 2009-11-13 17:45:38 Author: Karl-Robert Ernst [ Details ] [ Diff ] |
forgot to update packet length for new quit message | ||
mod - rts/Game/PreGame.cpp | [ Diff ] [ File ] | ||
mod - rts/System/BaseNetProtocol.cpp | [ Diff ] [ File ] | ||
develop 7c8faa93
Timestamp: 2009-11-13 12:24:06 Author: Karl-Robert Ernst [ Details ] [ Diff ] |
server gives a quit-reason when sending netmsg-quit (and netmsg_quit is honored in PreGame now) | ||
mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/PreGame.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/Server/GameParticipant.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/Server/GameParticipant.h | [ Diff ] [ File ] | ||
mod - rts/System/BaseNetProtocol.cpp | [ Diff ] [ File ] | ||
mod - rts/System/BaseNetProtocol.h | [ Diff ] [ File ] | ||
mod - rts/System/NetProtocol.cpp | [ Diff ] [ File ] | ||
develop c505f011
Timestamp: 2009-11-13 12:13:49 Author: zerver [ Details ] [ Diff ] |
Add simple RAW config file editor | ||
mod - rts/Game/SelectMenu.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/SelectMenu.h | [ Diff ] [ File ] | ||
mod - rts/Game/SelectionWidget.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/SelectionWidget.h | [ Diff ] [ File ] | ||
mod - rts/System/ConfigHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/System/ConfigHandler.h | [ Diff ] [ File ] | ||
mod - rts/aGui/LineEdit.cpp | [ Diff ] [ File ] | ||
mod - rts/aGui/LineEdit.h | [ Diff ] [ File ] | ||
mod - rts/aGui/List.cpp | [ Diff ] [ File ] | ||
mod - rts/aGui/List.h | [ Diff ] [ File ] | ||
mod - rts/aGui/Window.h | [ Diff ] [ File ] | ||
develop c149feac
Timestamp: 2009-11-13 10:23:04 Author: hoijui [ Details ] [ Diff ] |
make load-screens preserve their aspect ratio (rest of the screen will be black) | ||
mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | ||
develop fa06f3db
Timestamp: 2009-11-13 10:20:53 Author: hoijui [ Details ] [ Diff ] |
document font->glPrint() & minor cleanup plus constification in Bitmap | ||
mod - rts/Rendering/Textures/Bitmap.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/glFont.h | [ Diff ] [ File ] | ||
develop c93324aa
Timestamp: 2009-11-12 21:52:28 Author: hoijui [ Details ] [ Diff ] |
AI: E323AI: pump version | ||
mod - AI/Skirmish/E323AI | [ Diff ] [ File ] | ||
develop aa24cff8
Timestamp: 2009-11-12 21:20:58 Author: Tobi Vollebregt [ Details ] [ Diff ] |
changelog update | ||
mod - Documentation/changelog.txt | [ Diff ] [ File ] | ||
develop e7b72e67
Timestamp: 2009-11-12 18:52:51 Author: hoijui [ Details ] [ Diff ] |
AI: fix AWK script & add a function | ||
mod - AI/Wrappers/CUtils/bin/common.awk | [ Diff ] [ File ] | ||
develop 016992b4
Timestamp: 2009-11-12 18:52:22 Author: hoijui [ Details ] [ Diff ] |
AI: docu addition | ||
mod - rts/ExternalAI/Interface/SSkirmishAICallback.h | [ Diff ] [ File ] | ||
develop 27a76edb
Timestamp: 2009-11-12 17:05:17 Author: hoijui [ Details ] [ Diff ] |
installer: add E323AI to the installer package | ||
add - installer/sections/AIs/E323AI.nsh | [ Diff ] [ File ] | ||
mod - installer/spring.nsi | [ Diff ] [ File ] | ||
develop 670cd7cb
Timestamp: 2009-11-12 11:55:24 Author: hoijui [ Details ] [ Diff ] |
CMake: add Find7yip.cmake, and fail if 7zip executable is not installed (fixes mantis 0001725) | ||
mod - CMakeLists.txt | [ Diff ] [ File ] | ||
mod - installer/make_gamedata_arch.bat | [ Diff ] [ File ] | ||
mod - installer/make_gamedata_arch.sh | [ Diff ] [ File ] | ||
add - rts/build/cmake/Find7zip.cmake | [ Diff ] [ File ] | ||
mod - rts/build/cmake/FindZLIB.cmake | [ Diff ] [ File ] | ||
develop 79a2fe19
Timestamp: 2009-11-12 02:37:56 Author: kloot [ Details ] [ Diff ] |
Merge branch 'master' of git@github.com:spring/spring | ||
mod - rts/Game/OSCStatsSender.cpp | [ Diff ] [ File ] | ||
develop aee19193
Timestamp: 2009-11-12 02:37:14 Author: kloot [ Details ] [ Diff ] |
give LuaSynced limited run-time typemap control * any map-square's terrain-type index can be arbitrarily altered, but * for any terrain-type, only the speed modifiers are writable for now |
||
mod - rts/Lua/LuaSyncedCtrl.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaSyncedCtrl.h | [ Diff ] [ File ] | ||
mod - rts/Map/BasicMapDamage.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/BasicMapDamage.h | [ Diff ] [ File ] | ||
mod - rts/Map/MapInfo.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/MapInfo.h | [ Diff ] [ File ] | ||
mod - rts/Map/ReadMap.cpp | [ 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 ] | ||
develop ca0a1285
Timestamp: 2009-11-11 11:35:20 Author: hoijui [ Details ] [ Diff ] |
AI: Java: adjustments for move from teamId to skirmishAIId | ||
mod - AI/Interfaces/Java/bin/jni_wrappCallback.awk | [ Diff ] [ File ] | ||
mod - AI/Interfaces/Java/bin/jni_wrappEvents.awk | [ Diff ] [ File ] | ||
mod - AI/Interfaces/Java/bin/native_wrappCallback.awk | [ Diff ] [ File ] | ||
mod - AI/Interfaces/Java/bin/native_wrappCommands.awk | [ Diff ] [ File ] | ||
mod - AI/Interfaces/Java/src/main/native/JavaBridge.c | [ Diff ] [ File ] | ||
mod - AI/Skirmish/NullJavaAI/src/nulljavaai/NullJavaAI.java | [ Diff ] [ File ] | ||
develop cc67d23e
Timestamp: 2009-11-11 11:31:28 Author: hoijui [ Details ] [ Diff ] |
AI: fix for SGetNextWaypointPathCommand | ||
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp | [ Diff ] [ File ] | ||
develop 82f5ac8d
Timestamp: 2009-11-11 11:31:11 Author: hoijui [ Details ] [ Diff ] |
AI: fix for units without yard-map | ||
mod - rts/ExternalAI/Interface/SSkirmishAICallback.h | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | ||
develop 40ae355d
Timestamp: 2009-11-11 11:06:54 Author: hoijui [ Details ] [ Diff ] |
AI: factor out need for UnitHandler inclusion in Legacy C++ AIs | ||
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/AISCommands.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/EngineOutHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/Interface/AISCommands.h | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SkirmishAIWrapper.cpp | [ Diff ] [ File ] | ||
develop dec82f8b
Timestamp: 2009-11-11 11:05:18 Author: hoijui [ Details ] [ Diff ] |
AI: add callback function Unit_getMax() (STATIC) | ||
mod - rts/ExternalAI/Interface/SSkirmishAICallback.h | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SSkirmishAICallbackImpl.h | [ Diff ] [ File ] | ||
develop edac02e9
Timestamp: 2009-11-11 11:03:08 Author: hoijui [ Details ] [ Diff ] |
beautify doc-comment | ||
mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | ||