Changesets: spring
|
develop ac07443d
Timestamp: 2013-02-21 04:06:51 Author: rt [ Details ] [ Diff ] |
Merge branch 'release' into develop | ||
| mod - rts/Sim/Features/FeatureHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Features/FeatureHandler.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/UnitHandler.h | [ Diff ] [ File ] | ||
|
develop 0f187f0f
Timestamp: 2013-02-21 04:06:00 Author: rt [ Details ] [ Diff ] |
fix object IDs not being assigned randomly anymore | ||
| mod - rts/Sim/Features/FeatureHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Features/FeatureHandler.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/UnitHandler.h | [ Diff ] [ File ] | ||
|
develop 5222894f
Timestamp: 2013-02-21 04:05:08 Author: rt [ Details ] [ Diff ] |
fix SEGV-case in a4fa7119d2 | ||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | ||
|
develop 81ff9324
Timestamp: 2013-02-21 00:08:19 Author: zerver [ Details ] [ Diff ] |
Fix GeometricObjects concurrent access | ||
| mod - rts/Game/TraceRay.cpp | [ Diff ] [ File ] | ||
|
develop 757e9c29
Timestamp: 2013-02-19 19:09:40 Author: rt [ Details ] [ Diff ] |
merge release | ||
| mod - rts/Sim/Misc/CollisionVolume.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/CollisionVolume.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/LosHandler.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/RadarHandler.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/CommandAI/CommandAI.cpp | [ Diff ] [ File ] | ||
| mod - rts/lib/gml/gml_base.cpp | [ Diff ] [ File ] | ||
|
develop 62c2fe38
Timestamp: 2013-02-19 18:59:00 Author: rt [ Details ] [ Diff ] |
- | ||
| mod - rts/Sim/Units/CommandAI/CommandAI.cpp | [ Diff ] [ File ] | ||
|
develop ee13fb16
Timestamp: 2013-02-19 18:57:18 Author: rt [ Details ] [ Diff ] |
fix 0003481 | ||
| mod - rts/Sim/Misc/LosHandler.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/RadarHandler.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/CommandAI/CommandAI.cpp | [ Diff ] [ File ] | ||
|
develop 3a1dfbca
Timestamp: 2013-02-19 18:45:30 Author: zerver [ Details ] [ Diff ] |
Fix mantis 0003478 (Flying transport reservation not flushed properly with area commands ) | ||
| mod - rts/Sim/Units/CommandAI/TransportCAI.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Units/CommandAI/TransportCAI.h | [ Diff ] [ File ] | ||
|
develop f22b24a2
Timestamp: 2013-02-19 16:49:50 Author: abma [ Details ] [ Diff ] |
update pr-downloader | ||
| mod - tools/pr-downloader | [ Diff ] [ File ] | ||
|
develop 61a310d2
Timestamp: 2013-02-19 16:37:09 Author: abma [ Details ] [ Diff ] |
fix x64 linking | ||
| mod - tools/pr-downloader | [ Diff ] [ File ] | ||
|
develop c96d6b03
Timestamp: 2013-02-19 01:28:36 Author: abma [ Details ] [ Diff ] |
update pr-downloader: try to fix (force it to be a console app) | ||
| mod - tools/pr-downloader | [ Diff ] [ File ] | ||
|
develop 9bbabd2c
Timestamp: 2013-02-19 00:15:09 Author: abma [ Details ] [ Diff ] |
buildbot: create single debug file for linux, too | ||
| mod - buildbot/slave/linux/create_linux_static_bundle.sh | [ Diff ] [ File ] | ||
|
develop ff4aad1e
Timestamp: 2013-02-18 23:34:32 Author: rt [ Details ] [ Diff ] |
block Lua from creating non-uniformly scaled COLVOL_TYPE_SPHERE volumes | ||
| mod - rts/Sim/Misc/CollisionVolume.cpp | [ Diff ] [ File ] | ||
| mod - rts/Sim/Misc/CollisionVolume.h | [ Diff ] [ File ] | ||
|
develop 042972fb
Timestamp: 2013-02-18 03:47:32 Author: rt [ Details ] [ Diff ] |
fix: objects with cylindrical CVs would not take damage if hit in rear endcap | ||
| mod - rts/Sim/Objects/WorldObject.h | [ Diff ] [ File ] | ||
| mod - rts/Sim/Projectiles/ProjectileHandler.cpp | [ Diff ] [ File ] | ||
|
develop f3e15bed
Timestamp: 2013-02-17 22:27:04 Author: rt [ Details ] [ Diff ] |
merge-conflict fix | ||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/Platform/Threading.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/Platform/Threading.h | [ Diff ] [ File ] | ||
|
develop 448d9be7
Timestamp: 2013-02-17 22:02:39 Author: zerver Committer: rt [ Details ] [ Diff ] |
apply 991bce43 and c2155788 | ||
| mod - rts/System/Platform/Threading.cpp | [ Diff ] [ File ] | ||
| mod - rts/System/Platform/Threading.h | [ Diff ] [ File ] | ||
| mod - rts/System/SpringApp.cpp | [ Diff ] [ File ] | ||
| mod - rts/lib/gml/gml_base.cpp | [ Diff ] [ File ] | ||
| mod - rts/lib/gml/gml_base.h | [ Diff ] [ File ] | ||
|
develop ef6d01d3
Timestamp: 2013-02-17 21:09:01 Author: rt [ Details ] [ Diff ] |
make dead/crashing/stunned units unshareable (may fix 0003476) | ||
| mod - rts/Game/NetCommands.cpp | [ Diff ] [ File ] | ||
|
develop 85a0761e
Timestamp: 2013-02-17 16:30:14 Author: rt [ Details ] [ Diff ] |
- | ||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | ||
|
develop a4fa7119
Timestamp: 2013-02-17 16:20:00 Author: rt [ Details ] [ Diff ] |
fix viewtopic.php?f=12&t=29729 | ||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | ||
|
develop a31d9e56
Timestamp: 2013-02-17 00:54:32 Author: zerver Committer: rt [ Details ] [ Diff ] |
Fix whole UI gone after 6a9283a | ||
| mod - rts/Rendering/Env/GrassDrawer.cpp | [ Diff ] [ File ] | ||
|
develop 64c1a3ea
Timestamp: 2013-02-16 23:11:59 Author: Andrea Piras Committer: jK [ Details ] [ Diff ] |
fix chat[|ally|spec|all] so it doesn't misbehave when called from lua or console ending up dropping chars | ||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | ||
|
develop 04e3ba21
Timestamp: 2013-02-16 20:56:15 Author: Andrea Piras Committer: jK [ Details ] [ Diff ] |
/ally should work for players, not spectators | ||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | ||
|
develop 2b04c46a
Timestamp: 2013-02-16 15:09:36 Author: Andrea Piras [ Details ] [ Diff ] |
make sure pastetext and buffertext don't strip whitespaces from the attacched message | ||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | ||
|
develop 75dbf383
Timestamp: 2013-02-16 15:01:09 Author: Andrea Piras [ Details ] [ Diff ] |
allow whisper between spec <-> spec, player -> spec and spec -> player whispers are still forbidden fixed displaying of your own whispers, before it was visualized the source ( yourself ) instead of destination |
||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | ||
|
develop 4294272c
Timestamp: 2013-02-14 11:59:48 Author: jK [ Details ] [ Diff ] |
fix 0003467 (assimp textures) | ||
| mod - rts/Rendering/Textures/S3OTextureHandler.cpp | [ Diff ] [ File ] | ||