Commit Graph

14243 Commits

Author SHA1 Message Date
reaperrr
4e169a0441 TS elite weapons 2014-09-27 14:41:46 +02:00
reaperrr
5d1d6d6d08 Merge pull request #6576 from pchote/armaments
Allow armaments to be enabled/disabled by upgrades.
2014-09-27 14:08:07 +02:00
Matthias Mailänder
71a872c53c Merge pull request #6553 from Phrohdoh/TSGridFixes
More TS art offset fixes.
2014-09-27 13:36:59 +02:00
reaperrr
477d7894a0 Merge pull request #6569 from jacobdufault/add-author
Update AUTHORS
2014-09-27 13:32:27 +02:00
obrakmann
be44b20797 Merge pull request #6577 from pchote/fix-validation
Don’t die when connecting to a full server.
2014-09-27 13:23:45 +02:00
reaperrr
ffeff5c7b6 Merge pull request #6575 from pchote/selfhealing
Add elite self-healing bonus
2014-09-27 13:19:24 +02:00
Paul Chote
3a64fd717f Merge pull request #6488 from jonathanmiles/support-power-targetability
AI no longer calls support power on things it can't target
2014-09-27 23:13:14 +12:00
Paul Chote
2bbdd0ae06 Add self-healing for elite units. 2014-09-27 22:14:45 +12:00
Paul Chote
372d03c320 Convert SelfHealing to upgrades. 2014-09-27 22:14:45 +12:00
Paul Chote
56332251f5 Don’t double-remove dead actors from the world. 2014-09-27 22:14:16 +12:00
Paul Chote
7042004af3 Don’t die when connecting to a full server. 2014-09-27 22:07:04 +12:00
Matthias Mailänder
82d3833d18 Merge pull request #6557 from abcdefg30/progbarcolors
Unhardcoded productionbar colors
2014-09-27 10:09:10 +02:00
Matthias Mailänder
d21c28310e Merge pull request #6568 from jacobdufault/remove-dead-settings
Remove an unused setting
2014-09-27 10:02:31 +02:00
Matthias Mailänder
15e5db855a Merge pull request #6573 from obrakmann/fix6572
Do not validate the color of players which have the LockColor flag set
2014-09-27 08:15:11 +02:00
Paul Chote
67e3c74d31 Allow armaments to be enabled/disabled by upgrades. 2014-09-27 14:59:15 +12:00
Oliver Brakmann
00dc6f1633 Do not validate the color of players which have the LockColor flag set
Fixes #6572
2014-09-27 01:43:02 +02:00
Jacob Dufault
ad98a831da Remove an unused setting 2014-09-26 17:38:36 -04:00
Jacob Dufault
7fe7284d99 Update AUTHORS 2014-09-26 17:37:42 -04:00
abcdefg30
22dc63620f Unhardcoded productionbar colors 2014-09-26 14:55:42 +02:00
Paul Chote
8d54efc7af Merge pull request #6555 from obrakmann/fix6547_global_chat
Add a chat cache
2014-09-26 23:18:49 +12:00
obrakmann
7bb89ba664 Merge pull request #6543 from s1ww/upgraded_gui
Upgrading player gui redux
2014-09-26 09:49:22 +02:00
Oliver Brakmann
36b5097fa0 Cache chat conversations in the lobby and in-game
This preserves the chat content from the lobby and makes it available
in-game, and also makes all chat content available to the end-game
dialog.
2014-09-26 07:18:33 +02:00
s1ww
b4705add88 Upgrading player gui 2014-09-26 07:02:15 +02:00
Oliver Brakmann
ef35ee2204 Load end-game dialog only after game ends, not already when it starts
This is to ensure that statistics reflect the state at the end of the
game, not that from the start of the game.

