Changesets: spring
develop e434630c
Timestamp: 2012-05-07 18:46:58 Author: rt [ Details ] [ Diff ] |
Merge branch 'develop' of github.com:spring/spring into develop | ||
mod - buildbot/slave/tests-prepare.sh | [ Diff ] [ File ] | ||
mod - installer/sections/deprecated.nsh | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/NetCommands.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/MiniMap.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/MouseHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/StartPosSelecter.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaUnsyncedCtrl.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/myGL.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Misc/Team.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Misc/Team.h | [ Diff ] [ File ] | ||
mod - rts/System/Log/FileSink.cpp | [ Diff ] [ File ] | ||
mod - rts/System/Rectangle.h | [ Diff ] [ File ] | ||
mod - rts/lib/gml/gmlfun.h | [ Diff ] [ File ] | ||
mod - tools/pr-downloader | [ Diff ] [ File ] | ||
develop 0e3bafa9
Timestamp: 2012-05-07 18:41:40 Author: rt [ Details ] [ Diff ] |
Lua: replace Game.gameID by synced callin GameID(string gameID) | ||
mod - cont/base/springcontent/LuaGadgets/callins.lua | [ Diff ] [ File ] | ||
mod - cont/base/springcontent/LuaGadgets/gadgets.lua | [ Diff ] [ File ] | ||
mod - cont/examples/Widgets/minimap_startbox.lua | [ Diff ] [ File ] | ||
mod - rts/Game/NetCommands.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaConstGame.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHandle.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHandle.h | [ Diff ] [ File ] | ||
mod - rts/System/EventClient.h | [ Diff ] [ File ] | ||
mod - rts/System/EventHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/System/EventHandler.h | [ Diff ] [ File ] | ||
develop 34c7b869
Timestamp: 2012-05-07 18:11:26 Author: jK [ Details ] [ Diff ] |
fix localOnly param of LuaUnsyncedCtrl::MarkerAddPoint & LuaUnsyncedCtrl::MarkerAddLine | ||
mod - rts/Lua/LuaUnsyncedCtrl.cpp | [ Diff ] [ File ] | ||
develop afea3bbe
Timestamp: 2012-05-07 16:31:07 Author: jK [ Details ] [ Diff ] |
fix GL_POINT_DISTANCE_ATTENUATION defaults (Opera has problems with khrono's MathML syntax) | ||
mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | ||
develop 00588057
Timestamp: 2012-05-07 01:19:04 Author: jK [ Details ] [ Diff ] |
fix gml's glPointParameterfv const-ness | ||
mod - rts/lib/gml/gmlfun.h | [ Diff ] [ File ] | ||
develop 87e9dbed
Timestamp: 2012-05-07 01:02:10 Author: jK [ Details ] [ Diff ] |
attempt to workaround ATi's pointsize bug | ||
mod - rts/Game/UI/MiniMap.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/MouseHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/myGL.h | [ Diff ] [ File ] | ||
develop b5cc1ed6
Timestamp: 2012-05-07 01:01:00 Author: jK [ Details ] [ Diff ] |
fix default GL_POINT_DISTANCE_ATTENUATION params in LuaOpenGL | ||
mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | ||
develop f4dba07e
Timestamp: 2012-05-07 01:00:21 Author: jK [ Details ] [ Diff ] |
check startpos for correctness on SERVER side | ||
mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/NetCommands.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/StartPosSelecter.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Misc/Team.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Misc/Team.h | [ Diff ] [ File ] | ||
mod - rts/System/Rectangle.h | [ Diff ] [ File ] | ||
develop a5a56532
Timestamp: 2012-05-07 00:57:18 Author: jK [ Details ] [ Diff ] |
limit os buffer for infolog.txt to 8kB | ||
mod - rts/System/Log/FileSink.cpp | [ Diff ] [ File ] | ||
develop ec480c57
Timestamp: 2012-05-06 13:48:38 Author: abma [ Details ] [ Diff ] |
bump pr-downloader version + use rapid tags ba:latest & zk:stable to download the games | ||
mod - buildbot/slave/tests-prepare.sh | [ Diff ] [ File ] | ||
mod - tools/pr-downloader | [ Diff ] [ File ] | ||
develop dfdea5a9
Timestamp: 2012-05-05 21:33:32 Author: abma [ Details ] [ Diff ] |
no recursive deletion of AI/Skirmish on uninstall (only delete installed files) | ||
mod - installer/sections/deprecated.nsh | [ Diff ] [ File ] | ||
develop d8507a72
Timestamp: 2012-05-05 15:17:44 Author: rt [ Details ] [ Diff ] |
Merge branch 'develop' into PFF | ||
mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl | [ Diff ] [ File ] | ||
mod - cont/base/springcontent/shaders/GLSL/SMFVertProg.glsl | [ Diff ] [ File ] | ||
mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/SMF/SMFRenderState.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/SMF/SMFRenderState.h | [ Diff ] [ File ] | ||
develop beb2305c
Timestamp: 2012-05-05 15:16:21 Author: rt [ Details ] [ Diff ] |
SMF: render the info-texture through GLSL | ||
mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl | [ Diff ] [ File ] | ||
mod - cont/base/springcontent/shaders/GLSL/SMFVertProg.glsl | [ Diff ] [ File ] | ||
mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/SMF/SMFRenderState.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/SMF/SMFRenderState.h | [ Diff ] [ File ] | ||
develop c5a1ba3e
Timestamp: 2012-05-04 01:18:56 Author: rt [ Details ] [ Diff ] |
Merge branch 'develop' into PFF | ||
mod - rts/ExternalAI/AILibraryManager.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/EngineOutHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SAIInterfaceCallbackImpl.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/TraceRay.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/KeyAutoBinder.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/Models/AssParser.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Features/Feature.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Features/Feature.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Misc/Team.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/MoveTypes/StrafeAirMoveType.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Objects/SolidObject.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Objects/SolidObject.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/Unit.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/Unit.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitDefHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | ||
develop 0676792d
Timestamp: 2012-05-04 01:18:28 Author: rt [ Details ] [ Diff ] |
fix stunned=true crashing=true airplanes falling into the void (3078) | ||
mod - rts/Sim/MoveTypes/StrafeAirMoveType.cpp | [ Diff ] [ File ] | ||
develop 8f834e54
Timestamp: 2012-05-04 01:17:46 Author: rt [ Details ] [ Diff ] |
move some shared CUnit/CFeature members into CSolidObject make falling wreckage not lose all its forward speed |
||
mod - rts/Sim/Features/Feature.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Features/Feature.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Objects/SolidObject.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Objects/SolidObject.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/Unit.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/Unit.h | [ Diff ] [ File ] | ||
develop 9d7e7708
Timestamp: 2012-05-03 17:25:14 Author: jK [ Details ] [ Diff ] |
fix assimp lua metafiles | ||
mod - rts/Rendering/Models/AssParser.cpp | [ Diff ] [ File ] | ||
develop 84b65110
Timestamp: 2012-05-03 17:21:43 Author: jK [ Details ] [ Diff ] |
remove a few redundant GameSetup.h includes | ||
mod - rts/ExternalAI/AILibraryManager.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/EngineOutHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SAIInterfaceCallbackImpl.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/TraceRay.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/KeyAutoBinder.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Misc/Team.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitDefHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | ||
develop 7b2c98a9
Timestamp: 2012-04-28 02:25:23 Author: rt [ Details ] [ Diff ] |
Merge branch 'develop' into PFF | ||
mod - rts/Sim/Path/QTPFS/Node.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/Node.hpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/NodeHeap.hpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/PathDefines.hpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/PathSearch.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/PathSearch.hpp | [ Diff ] [ File ] | ||
develop d629dd24
Timestamp: 2012-04-28 02:18:04 Author: rt [ Details ] [ Diff ] |
QTPFS: more ugliness, more speed | ||
mod - rts/Sim/Path/QTPFS/Node.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/Node.hpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/NodeHeap.hpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/PathDefines.hpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/PathSearch.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/PathSearch.hpp | [ Diff ] [ File ] | ||
develop 1b7acc96
Timestamp: 2012-04-26 16:55:59 Author: rt [ Details ] [ Diff ] |
Merge branch 'develop' into PFF | ||
mod - rts/Lua/LuaHandle.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHandle.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHandleSynced.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHandleSynced.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHelper.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaPathFinder.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaRules.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaUnitDefs.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaUnsyncedCtrl.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaUnsyncedRead.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaVFS.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaWeaponDefs.cpp | [ Diff ] [ File ] | ||
develop b35b87d4
Timestamp: 2012-04-26 16:47:37 Author: rt [ Details ] [ Diff ] |
fix dangerous ambiguities and bug in LuaHandle.h 1. void Set***(bool _synced, ...) { ... } 2. static void Set***(const lua_State* L, ...) { ... } ==> changing the name of OR commenting out #2 would make all Set***(L, ...) calls now go to #1 because of implicit pointer <--> boolean conversion (!) |
||
mod - rts/Lua/LuaHandle.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHandle.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHandleSynced.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHandleSynced.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaHelper.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaPathFinder.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaRules.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaSyncedRead.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaUnitDefs.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaUnsyncedCtrl.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaUnsyncedRead.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaVFS.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaWeaponDefs.cpp | [ Diff ] [ File ] | ||
develop 4d65c47a
Timestamp: 2012-04-25 16:13:40 Author: rt [ Details ] [ Diff ] |
Merge branch 'develop' into PFF | ||
mod - rts/Sim/Path/Default/PathManager.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/IPathManager.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/PathManager.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/PathManager.hpp | [ Diff ] [ File ] | ||
develop 3c9278b7
Timestamp: 2012-04-25 16:12:34 Author: rt [ Details ] [ Diff ] |
QTPFS: increase MAX_TEAM_SEARCHES | ||
mod - rts/Sim/Path/Default/PathManager.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/IPathManager.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/PathManager.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/PathManager.hpp | [ Diff ] [ File ] | ||
develop b9575af5
Timestamp: 2012-04-25 13:42:27 Author: rt [ Details ] [ Diff ] |
Merge branch 'develop' into PFF | ||
mod - rts/Game/NetCommands.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/SelectedUnits.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/SelectedUnits.h | [ Diff ] [ File ] | ||
mod - rts/Game/TraceRay.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/TraceRay.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaSyncedCtrl.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaUnsyncedCtrl.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaUnsyncedRead.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/GlobalRendering.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/GlobalRendering.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/NodeLayer.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/NodeLayer.hpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/PathDefines.hpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/PathManager.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/PathManager.hpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/PathSearch.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/QTPFS/PathSearch.hpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/Factory.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/Factory.h | [ Diff ] [ File ] | ||
mod - rts/System/BaseNetProtocol.h | [ Diff ] [ File ] | ||