Commit Graph

22008 Commits

Author SHA1 Message Date
Guido L
fbd362b1a4 Fix EOF and Typo 2016-09-24 13:37:13 +02:00
reaperrr
b7dd321550 Merge pull request #11993 from pchote/missiondata
Report mission briefings in the mp lobby.
2016-09-23 22:50:59 +02:00
reaperrr
d762e54e2a Merge pull request #12070 from abcdefg30/chevrons
Render WithDecoration above shroud
2016-09-23 21:32:50 +02:00
Paul Chote
923cde7d21 Report mission briefings in the mp lobby. 2016-09-23 19:51:07 +01:00
RoosterDragon
1dd7f3e890 Merge pull request #12084 from obrakmann/fix12078_ai-production-snafu
Fix AI still producing units with captured factories in Nod missions
2016-09-23 19:40:39 +01:00
RoosterDragon
1993ee25b8 Merge pull request #12085 from pchote/repair-range-check
Add a range check to Repair.
2016-09-23 18:56:24 +01:00
RoosterDragon
4d6f70f973 Merge pull request #12026 from obrakmann/fix11986-mp-mission-joining
Fix kicking players joining servers hosting a map with non-default rules
2016-09-23 18:45:28 +01:00
RoosterDragon
149a10c6b1 Merge pull request #12079 from pchote/fix-control-groups
Fix sprite control group decoration position.
2016-09-23 18:32:44 +01:00
Paul Chote
df98260e1a Merge pull request #12021 from abcdefg30/radarSpec
Fix spectators not being able to issue commands in TD
2016-09-22 17:51:15 +01:00
abcdefg30
b21cf1fdb2 Render WithDecoration above shroud 2016-09-22 14:33:35 +02:00
Paul Chote
323ed98a15 Add a range check to Repair. 2016-09-21 18:25:23 +01:00
Oliver Brakmann
fca4534525 Fix AI still producing units with captured factories in Nod missions 2016-09-21 18:58:19 +02:00
Oliver Brakmann
90e3912bcd Merge pull request #12076 from pchote/fix-orphaned-pings
Clean up ClientPings when a player drops from the server.
2016-09-21 18:17:26 +02:00
Oliver Brakmann
8e764441dc Merge pull request #12071 from abcdefg30/noBeacons
Fix beacons not being cancelable
2016-09-21 18:12:50 +02:00
Oliver Brakmann
e108305f4e Merge pull request #12074 from RoosterDragon/runtime-long
Change Game.RunTime to a long to prevent overflow
2016-09-21 18:07:52 +02:00
Oliver Brakmann
92ec538208 Merge pull request #12077 from pchote/crashlog-dates
Include dates in crash/sync log filenames.
2016-09-21 17:54:06 +02:00
Oliver Brakmann
b53874fc8e Merge pull request #12075 from pchote/fix-grey-ping-of-death
Read data from *all* connections to the server.
2016-09-21 17:45:59 +02:00
Oliver Brakmann
999ddab5a4 Merge pull request #12080 from pchote/fix-d2k-crown
Fix d2k lobby admin icon.
2016-09-21 17:11:33 +02:00
Paul Chote
94de961175 Converting dates to string using the InvariantCulture. 2016-09-21 14:52:05 +01:00
Paul Chote
fb876b8b83 Fix d2k lobby admin icon. 2016-09-21 14:41:48 +01:00
Paul Chote
5e974b4959 Fix control group decoration position. 2016-09-21 14:39:44 +01:00
Paul Chote
bfa0c008eb Restore missing GameUid. 2016-09-21 05:09:16 +01:00
Paul Chote
b44d1be554 Timestamp syncreport and exception log files. 2016-09-21 04:57:13 +01:00
Paul Chote
c1e1ee0938 Merge pull request #12066 from chrisforbes/preview-server-crash-fix-bleed
server: Fix server getting wedged after map query with bad minimap
2016-09-21 04:05:59 +01:00
Paul Chote
709bd5b441 Clean up ClientPings when a player drops from the server. 2016-09-20 21:13:07 +01:00
Paul Chote
093053fd93 Read data from *all* connections to the server. 2016-09-20 20:55:52 +01:00
RoosterDragon
2ffea5db54 Change Game.RunTime to a long to prevent overflow. 2016-09-20 19:06:10 +01:00
Oliver Brakmann
57ceda3025 Merge pull request #11926 from abc013/JamsRadarStances
Added diplomatic stances to JamsRadar
2016-09-20 19:24:57 +02:00
Oliver Brakmann
e6b0557420 Merge pull request #12067 from reaperrr/add-UP
Add UnknownProgrammer to AUTHORS
2016-09-20 19:24:03 +02:00
Oliver Brakmann
5e96be5743 Merge pull request #12007 from RoosterDragon/mix-file-all
Allow MixFile to support all stream types
2016-09-20 19:18:35 +02:00
abcdefg30
9142452922 Fix beacons not being cancelable 2016-09-20 18:11:25 +02:00
reaperrr
7f5dadd420 Add UnknownProgrammer to AUTHORS 2016-09-20 15:24:40 +02:00
abc013
b9d1f373fe Added a flag ShowShadow in WithVoxelBarrel, WithVoxelBody, WithVoxelTurret, WithVoxelUnloadBody and WithVoxelWalkerBody 2016-09-20 13:34:05 +02:00
abc013
353e61378a Added diplomatic stances to JamsRadar 2016-09-20 13:08:42 +02:00
Paul Chote
095b093f39 Merge pull request #12046 from obrakmann/fix11996_spy-exodus-crash
Fix crashing when a spy's "real" owner gets changed
2016-09-20 09:15:20 +01:00
Chris Forbes
5b793e0455 server: Fix server getting wedged after map query with bad minimap
If the mapserver returned an unusable minimap blob, we'd end up dropping
the resulting exceptions on the floor, and committing a completely broken
MapPreview, which would then blow up the tail end of the map change
process, and all future ValidateClient calls after players join (which
itself was handled by kicking the player and logging some noise of dubious
value).

