Changesets: spring
|
develop f827394e
Timestamp: 2013-01-06 19:29:01 Author: abma [ Details ] [ Diff ] |
convert files to unix line ending (NLC) | ||
| mod - cont/base/springcontent/mapgenerator/mapinfo_template.lua | [ Diff ] [ File ] | ||
| mod - include/GL/glew.h | [ Diff ] [ File ] | ||
| mod - installer/include/Registry.nsh | [ Diff ] [ File ] | ||
| mod - rts/Map/Generation/MapGenerator.cpp | [ Diff ] [ File ] | ||
| mod - rts/Map/Generation/MapGenerator.h | [ Diff ] [ File ] | ||
| mod - rts/Map/Generation/SimpleMapGenerator.cpp | [ Diff ] [ File ] | ||
| mod - rts/Map/Generation/SimpleMapGenerator.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/QTPFS/PathCache.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/FileSystem/Archives/VirtualArchive.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/FileSystem/Archives/VirtualArchive.h | [ Diff ] [ File ] | ||
| mod - tools/unitsync_cacher/json/json_spirit.h | [ Diff ] [ File ] | ||
| mod - tools/unitsync_cacher/json/json_spirit_reader.cpp | [ Diff ] [ File ] | ||
| mod - tools/unitsync_cacher/json/json_spirit_reader.h | [ Diff ] [ File ] | ||
| mod - tools/unitsync_cacher/json/json_spirit_value.cpp | [ Diff ] [ File ] | ||
| mod - tools/unitsync_cacher/json/json_spirit_value.h | [ Diff ] [ File ] | ||
| mod - tools/unitsync_cacher/json/json_spirit_writer.cpp | [ Diff ] [ File ] | ||
| mod - tools/unitsync_cacher/json/json_spirit_writer.h | [ Diff ] [ File ] | ||
| mod - tools/unitsync_cacher/test.cpp | [ Diff ] [ File ] | ||
|
develop 16a4ff85
Timestamp: 2013-01-06 19:11:46 Author: rt [ Details ] [ Diff ] |
Merge branch 'develop' of github.com:spring/spring into develop | ||
| mod - cont/base/springcontent/gamedata/weapondefs_post.lua | [ Diff ] [ File ] | ||
|
develop 3b8f5fc7
Timestamp: 2013-01-06 19:11:14 Author: rt [ Details ] [ Diff ] |
replace f8c99edb's dynamic casts by just-as-ugly static casts add TransportCAI::IsBusyLoading and call that instead of LoadStillValid (which returns true when called outside of TransportCAI::ExecuteLoading even if the transport just has a CMD_MOVE + CMD_SET_WANTED_MAX_SPEED in its queue) make TransportCAI 0.01% more readable |
||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/CommandAI/TransportCAI.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/CommandAI/TransportCAI.h | [ Diff ] [ File ] | ||
|
develop 9aef75d1
Timestamp: 2013-01-06 16:29:10 Author: Kaylewt [ Details ] [ Diff ] |
Merge pull request 0000047 from DeadnightWarrior/DnW Fix crash caused by comparing strings with numbers |
||
| mod - cont/base/springcontent/gamedata/weapondefs_post.lua | [ Diff ] [ File ] | ||
|
develop 6167d50d
Timestamp: 2013-01-06 14:36:53 Author: rt [ Details ] [ Diff ] |
fix 0003387 (QTPFS memory corruption) was only happening on 32-bit builds due to alignment differences get rid of QTPFS_WEIGHTED_HEURISTIC_COST since it never worked unrelated minor GMT change: make hovers with non-zero waterline transition into/out of water smoothly |
||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/QTPFS/Node.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/QTPFS/Node.hpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/QTPFS/NodeLayer.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/QTPFS/PathDefines.hpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/QTPFS/PathEnums.hpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/QTPFS/PathSearch.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/QTPFS/PathSearch.hpp | [ Diff ] [ File ] | ||
|
develop 414eca80
Timestamp: 2013-01-06 03:28:04 Author: rt [ Details ] [ Diff ] |
fix some logic errors in GMT::HandleStaticObjectCollision | ||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | ||
|
develop bbead9ad
Timestamp: 2013-01-06 03:01:01 Author: rt [ Details ] [ Diff ] |
fix 0003386 | ||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Path/QTPFS/Node.cpp | [ Diff ] [ File ] | ||
|
develop 2e6bd0f4
Timestamp: 2013-01-06 02:02:33 Author: jK [ Details ] [ Diff ] |
CollisionHandler: block transporter->transportee collisions & move most likely exit condition to top transporter<-transportee was already handled, just added the other way around too |
||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | ||
|
develop cda576b3
Timestamp: 2013-01-06 00:16:54 Author: abma [ Details ] [ Diff ] |
AAI: additional assert / fix param type | ||
| mod - AI/Skirmish/AAI/AAIBuildTable.cpp | [ Diff ] [ File ] | ||
| mod - AI/Skirmish/AAI/AAIBuildTable.h | [ Diff ] [ File ] | ||
|
develop 4bda6570
Timestamp: 2013-01-05 22:34:48 Author: DeadnightWarrior [ Details ] [ Diff ] |
Fix crash caused by comparing strings with numbers | ||
| mod - cont/base/springcontent/gamedata/weapondefs_post.lua | [ Diff ] [ File ] | ||
|
develop bba83f9f
Timestamp: 2013-01-05 22:16:05 Author: abma [ Details ] [ Diff ] |
AAI: add safety checks / asserts | ||
| mod - AI/Skirmish/AAI/AAI.cpp | [ Diff ] [ File ] | ||
| mod - AI/Skirmish/AAI/AAIAirForceManager.cpp | [ Diff ] [ File ] | ||
| mod - AI/Skirmish/AAI/AAIBrain.cpp | [ Diff ] [ File ] | ||
| mod - AI/Skirmish/AAI/AAIBuildTable.cpp | [ Diff ] [ File ] | ||
| mod - AI/Skirmish/AAI/AAIBuildTable.h | [ Diff ] [ File ] | ||
| mod - AI/Skirmish/AAI/AAIConstructor.cpp | [ Diff ] [ File ] | ||
| mod - AI/Skirmish/AAI/AAIExecute.cpp | [ Diff ] [ File ] | ||
| mod - AI/Skirmish/AAI/AAIGroup.cpp | [ Diff ] [ File ] | ||
| mod - AI/Skirmish/AAI/AAIMap.cpp | [ Diff ] [ File ] | ||
| mod - AI/Skirmish/AAI/AAISector.cpp | [ Diff ] [ File ] | ||
| mod - AI/Skirmish/AAI/AAIUnitTable.cpp | [ Diff ] [ File ] | ||
|
develop 087f2166
Timestamp: 2013-01-05 17:58:30 Author: abma [ Details ] [ Diff ] |
fix init order | ||
| mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | ||
|
develop 97b59d78
Timestamp: 2013-01-05 17:00:32 Author: rt [ Details ] [ Diff ] |
Merge branch 'develop' of github.com:spring/spring into develop | ||
| mod - AI/Interfaces/Java/CMakeLists.txt | [ Diff ] [ File ] | ||
|
develop 39b570b9
Timestamp: 2013-01-05 17:00:08 Author: rt [ Details ] [ Diff ] |
test one hypothesis for 3387 (no '#') | ||
| mod - rts/Sim/Path/QTPFS/Node.cpp | [ Diff ] [ File ] | ||
|
develop c74991e9
Timestamp: 2013-01-05 15:04:07 Author: abma [ Details ] [ Diff ] |
oops, remove debug target | ||
| mod - AI/Interfaces/Java/CMakeLists.txt | [ Diff ] [ File ] | ||
|
develop 0529ae3d
Timestamp: 2013-01-05 15:03:48 Author: abma [ Details ] [ Diff ] |
disable Enumerations.java until awk script is fixed for mawk | ||
| mod - AI/Interfaces/Java/CMakeLists.txt | [ Diff ] [ File ] | ||
|
develop 974e5b42
Timestamp: 2013-01-05 14:12:21 Author: Patrick Wouterse Committer: abma [ Details ] [ Diff ] |
add mapgen | ||
| add - cont/base/springcontent/mapgenerator/mapinfo_template.lua | [ Diff ] [ File ] | ||
| mod - rts/Game/GameSetup.cpp | [ Diff ] [ File ] | ||
| mod - rts/Game/GameSetup.h | [ Diff ] [ File ] | ||
| mod - rts/Game/PreGame.cpp | [ Diff ] [ File ] | ||
| mod - rts/Map/CMakeLists.txt | [ Diff ] [ File ] | ||
| add - rts/Map/Generation/MapGenerator.cpp | [ Diff ] [ File ] | ||
| add - rts/Map/Generation/MapGenerator.h | [ Diff ] [ File ] | ||
| add - rts/Map/Generation/SimpleMapGenerator.cpp | [ Diff ] [ File ] | ||
| add - rts/Map/Generation/SimpleMapGenerator.h | [ Diff ] [ File ] | ||
| mod - rts/Rendering/Env/IGroundDecalDrawer.h | [ Diff ] [ File ] | ||
| mod - rts/System/FileSystem/ArchiveLoader.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/FileSystem/ArchiveScanner.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/FileSystem/ArchiveScanner.h | [ Diff ] [ File ] | ||
| mod - rts/System/FileSystem/Archives/CMakeLists.txt | [ Diff ] [ File ] | ||
| add - rts/System/FileSystem/Archives/VirtualArchive.cpp | [ Diff ] [ File ] | ||
| add - rts/System/FileSystem/Archives/VirtualArchive.h | [ Diff ] [ File ] | ||
|
develop 8032e0db
Timestamp: 2013-01-05 13:59:06 Author: rt [ Details ] [ Diff ] |
fix 0003388 | ||
| mod - rts/Game/GameHelper.cpp | [ Diff ] [ File ] | ||
|
develop b8b5cf2f
Timestamp: 2013-01-05 13:52:59 Author: abma [ Details ] [ Diff ] |
try to fix compile of Java-AIInterface | ||
| mod - AI/Interfaces/Java/CMakeLists.txt | [ Diff ] [ File ] | ||
|
develop 6dc1e0b0
Timestamp: 2013-01-05 13:27:13 Author: abma [ Details ] [ Diff ] |
fix merge of pull request #31 | ||
| mod - AI/Interfaces/Java/CMakeLists.txt | [ Diff ] [ File ] | ||
|
develop 16fb826f
Timestamp: 2013-01-05 11:43:40 Author: abma [ Details ] [ Diff ] |
add missing glGetCompressedTexImage stub | ||
| mod - rts/lib/headlessStubs/glstub.c | [ Diff ] [ File ] | ||
|
develop a487d0e0
Timestamp: 2013-01-05 10:45:40 Author: abma [ Details ] [ Diff ] |
fix header | ||
| mod - rts/System/ScopedFPUSettings.h | [ Diff ] [ File ] | ||
|
develop d7901c28
Timestamp: 2013-01-05 10:41:52 Author: abma [ Details ] [ Diff ] |
made headercheck target optional & remove option HEADER_CHECK | ||
| mod - test/headercheck/CMakeLists.txt | [ Diff ] [ File ] | ||
|
develop 5f6f98af
Timestamp: 2013-01-04 17:03:25 Author: jK [ Details ] [ Diff ] |
increase GUI command radius resolution when OMP is used & disable depthtest | ||
| mod - rts/Game/UI/GuiHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Rendering/GL/glExtra.cpp | [ Diff ] [ File ] | ||
|
develop f8c99edb
Timestamp: 2013-01-04 16:52:26 Author: jK [ Details ] [ Diff ] |
disable collision checking between transporter & transportee | ||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | ||