Changesets: spring
develop 6d752622
Timestamp: 2010-09-17 22:56:08 Author: hoijui [ Details ] [ Diff ] |
Merge remote branch 'origin/master' into pureint Conflicts: AI/Skirmish/E323AI |
||
mod - CMakeLists.txt | [ Diff ] [ File ] | ||
mod - cont/CMakeLists.txt | [ Diff ] [ File ] | ||
mod - installer/make_installer.pl | [ Diff ] [ File ] | ||
mod - installer/make_source_package.sh | [ Diff ] [ File ] | ||
mod - installer/sections/main.nsh | [ Diff ] [ File ] | ||
mod - installer/sections/sectiondesc.nsh | [ Diff ] [ File ] | ||
rm - installer/sections/selectionEditor.nsh | [ Diff ] [ File ] | ||
mod - installer/sections/shortcuts_startMenu.nsh | [ Diff ] [ File ] | ||
mod - installer/spring.nsi | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/AICallback.h | [ Diff ] [ File ] | ||
mod - rts/Game/GameHelper.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/GameHelper.h | [ Diff ] [ File ] | ||
mod - rts/Game/LoadScreen.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UI/EndGameBox.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaPathFinder.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaPathFinder.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaUnsyncedRead.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/BaseGroundDrawer.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/BaseGroundDrawer.h | [ Diff ] [ File ] | ||
mod - rts/Rendering/DefaultPathDrawer.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/VertexArray.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/VertexArray.h | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/VertexArray.inl | [ Diff ] [ File ] | ||
mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | ||
add - rts/Sim/Path/Default/PathAllocator.cpp | [ Diff ] [ File ] | ||
add - rts/Sim/Path/Default/PathAllocator.h | [ Diff ] [ File ] | ||
add - rts/Sim/Path/Default/PathConstants.h | [ Diff ] [ File ] | ||
add - rts/Sim/Path/Default/PathDataTypes.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathEstimator.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathEstimator.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathFinder.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathFinder.h | [ Diff ] [ File ] | ||
add - rts/Sim/Path/Default/PathFinderDef.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathFinderDef.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathManager.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathManager.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/IPathManager.h | [ Diff ] [ File ] | ||
add - rts/Sim/Units/BuildInfo.cpp | [ Diff ] [ File ] | ||
add - rts/Sim/Units/BuildInfo.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/COB/UnitScript.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/AirCAI.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/BuilderCAI.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/CommandAI.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/FactoryCAI.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/MobileCAI.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/TransportCAI.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/TransportCAI.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitDef.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitDef.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/Builder.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/Builder.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/Building.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/ExtractorBuilding.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/Factory.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/Factory.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/TransportUnit.h | [ Diff ] [ File ] | ||
mod - rts/System/Main.cpp | [ Diff ] [ File ] | ||
mod - rts/System/Platform/Threading.cpp | [ Diff ] [ File ] | ||
mod - rts/System/Platform/Win/CrashHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | ||
mod - rts/builds/CMakeLists.txt | [ Diff ] [ File ] | ||
mod - rts/builds/DS/CMakeLists.txt | [ Diff ] [ File ] | ||
mod - rts/builds/GML/CMakeLists.txt | [ Diff ] [ File ] | ||
mod - rts/builds/HL/CMakeLists.txt | [ Diff ] [ File ] | ||
mod - rts/builds/default/CMakeLists.txt | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/DataStore.cpp | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/DataStore.h | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/FilterDlg.cpp | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/FilterDlg.h | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/HotKeyDlg.cpp | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/HotKeyDlg.h | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/ReadMe.txt | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/SelectionEditor.aps | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/SelectionEditor.cpp | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/SelectionEditor.h | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/SelectionEditor.rc | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/SelectionEditor.sln | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/SelectionEditor.suo | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/SelectionEditor.vcproj | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/SelectionEditorDlg.cpp | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/SelectionEditorDlg.h | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/SourceDlg.cpp | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/SourceDlg.h | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/res/SelectionEditor.ico | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/res/SelectionEditor.manifest | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/res/SelectionEditor.rc2 | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/resource.h | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/stdafx.cpp | [ Diff ] [ File ] | ||
rm - tools/SelectionEditor/stdafx.h | [ Diff ] [ File ] | ||
add - tools/scripts/log-colorizer.py | [ Diff ] [ File ] | ||
mod - tools/unitsync/unitsync.cpp | [ Diff ] [ File ] | ||
mod - tools/unitsync/unitsync_api.h | [ Diff ] [ File ] | ||
develop 682a4c2d
Timestamp: 2010-09-17 22:49:05 Author: hoijui [ Details ] [ Diff ] |
typo [fix] [minor] | ||
mod - rts/Sim/Units/CommandAI/TransportCAI.h | [ Diff ] [ File ] | ||
develop c939ee71
Timestamp: 2010-09-17 22:25:27 Author: hoijui [ Details ] [ Diff ] |
cleanup * formatting * includes removed or replaced with forward declaration * doxygen-ification of comments * extracted struct BuildInfo from UnitDef.h|cpp as a side effect, these are not inline anymore: int BuildInfo::GetXSize() int BuildInfo::GetZSize() |
||
add - rts/Sim/Units/BuildInfo.cpp | [ Diff ] [ File ] | ||
add - rts/Sim/Units/BuildInfo.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/AirCAI.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/BuilderCAI.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/CommandAI.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/FactoryCAI.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/MobileCAI.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitDef.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitDef.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/Builder.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/Builder.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/Building.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/ExtractorBuilding.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/Factory.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/TransportUnit.h | [ Diff ] [ File ] | ||
develop 56db5460
Timestamp: 2010-09-17 18:03:36 Author: hoijui [ Details ] [ Diff ] |
cleanup (no logic changed) | ||
mod - rts/Sim/Units/CommandAI/TransportCAI.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/TransportCAI.h | [ Diff ] [ File ] | ||
develop f337eba2
Timestamp: 2010-09-17 16:28:30 Author: kloot [ Details ] [ Diff ] |
* visualise g, not g+h | ||
mod - rts/Rendering/DefaultPathDrawer.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathDataTypes.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathEstimator.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathFinder.cpp | [ Diff ] [ File ] | ||
develop 2213ea16
Timestamp: 2010-09-17 16:18:54 Author: hoijui [ Details ] [ Diff ] |
work-around for windows 32k limit to arguments passed to a command (credits to spliff) [fix] [bug#2130] | ||
mod - CMakeLists.txt | [ Diff ] [ File ] | ||
develop 97dc0b2f
Timestamp: 2010-09-17 08:12:21 Author: kloot [ Details ] [ Diff ] |
* kill the g_ret global | ||
mod - rts/Rendering/DefaultPathDrawer.cpp | [ Diff ] [ File ] | ||
mod - rts/System/Main.cpp | [ Diff ] [ File ] | ||
develop a5cc6fbf
Timestamp: 2010-09-16 22:22:48 Author: kloot [ Details ] [ Diff ] |
* fix SetMainThread again (self-references are bad mkay) | ||
mod - rts/System/Main.cpp | [ Diff ] [ File ] | ||
mod - rts/System/Platform/Threading.cpp | [ Diff ] [ File ] | ||
develop 781290e1
Timestamp: 2010-09-16 22:16:55 Author: zerver [ Details ] [ Diff ] |
Don't draw healthbars for noDraw units either | ||
mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | ||
develop aac40834
Timestamp: 2010-09-16 21:16:44 Author: zerver [ Details ] [ Diff ] |
Fix SetMainThread + compile error | ||
mod - rts/Rendering/DefaultPathDrawer.cpp | [ Diff ] [ File ] | ||
mod - rts/System/Platform/Threading.cpp | [ Diff ] [ File ] | ||
mod - rts/build/vstudio8/rts.vcproj | [ Diff ] [ File ] | ||
develop cd929e28
Timestamp: 2010-09-16 20:45:38 Author: kloot [ Details ] [ Diff ] |
* make pushResistant (allied) units still move out of the way of constructions | ||
mod - rts/Game/GameHelper.cpp | [ Diff ] [ File ] | ||
mod - rts/Game/GameHelper.h | [ Diff ] [ File ] | ||
mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/COB/UnitScript.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Units/UnitTypes/Factory.cpp | [ Diff ] [ File ] | ||
develop fa4ba340
Timestamp: 2010-09-16 20:30:40 Author: kloot [ Details ] [ Diff ] |
* do not cast shadows for noDraw units | ||
mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | ||
develop 9ca3134a
Timestamp: 2010-09-16 20:23:40 Author: kloot [ Details ] [ Diff ] |
* prevent SEGV when updating skidding units | ||
mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | ||
develop 31c07c83
Timestamp: 2010-09-16 20:01:58 Author: kloot [ Details ] [ Diff ] |
* don't draw icons for noDraw units | ||
mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | ||
develop 8427038f
Timestamp: 2010-09-16 19:53:21 Author: kloot [ Details ] [ Diff ] |
* typo | ||
mod - rts/Map/BaseGroundDrawer.cpp | [ Diff ] [ File ] | ||
develop 99f368f0
Timestamp: 2010-09-16 19:50:21 Author: kloot [ Details ] [ Diff ] |
* add path-cost visualisation to DefaultPathDrawer | ||
mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaUnsyncedRead.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/BaseGroundDrawer.cpp | [ Diff ] [ File ] | ||
mod - rts/Map/BaseGroundDrawer.h | [ Diff ] [ File ] | ||
mod - rts/Rendering/DefaultPathDrawer.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathEstimator.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathEstimator.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathFinder.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathFinder.h | [ Diff ] [ File ] | ||
develop 040f67b3
Timestamp: 2010-09-16 17:15:11 Author: kloot [ Details ] [ Diff ] |
- | ||
mod - rts/Sim/Path/Default/PathDataTypes.h | [ Diff ] [ File ] | ||
develop 8e3e77a9
Timestamp: 2010-09-16 16:56:16 Author: kloot [ Details ] [ Diff ] |
* slight refactor | ||
mod - rts/Sim/Path/Default/PathDataTypes.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathManager.cpp | [ Diff ] [ File ] | ||
develop aac291dd
Timestamp: 2010-09-16 16:45:32 Author: kloot [ Details ] [ Diff ] |
* add array-variants of {Get,Set}NodeExtraCost | ||
mod - rts/Sim/Path/Default/PathDataTypes.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathEstimator.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathEstimator.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathFinder.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathFinder.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathManager.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathManager.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/IPathManager.h | [ Diff ] [ File ] | ||
develop fc4390e2
Timestamp: 2010-09-15 20:45:51 Author: kloot [ Details ] [ Diff ] |
* split extraCost into synced and unsynced parts | ||
mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaPathFinder.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathDataTypes.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathEstimator.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathFinder.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathManager.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathManager.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/IPathManager.h | [ Diff ] [ File ] | ||
develop 974e8ebd
Timestamp: 2010-09-15 19:20:52 Author: kloot [ Details ] [ Diff ] |
* fix | ||
mod - rts/Sim/Path/Default/PathDataTypes.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathEstimator.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathEstimator.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathManager.cpp | [ Diff ] [ File ] | ||
develop 465fb738
Timestamp: 2010-09-15 19:03:56 Author: kloot [ Details ] [ Diff ] |
* PFS: allow unsynced code to influence path-node cost calculations | ||
mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/AICallback.h | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaPathFinder.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaPathFinder.h | [ Diff ] [ File ] | ||
mod - rts/Rendering/DefaultPathDrawer.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathConstants.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathDataTypes.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathEstimator.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathEstimator.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathFinder.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathFinder.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathManager.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathManager.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/IPathManager.h | [ Diff ] [ File ] | ||
develop ce2d920a
Timestamp: 2010-09-15 18:17:28 Author: hoijui [ Details ] [ Diff ] |
Cpp-AIWrapper: wrapp Lua.CallRules() [AI] | ||
mod - AI/Wrappers/Cpp/CMakeLists.txt | [ Diff ] [ File ] | ||
mod - AI/Wrappers/Cpp/bin/wrappCallback.awk | [ Diff ] [ File ] | ||
develop 1a955ae1
Timestamp: 2010-09-15 18:16:04 Author: hoijui [ Details ] [ Diff ] |
remove the outSize param from call to LuaRules() [AI] The returned const char* is always '\0' terminated, as described here: http://pgl.yoyo.org/luai/i/lua_tolstring |
||
mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/AICallback.h | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/Interface/AISCommands.h | [ Diff ] [ File ] | ||
mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaRules.cpp | [ Diff ] [ File ] | ||
mod - rts/Lua/LuaRules.h | [ Diff ] [ File ] | ||
develop a529df81
Timestamp: 2010-09-15 15:02:01 Author: kloot [ Details ] [ Diff ] |
* unify PathFinder::SquareState and PathEstimator::BlockInfo | ||
mod - rts/Rendering/DefaultPathDrawer.cpp | [ Diff ] [ File ] | ||
mod - rts/Rendering/GL/VertexArray.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathDataTypes.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathEstimator.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathEstimator.h | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathFinder.cpp | [ Diff ] [ File ] | ||
mod - rts/Sim/Path/Default/PathFinder.h | [ Diff ] [ File ] | ||