Adjusts exception handling in a number of places to log the exception
rather than dropping it on the floor, and makes the mapserver response
parsing tolerant of bogus minimap blobs -- in this case, we'd rather just
have no minimap.

Candidate for stable, as it fixes a bug present in the current release and
the current playtest series.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
2016-09-20 19:28:31 +12:00
RoosterDragon
e65c73785e Allow MixFile to support all stream types again, not just FileStream. 2016-09-20 07:41:31 +01:00
Oliver Brakmann
8fabd6cff1 Merge pull request #11932 from Mailaender/sharpfont-4.0.1
Updated SharpFont to version 4.0.1
2016-09-19 22:19:24 +02:00
Oliver Brakmann
4e76d9cc0b Merge pull request #11909 from pchote/colormap-depth
Use the MATLAB Jet colormap for displaying depth data.
2016-09-19 21:25:08 +02:00
Oliver Brakmann
55e35d7be9 Merge pull request #12056 from Mailaender/keep-syncreport.log-fix
Fixed a crash when no sync report is available
2016-09-19 20:01:52 +02:00
Matthias Mailänder
56fa1ab0e3 Fix a crash when no sync report is available. 2016-09-18 17:43:22 +02:00
reaperrr
af125d64df Merge pull request #12014 from RoosterDragon/better-oom-logs
Improve out-of-memory logging
2016-09-18 16:38:24 +02:00
reaperrr
b10cf35972 Merge pull request #12051 from obrakmann/fix12035-selling-airfield-during-rearm-lockage
Fix locking an airfield that is rearming aircraft while being sold
2016-09-18 16:15:46 +02:00
Oliver Brakmann
b1f36b0122 Merge pull request #12041 from abcdefg30/musicReset
Fix the music resetting from time to time
2016-09-18 15:57:17 +02:00
reaperrr
e53180fdbc Merge pull request #12036 from obrakmann/fix12031-close-chat-in-replays
Fix not being able to close the chat window in replays
2016-09-18 15:28:28 +02:00
reaperrr
32e54cd30c Merge pull request #12038 from pchote/fix-readfailure-crash
Don't crash if a replay can't be read.
2016-09-18 15:22:38 +02:00
abcdefg30
05899b5b0e Split a UnitCommandWidget from WorldCommandWidget 2016-09-18 14:55:59 +02:00
abcdefg30
e511faa2ea Fix spectators not being able to issue commands in TD 2016-09-18 14:55:58 +02:00
Oliver Brakmann
a4a726c19a Remove workarounds for ownership change breakage from 'Infiltration' 2016-09-18 14:27:18 +02:00
Oliver Brakmann
d099aa0d46 Fix crashing when a spy's "real" owner gets changed 2016-09-18 14:27:18 +02:00