Commit Graph

21511 Commits

Author SHA1 Message Date
RoosterDragon
9ee6db9287 Allow VS2015 to format solution file. 2016-07-31 15:06:06 +01:00
Oliver Brakmann
75de73a17e Merge pull request #11744 from RoosterDragon/openal-cleanup
Close OpenAL sound device correctly
2016-07-31 15:32:04 +02:00
Matthias Mailänder
a73163c476 Merge pull request #11545 from pchote/aftermath-assets
Overhaul RA installed content.
2016-07-30 18:20:57 +02:00
RoosterDragon
1c8f9d44df Clean up ALC sound device correctly.
ALC is thread-safe, therefore we can clean up from any thread and do not need to marshal to the main game thread. To clean up the device properly, we must first unset and destroy the context before attempting to close the device.
2016-07-30 14:53:33 +01:00
RoosterDragon
206088efb4 General code cleanup in OpenAlSoundEngine.cs. 2016-07-30 14:50:42 +01:00
Oliver Brakmann
77d0a8c54e Merge pull request #11638 from reaperrr/deprecate-IsWater-p1
Deprecate terrain IsWater check - Part 1
2016-07-30 14:25:17 +02:00
reaperrr
abaa0f4da5 Allow to customize which terrain types are considered water by HackyAI
For naval structure placement.
2016-07-30 13:19:32 +02:00
reaperrr
1e43554559 Allow to customize which terrain types are considered water by Parachutable 2016-07-30 13:19:32 +02:00
reaperrr
3e217c2192 Allow to customize which terrain types are considered water by WithCrateBody 2016-07-30 13:19:32 +02:00
Oliver Brakmann
6205eccff9 Merge pull request #11587 from pchote/d2k-106
Overhaul D2K installed content.
2016-07-30 12:29:04 +02:00
Paul Chote
492e308e2e Update asset downloads. 2016-07-30 09:59:24 +01:00
Paul Chote
3c0470cc93 Load beacon posters from lores.mix. 2016-07-30 09:59:24 +01:00
Paul Chote
9d8840a4da Extract only the redalert.mix contents that we need. 2016-07-30 09:59:24 +01:00
Paul Chote
68e176c531 Load C&C desert assets from content dir. 2016-07-30 09:49:28 +01:00
Paul Chote
5c496b8f2b Load aftermath assets from content dir. 2016-07-30 09:49:27 +01:00
Paul Chote
75b58e6839 Revert "Add Migrations GlobalModData."
This reverts commit c204c10f5e.
2016-07-30 09:49:27 +01:00
Paul Chote
841e8982dc Move RA assets to v2 dir for backwards compatibility. 2016-07-30 09:35:46 +01:00
Matthias Mailänder
93b5517445 Merge pull request #11734 from SoScared/balance2
Revert Nuke Truck Damage nerf vs Air
2016-07-30 10:31:13 +02:00
Paul Chote
e067618268 Add d2k download metadata. 2016-07-30 09:14:36 +01:00
Paul Chote
56fa7cee1b Fix install source tooltip width. 2016-07-30 09:14:36 +01:00
Paul Chote
0269805f2a Add GruntMods D2K installer metadata. 2016-07-30 09:14:36 +01:00
Paul Chote
3e1a2a89c0 Update content metadata for 1.06 and fonts. 2016-07-30 09:14:36 +01:00
Paul Chote
fdc74353fc Migrate to 1.06 patch content. 2016-07-30 09:14:35 +01:00
SoScared
b821ec6e72 Revert Nuke Truck Damage nerf vs Air 2016-07-29 14:40:44 +02:00
Matthias Mailänder
53f284c35a Merge pull request #11723 from GraionDilach/exp2score
Rename the Experience coloumn to Score in observer stats.
2016-07-28 08:38:26 +02:00
Oliver Brakmann
2eede9493e Merge pull request #11699 from Mailaender/unhardcode-capture-cursors
Unhardcoded the capture mouse cursor sequences
2016-07-27 21:36:33 +02:00
Matthias Mailänder
538137ce80 Merge pull request #11622 from Mailaender/dispose-p
Fixed parent package from ZipFile not getting disposed.
2016-07-27 14:41:17 +02:00
Matthias Mailänder
78848a67a0 Merge pull request #11721 from obrakmann/fix11660_smudge-removal-desync
Fix desync when removing smudges
2016-07-27 14:36:29 +02:00
Matthias Mailänder
fc8a2b2ebe Merge pull request #11634 from GraionDilach/fixup-damagedbyterrain
Fixup DamagedByTerrain.
2016-07-27 09:33:40 +02:00
Zimmermann Gyula
6b7ccd8aa5 Rename the Experience coloumn to Score in observer stats. 2016-07-27 02:46:10 +02:00
Zimmermann Gyula
f56602704e Rewrite TS vein YAML data. 2016-07-26 23:18:56 +02:00
Zimmermann Gyula
0f368bf6c3 Update the default mods excluding veins in TS. 2016-07-26 23:18:54 +02:00
Zimmermann Gyula
4812bc2997 Change DamagedByTerrain to apply the damage directly.
Instead of relying on a weapon.
2016-07-26 23:18:53 +02:00
Matthias Mailänder
2ab82664e3 Dispose the intermediate Stream after copying it to pkgStream. 2016-07-26 22:14:42 +02:00
Oliver Brakmann
30cf8c204b Fix desync when removing smudges
The cause of the crash was that the `RemoveSmudge` method only invokes `SharedRandom` in the else-branch of an if condition that is only taken when the `RenderPlayer` has fog visibility on the location (locations the `RenderPlayer` can see get removed from `dirty` in `TickRender`).