Fixes #6547.
2014-09-25 21:02:39 +02:00
Scott
47565c33be Merge pull request #6512 from pchote/more-color-validation
Include map-players in the color validation checks.
2014-09-25 17:09:09 +12:00
Matthias Mailänder
0428814fe5 Merge pull request #6477 from s1ww/bleed
Updating outdated maps
2014-09-25 06:53:35 +02:00
s1ww
8cba84d47d Reworked railmines for each tileset 2014-09-25 04:38:09 +02:00
Matthias Mailänder
a25248f4bd Merge pull request #6551 from LipkeGu/samsitefix
Adjusting the Offset for the Turret of "Nod SAM Site"
2014-09-24 21:30:02 +02:00
Matthias Mailänder
3d80f47d96 Merge pull request #6550 from pchote/more-bounds-fixes
More map-bounds fixes
2014-09-24 21:23:50 +02:00
Taryn Hill
2988c500c0 More TS art fixes. 2014-09-24 14:20:14 -05:00
LipkeGu
ee079fa01c Adjusting the Z-Offset for the turret of "Nod SAM Site" 2014-09-24 17:11:40 +02:00
Paul Chote
ee77db1831 Add some additional robustness against bogus cell queries in ActorMap. 2014-09-24 22:36:59 +12:00
Paul Chote
3c2383ebc6 Don’t crash if a warhead smudge extends outside the map. Fixes #6548. 2014-09-24 22:34:02 +12:00
Paul Chote
17702dc057 Merge pull request #6334 from Mailaender/parachute-out-of-map
Fixed a crash when parachutes were spawned outside of the map
2014-09-24 22:26:08 +12:00
Paul Chote
8a4e42995a Include map-players in the color validator. 2014-09-24 22:11:37 +12:00
Matthias Mailänder
d1b28ad93b Merge pull request #6549 from LipkeGu/bansheevoice
Assign the correct voice to the "Nod Banshee Fighter"
2014-09-24 06:42:02 +02:00
LipkeGu
8ac97f6297 Assign the correct voice to the "Nod Banshee Fighter" 2014-09-24 03:48:43 +02:00
Chris Forbes
71e79b172c Merge pull request #6542 from jacobdufault/minor-code-cleanup
Simplify GetCtor logic
2014-09-24 09:37:59 +12:00
Matthias Mailänder
c607aabc0b Merge pull request #6539 from LipkeGu/patch-2
Update cursors.yaml
2014-09-23 21:30:55 +02:00
Jacob Dufault
65763a643f Simplify GetCtor logic 2014-09-22 13:41:07 -04:00
LipkeGu
74dc01908e Update cursors.yaml
insert the "missing" space
2014-09-22 16:20:58 +02:00
Matthias Mailänder
b818fb5fe6 Merge pull request #6536 from steelphase-forks/common-modbrowser
Mod Chooser move.
2014-09-21 20:59:23 +02:00
steelphase
7199b6fd96 Mod Chooser move.
Moved code for mod chooser to mod.common.
2014-09-21 14:27:20 -04:00
Matthias Mailänder
57f42aeeef Merge pull request #6535 from huwpascoe/bleed
Added self to AUTHORS
2014-09-21 20:18:33 +02:00
huwpascoe
2ba38f7c56 Added self to AUTHORS 2014-09-21 17:13:38 +01:00
Matthias Mailänder
b30fcc2110 Merge pull request #6521 from steelphase-forks/common-graphics
Add Mod.Common Graphics
2014-09-21 12:05:28 +02:00
Matthias Mailänder
44d134afe0 don't update the actor map outside the map borders 2014-09-21 10:52:44 +02:00
Matthias Mailänder
3f66d310db never spawn parachutes outside the map
fixes #6302
2014-09-21 10:47:33 +02:00
Matthias Mailänder
f0e6eee7e1 Merge pull request #6526 from MatthijsBenschop/debug-crash-fix
Prevent player name from becoming part of a formatting string.
2014-09-21 10:21:11 +02:00
Matthias Mailänder
dc1710d7aa Merge pull request #6522 from obrakmann/fix6517_lobby_music_crash
Check world for null in MusicPlayerLogic to prevent crashing the lobby
2014-09-21 10:17:40 +02:00