Changesets: spring
|
develop fb0bcce4
Timestamp: 2011-06-03 03:13:58 Author: zerver [ Details ] [ Diff ] |
Compile?? | ||
| mod - rts/Sim/Units/CommandAI/Command.h | [ Diff ] [ File ] | ||
| mod - rts/System/Net/PackPacket.h | [ Diff ] [ File ] | ||
|
develop 7533366d
Timestamp: 2011-06-03 03:03:46 Author: zerver [ Details ] [ Diff ] |
Compile? | ||
| mod - rts/Sim/Units/CommandAI/Command.h | [ Diff ] [ File ] | ||
|
develop a162f836
Timestamp: 2011-06-03 02:52:07 Author: zerver [ Details ] [ Diff ] |
Fix compile errors | ||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | ||
| mod - rts/ExternalAI/SkirmishAIWrapper.cpp | [ Diff ] [ File ] | ||
| mod - rts/Map/Ground.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/BuildInfo.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/Scripts/UnitScript.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/EventBatchHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/Net/PackPacket.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/Platform/Threading.cpp | [ Diff ] [ File ] | ||
| mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | ||
|
develop 35e5a009
Timestamp: 2011-06-03 02:07:28 Author: zerver [ Details ] [ Diff ] |
Merge branch 'MT' Conflicts: AI/Skirmish/KAIK rts/Game/Game.cpp rts/Game/UI/GuiHandler.cpp rts/Game/UI/MouseHandler.cpp rts/Game/UnsyncedGameCommands.cpp rts/Lua/LuaHandle.cpp rts/Lua/LuaHandleSynced.cpp rts/Lua/LuaParser.cpp rts/Lua/LuaPathFinder.cpp rts/Lua/LuaShaders.cpp rts/Lua/LuaSyncedCtrl.cpp rts/Lua/LuaSyncedRead.cpp rts/Lua/LuaUnitDefs.cpp rts/Rendering/Textures/S3OTextureHandler.cpp rts/Sim/Units/CommandAI/Command.h rts/Sim/Units/UnitHandler.cpp rts/Sim/Units/UnitLoader.cpp rts/System/Main.cpp rts/System/Platform/CrashHandler.h rts/System/Platform/Linux/CrashHandler.cpp rts/System/Platform/Threading.cpp rts/System/Platform/Threading.h rts/System/Platform/Win/CrashHandler.cpp rts/System/SpringApp.cpp |
||
| rm - AI/Skirmish/KAIK | [ Diff ] [ File ] | ||
| mod - cont/LuaUI/actions.lua | [ Diff ] [ File ] | ||
| mod - cont/LuaUI/widgets.lua | [ Diff ] [ File ] | ||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/Game.h | [ Diff ] [ File ] | ||
| mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/GameServer.h | [ Diff ] [ File ] | ||
| mod - rts/Game/LoadScreen.h | [ Diff ] [ File ] | ||
| mod - rts/Game/NetCommands.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/SelectedUnits.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/Server/GameParticipant.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/Server/GameParticipant.h | [ Diff ] [ File ] | ||
| mod - rts/Game/UI/GuiHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/UI/GuiHandler.h | [ Diff ] [ File ] | ||
| mod - rts/Game/UI/KeyAutoBinder.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/UI/KeyAutoBinder.h | [ Diff ] [ File ] | ||
| mod - rts/Game/UI/LuaUI.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/UI/LuaUI.h | [ Diff ] [ File ] | ||
| mod - rts/Game/UI/MiniMap.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/UI/MouseHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaCallInCheck.h | [ Diff ] [ File ] | ||
| add - rts/Lua/LuaEventBatch.h | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaFBOs.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaGaia.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaGaia.h | [ 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/LuaHandleSynced.h | [ Diff ] [ File ] | ||
| add - rts/Lua/LuaHelper.h | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaIO.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaLobby.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaLobby.h | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaOpenGL.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaPathFinder.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaRBOs.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaRBOs.h | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaRules.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaRules.h | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaShaders.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/LuaUnitDefs.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaUnitRendering.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/LuaUtils.h | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaVFS.cpp | [ Diff ] [ File ] | ||
| mod - rts/Lua/LuaWeaponDefs.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/DebugDrawerAI.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/IModelParser.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/IModelParser.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Models/WorldObjectModelRenderer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/ProjectileDrawer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Textures/S3OTextureHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Features/FeatureHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/GroundBlockingObjectMap.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/GroundBlockingObjectMap.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/ModInfo.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/ModInfo.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/Projectile.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/ProjectileHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/CommandAI/Command.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/CommandAI/Command.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/CommandAI/CommandQueue.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/Scripts/LuaUnitScript.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/Unit.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/UnitLoader.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/EventClient.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/EventClient.h | [ Diff ] [ File ] | ||
| mod - rts/System/EventHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/EventHandler.h | [ Diff ] [ File ] | ||
| mod - rts/System/FileSystem/FileHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/GlobalConfig.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/GlobalConfig.h | [ Diff ] [ File ] | ||
| mod - rts/System/LogOutput.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/Main.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/Net/PackPacket.h | [ Diff ] [ File ] | ||
| mod - rts/System/NetProtocol.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/Platform/CrashHandler.h | [ Diff ] [ File ] | ||
| mod - rts/System/Platform/Linux/CrashHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/Platform/Mac/CrashHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/Platform/Synchro.h | [ Diff ] [ File ] | ||
| mod - rts/System/Platform/Threading.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/Platform/Threading.h | [ Diff ] [ File ] | ||
| mod - rts/System/Platform/Win/CrashHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/SpringApp.h | [ Diff ] [ File ] | ||
| mod - rts/System/TimeProfiler.cpp | [ Diff ] [ File ] | ||
| mod - rts/build/vstudio8/rts.vcproj | [ 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/gmlcls.h | [ Diff ] [ File ] | ||
| add - rts/lib/gml/gmlcnf.h | [ Diff ] [ File ] | ||
| mod - rts/lib/gml/gmldef.h | [ Diff ] [ File ] | ||
| mod - rts/lib/gml/gmlfun.h | [ Diff ] [ File ] | ||
| add - rts/lib/gml/gmlmut.h | [ Diff ] [ File ] | ||
| add - rts/lib/gml/gmlque.h | [ Diff ] [ File ] | ||
| mod - rts/lib/gml/gmlsrv.h | [ Diff ] [ File ] | ||
| mod - rts/lib/lua/include/LuaInclude.h | [ Diff ] [ File ] | ||
| mod - rts/lib/lua/src/lstate.cpp | [ Diff ] [ File ] | ||
| mod - rts/lib/lua/src/lstate.h | [ Diff ] [ File ] | ||
|
develop 0186d51b
Timestamp: 2011-06-02 23:53:32 Author: kloot [ Details ] [ Diff ] |
fix typo in 58db4f42 | ||
| mod - rts/Rendering/ShadowHandler.cpp | [ Diff ] [ File ] | ||
|
develop 8ba6d7a8
Timestamp: 2011-06-02 22:26:16 Author: kloot [ Details ] [ Diff ] |
fix? win32 compilation of myGL | ||
| mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | ||
|
develop 58db4f42
Timestamp: 2011-06-02 21:41:18 Author: kloot [ Details ] [ Diff ] |
always cull (non-3DO) model backfaces for the shadow pass | ||
| mod - rts/Rendering/FeatureDrawer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/ShadowHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/ShadowHandler.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/UnitDrawer.h | [ Diff ] [ File ] | ||
|
develop 37d809c0
Timestamp: 2011-06-02 20:01:57 Author: hoijui [ Details ] [ Diff ] |
delete unsynced action executors on shutdown [fix] | ||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
|
develop d3fe82bb
Timestamp: 2011-06-02 19:35:46 Author: hoijui [ Details ] [ Diff ] |
Revert "refactor some of the re-engineered command structure" This reverts commit e489552574c44297e9a84583ccfe80836a9701c6. |
||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/Game.h | [ Diff ] [ File ] | ||
| mod - rts/Game/SyncedActionExecutor.h | [ Diff ] [ File ] | ||
| mod - rts/Game/SyncedGameCommands.cpp | [ Diff ] [ File ] | ||
| add - rts/Game/SyncedGameCommands.h | [ Diff ] [ File ] | ||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | ||
| add - rts/Game/UnsyncedGameCommands.h | [ Diff ] [ File ] | ||
|
develop 5a2f0cf1
Timestamp: 2011-06-02 19:35:29 Author: hoijui [ Details ] [ Diff ] |
Revert "oops, overwrote a commit" This reverts commit 526638727f85c0090eeabc9ecb5f9e22af8747fb. |
||
| mod - rts/Game/SyncedGameCommands.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | ||
|
develop 2a61a7c2
Timestamp: 2011-06-02 16:36:15 Author: kloot [ Details ] [ Diff ] |
fix axis-inversion in the shadow matrix (causing front-faces to be interpreted back-facing and vv.) | ||
| mod - rts/Rendering/ShadowHandler.cpp | [ Diff ] [ File ] | ||
|
develop 291626b6
Timestamp: 2011-06-02 16:27:32 Author: kloot [ Details ] [ Diff ] |
trim down myGL header dependencies | ||
| mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | ||
|
develop 03ec48e0
Timestamp: 2011-06-02 16:27:07 Author: kloot [ Details ] [ Diff ] |
suppress FeatureHandler warnings when issuing /give | ||
| mod - rts/Sim/Units/UnitLoader.cpp | [ Diff ] [ File ] | ||
|
develop 52663872
Timestamp: 2011-06-02 13:36:18 Author: kloot [ Details ] [ Diff ] |
oops, overwrote a commit | ||
| mod - rts/Game/SyncedGameCommands.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | ||
|
develop e4895525
Timestamp: 2011-06-02 13:33:42 Author: kloot [ Details ] [ Diff ] |
refactor some of the re-engineered command structure * remove the UnsyncedGameCommands and SyncedGameCommands class stubs * add their static RegisterDefaultExecutors members to CGame (KISS) * de-register the command executors on shutdown (no memleaks) |
||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/Game.h | [ Diff ] [ File ] | ||
| mod - rts/Game/SyncedActionExecutor.h | [ Diff ] [ File ] | ||
| mod - rts/Game/SyncedGameCommands.cpp | [ Diff ] [ File ] | ||
| rm - rts/Game/SyncedGameCommands.h | [ Diff ] [ File ] | ||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | ||
| rm - rts/Game/UnsyncedGameCommands.h | [ Diff ] [ File ] | ||
|
develop 18659692
Timestamp: 2011-06-02 13:22:32 Author: hoijui [ Details ] [ Diff ] |
shorten code a bit (no logic changes, thanks to Tobi & jk) | ||
| mod - rts/Game/SyncedGameCommands.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | ||
|
develop 00dc0c17
Timestamp: 2011-06-02 12:20:36 Author: hoijui [ Details ] [ Diff ] |
make engine-multithreaded compile again after last commit [fix] | ||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | ||
|
develop 611030a2
Timestamp: 2011-06-02 11:39:21 Author: hoijui [ Details ] [ Diff ] |
move ActionExecutor impls into separate namespaces [fix] | ||
| mod - rts/Game/SyncedGameCommands.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/UnsyncedActionExecutor.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | ||
|
develop fa1c9cdb
Timestamp: 2011-06-02 10:24:52 Author: hoijui [ Details ] [ Diff ] |
cleanup Give & Destroy command executors, gets rid of a FIXME | ||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | ||
|
develop 670d4771
Timestamp: 2011-06-02 10:22:32 Author: hoijui [ Details ] [ Diff ] |
allow arbitrary case chat-commands for example, all these will work: "/give armcom" "/Give armcom" "/GIVE armcom" "/gIvE armcom" |
||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
|
develop 61b54518
Timestamp: 2011-06-02 10:14:29 Author: hoijui [ Details ] [ Diff ] |
use an action object for SyncedActionExecutor's, instead of a list of params | ||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/SyncedActionExecutor.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/SyncedActionExecutor.h | [ Diff ] [ File ] | ||
| mod - rts/Game/SyncedGameCommands.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/UnsyncedActionExecutor.h | [ Diff ] [ File ] | ||
|
develop 887248e0
Timestamp: 2011-06-02 09:44:59 Author: hoijui [ Details ] [ Diff ] |
decouple unsynced game(chat)-commands from CGame | ||
| mod - rts/Game/CMakeLists.txt | [ Diff ] [ File ] | ||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/Game.h | [ Diff ] [ File ] | ||
| mod - rts/Game/GameController.h | [ Diff ] [ File ] | ||
| mod - rts/Game/SyncedActionExecutor.cpp | [ Diff ] [ File ] | ||
| add - rts/Game/UnsyncedActionExecutor.cpp | [ Diff ] [ File ] | ||
| add - rts/Game/UnsyncedActionExecutor.h | [ Diff ] [ File ] | ||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | ||
| add - rts/Game/UnsyncedGameCommands.h | [ Diff ] [ File ] | ||
|
develop 45a63428
Timestamp: 2011-06-02 09:18:39 Author: hoijui [ Details ] [ Diff ] |
solve a FIXME in SyncedGameCommands | ||
| mod - rts/Game/SyncedGameCommands.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/UnitLoader.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/UnitLoader.h | [ Diff ] [ File ] | ||
|
develop 6357932b
Timestamp: 2011-06-02 03:13:41 Author: zerver [ Details ] [ Diff ] |
Again | ||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
|
develop 75132226
Timestamp: 2011-06-02 02:14:56 Author: zerver [ Details ] [ Diff ] |
Rephrase MTinfo messages | ||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