To add insult to injury, the `Type` field does not even need to get set since we are only using the `Sprite` field's `null` value as a marker to be picked up by the `TickRender` method. The `Type` field is only ever used twice in `AddSmudge`, in a branch of an if-condition that will not be taken when the `Sprite` field is null, which we set explicitly. The same holds true for the `Depth` field.
2016-07-26 21:46:18 +02:00
abcdefg30
e13fa2d474 Merge pull request #11571 from RockyTV/rockytv
Add command to generate settings docs
2016-07-26 17:38:38 +02:00
Alexandre Oliveira
66b74b0116 Add command to generate settings docs 2016-07-26 00:02:01 -03:00
Oliver Brakmann
d36be5b4ee Merge pull request #11704 from abcdefg30/byeCam
Remove CAMERA.Large from Evacuation and Survival01
2016-07-24 21:36:33 +02:00
Matthias Mailänder
cffeaa1774 Merge pull request #11705 from abcdefg30/descMO
Fix the Desc of MapOptionsInfo
2016-07-24 21:25:26 +02:00
abcdefg30
4ed2c53b1a Fix the Desc of MapOptionsInfo 2016-07-24 15:34:21 +02:00
abcdefg30
6f15b5a72d Remove CAMERA.Large from Survival01 2016-07-24 15:30:16 +02:00
abcdefg30
48d042ee05 Remove CAMERA.Large from Evacuation 2016-07-24 15:24:30 +02:00
Matthias Mailänder
5c230803fe Merge pull request #11696 from Mailaender/lonely-cactus
Removed a burnt cactus from TEMPERAT & SNOW terrain
2016-07-24 07:04:32 +02:00
Matthias Mailänder
da509d6394 Unhardcode the capture cursors. 2016-07-23 23:50:02 +02:00
Matthias Mailänder
37ff8420f2 Exclude burnt cactus from TEMPERAT & SNOW terrain. 2016-07-23 18:29:54 +02:00
Matthias Mailänder
40754e3ddb Merge pull request #11694 from obrakmann/fix-packaging-open.nat
Fix packaging script after move to Open.NAT
2016-07-23 18:02:10 +02:00
Oliver Brakmann
5b408855d1 Fix packaging script after move to Open.NAT 2016-07-23 17:09:38 +02:00
Matthias Mailänder
c0a440fb0a Merge pull request #11627 from obrakmann/player-experience2
Enable tracking of player experience in all mods
2016-07-23 15:53:22 +02:00
Oliver Brakmann
99d368905e Merge pull request #11680 from Mailaender/rm-jeep-unload
Removed the unused jeep unload sequence
2016-07-21 19:53:14 +02:00
Matthias Mailänder
4a09870df3 Remove the unused and redundant C&C hovercraft unload sequence. 2016-07-21 09:12:40 +02:00