Commit Graph

23942 Commits

Author SHA1 Message Date
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
5463176fa3 Adapt LaserZap Color description and Args structure
To match AreaBeam.
2016-09-20 17:25:28 +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
clemty
6a3a195614 Replaces temperat trees with desert trees 2016-09-18 15:01:37 +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
Oliver Brakmann
88a4f73bdc Add advisory upgrade rule for WithRearmAnimation 2016-09-18 14:20:58 +02:00
reaperrr
1079adcf2b Merge pull request #12027 from pchote/fix-cwd-crash
Fix crash when launching from a different directory than the game binary.
2016-09-18 14:15:45 +02:00
reaperrr
d3de132dbb Merge pull request #11916 from pchote/fix-heightmap-aistrike
Account for terrain height in AttackBomber.
2016-09-18 13:52:40 +02:00
Oliver Brakmann
b598e31d4b Add WithRearmAnimation to buildings that need it 2016-09-18 13:48:17 +02:00
Oliver Brakmann
ab8c1403a8 Fix locking an airfield that is rearming aircraft while being sold 2016-09-18 13:48:17 +02:00
reaperrr
b820f421c0 Merge pull request #11821 from UnknownProgrammer/patch-1
Fix for System Overflow exception
2016-09-18 13:12:59 +02:00
Oliver Brakmann
f1bdcca91d Merge pull request #12050 from pchote/rename-pseudofullscreen
Give window modes human-friendly names.
2016-09-18 12:32:08 +02:00
reaperrr
2de7a4956d Merge pull request #11975 from alercah/metrics-fix
Move most UI metrics to common.
2016-09-18 12:30:26 +02:00
Paul Chote
9063e44f9b Improve error message. 2016-09-18 11:24:32 +01:00
reaperrr
ec7a236dbd Merge pull request #11950 from Mailaender/lowbridge-polish
Fixed building placement on Tiberian Sun low bridges
2016-09-18 12:19:15 +02:00
Paul Chote
4077446d27 Give window modes human-friendly names.
* Fullscreen -> Fullscreen (Legacy)
* Pseudo-fullscreen -> Fullscreen
2016-09-18 11:16:50 +01:00
Matthias Mailänder
72764c2473 Don't show broken bridges on the radar. 2016-09-18 10:07:56 +02:00
Matthias Mailänder
c7667f42b2 Disallow building placement on bridges and fix radar color. 2016-09-18 10:07:51 +02:00
Matthias Mailänder
fd068c3f9f Require the Terrain to be set for RadarColorFromTerrain. 2016-09-18 10:07:51 +02:00
abcdefg30
16776e8a97 Fix the music resetting from time to time 2016-09-17 19:43:09 +02:00
Oliver Brakmann
f5c015f51a Merge pull request #12030 from pchote/fix-tfd-detection
Work around incorrect mono drive detection under OSX.
2016-09-17 18:22:27 +02:00
Oliver Brakmann
aa68e9bfca Fix not being able to close the chat window in replays 2016-09-17 15:05:00 +02:00
reaperrr
6d3ae5fcfe Merge pull request #12029 from pchote/fix-check-yaml
Fix explicit oramap path lint checking.
2016-09-17 14:09:11 +02:00
Paul Chote
099492a52f Don't crash if a replay can't be read. 2016-09-16 18:30:19 +01:00
Paul Chote
7b4ddfcd63 Merge pull request #12037 from obrakmann/fix11971_rename-disable-experience-yaml
Remove 'campaign-' prefix from disable-experience.yaml files
2016-09-16 17:31:51 +01:00
Oliver Brakmann
47a24e7ad4 Remove 'campaign-' prefix from disable-experience.yaml files 2016-09-16 18:27:20 +02:00
RoosterDragon
696d783a67 Improve out-of-memory logging with more details.
Also ensure that when OpenGL gives an out-of-memory error, we throw an OutOfMemoryException so the improved logging is triggered here too.
2016-09-16 07:35:08 +01:00
Oliver Brakmann
852d947764 Fix setting MayYieldReservation when there is no reservation 2016-09-15 21:10:47 +02:00
Paul Chote
af0249f2ae Merge pull request #12015 from RoosterDragon/better-exceptions
Improve some exception types
2016-09-15 19:31:48 +01:00
Paul Chote
aab91cb37e Work around incorrect mono behaviour under OSX. 2016-09-14 21:48:40 +01:00