Commit Graph

14223 Commits

Author SHA1 Message Date
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
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
Matthijs Benschop
534f6c5a33 Prevent player name from becoming part of a formatting string.
fixes #6524
2014-09-21 10:01:40 +02:00
Oliver Brakmann
52d74886bd Check world for null in MusicPlayerLogic to prevent crashing the lobby
Fixes #6517
2014-09-21 08:17:55 +02:00
steelphase
f948bf0d1b Add Mod.Common Graphics
Moved Graphics to Mod.Common
2014-09-21 01:34:35 -04:00
Matthias Mailänder
ded39d1933 Merge pull request #6519 from abcdefg30/trainingcamp
Repaired Trainingcamp map
2014-09-21 07:13:58 +02:00
Matthias Mailänder
f75f036de3 Merge pull request #6493 from pchote/utility-commands
Move utility commands into the mod assemblies.
2014-09-21 07:10:45 +02:00
Taryn Hill
4be8525852 Merge pull request #6527 from pchote/revert-6518
Revert "Polishing/normalizing new GUI"
2014-09-20 20:27:10 -05:00
Paul Chote
01c5af4046 Revert "Polishing/normalizing new GUI"
This reverts commit 5020c7a73e.
2014-09-21 12:59:04 +12:00
Paul Chote
a3acf2aaca Merge pull request #6516 from LipkeGu/patch-1
Make the TS Construction Yard selectable
2014-09-21 12:08:06 +12:00
Alexander Fast
08890b0994 Added IUtilityCommand and move default commands into Mods.Common. 2014-09-21 10:15:50 +12:00
Matthias Mailänder
ea11906938 Merge pull request #6518 from s1ww/player_gui
Polishing/normalizing new GUI
2014-09-20 20:12:14 +02:00
abcdefg30
698d57ed82 Made dog buildable at fort lonestar 2014-09-20 17:40:10 +02:00
abcdefg30
02adaea35d Fixed training camp map
Removed unused traits,
fixed prerequisites
and fixed two typos.
2014-09-20 17:40:09 +02:00
s1ww
5020c7a73e Polishing/normalizing new GUI 2014-09-20 17:18:42 +02:00
LipkeGu
dce744c51d Make the TS Construction Yard selectable
Increasing the size of the selection box to make the Construction Yard selectable.
2014-09-20 16:31:28 +02:00
Matthias Mailänder
bb21f8b5fa Merge pull request #6473 from obrakmann/fix6422
Add chat tab to end-game dialog
2014-09-20 14:45:47 +02:00
Paul Chote
ff7b3541f4 Remove obsolete —upgrade-map-v5 and --setings-value commands. 2014-09-21 00:25:53 +12:00
Matthias Mailänder
9ebb9209ad Merge pull request #6494 from obrakmann/objectives-fine-tuning
Objectives fine-tuning
2014-09-20 14:22:36 +02:00
Matthias Mailänder
9601f8b833 Merge pull request #6511 from steelphase-forks/bleed
Creation of Mods.Common.
2014-09-20 14:05:58 +02:00
obrakmann
6e349d3052 Merge pull request #6510 from pchote/fix-inaccuracy-crash
Move inaccuracy modifier queries outside the projectile ctors.
2014-09-20 12:24:57 +02:00