Commit Graph

2634 Commits

Author SHA1 Message Date
reaperrr
b254d5fa88 Merge pull request #11348 from reaperrr/clean-effects
Remove redundant Effects
2016-05-26 07:52:12 +02:00
Zimmermann Gyula
785f883d41 Do not try to tick undefined parachute shadows. 2016-05-25 12:50:24 +02:00
reaperrr
122035c36c Remove Smoke effect and use SpriteEffect instead 2016-05-23 23:57:18 +02:00
reaperrr
555d4f4adc Remove Corpse effect and use SpriteEffect instead 2016-05-23 23:30:51 +02:00
reaperrr
51b88bfbaf Remove Explosion effect and use SpriteEffect instead 2016-05-23 23:30:49 +02:00
reaperrr
6a988fd676 Move WorldInteractionControllerWidget and SpriteEffect to Common 2016-05-23 23:30:48 +02:00
abcdefg30
6682a4e97e Merge pull request #11290 from Mailaender/d2k-shellmap-editor-crash
Fixed a crash when loading the Dune 2000 shellmap in the map editor
2016-05-23 01:11:34 +02:00
Oliver Brakmann
8d3320c0e3 Add a lint check to ensure mpspawns are owned by the world owner 2016-05-22 12:55:35 +02:00
Oliver Brakmann
392dd7db3f Merge pull request #11112 from reaperrr/improve-LeavesTrails
Add facings support and other controls to LeavesTrails
2016-05-21 12:36:13 +02:00
reaperrr
dbd7606667 Move SpriteEffect facing parameter to the end
To avoid potential incompatibilities with downstream projects.
2016-05-20 23:24:33 +02:00
Oliver Brakmann
149271f71e Merge pull request #11291 from reaperrr/fix-10111-para
Some WithParachute fixes
2016-05-20 20:18:53 +02:00
reaperrr
60557e59f1 Merge pull request #11284 from Mailaender/net-4-eol
Updated to .NET version 4.5
2016-05-20 15:30:57 +02:00
Matthias Mailänder
5029ac705f Update to .NET 4.5 2016-05-19 21:24:21 +02:00
Oliver Brakmann
b4664d1ec5 Merge pull request #11192 from reaperrr/fix-effectwh
Fix direct hit check in CreateEffectWarhead
2016-05-18 21:52:30 +02:00
Oliver Brakmann
8319dfa70e Merge pull request #11298 from Mykogen/fix-queue-batching
Shift+hotkey queues 5 units for production. Fixes #5544
2016-05-16 21:35:53 +02:00
Tamás Viszkok
522e937597 Hotkeys for move viewport to map edge 2016-05-16 20:26:59 +02:00
reaperrr
9707cd9be9 Merge pull request #11299 from reaperrr/dmgstate-upgrade
Introduce trait granting upgrades at specified DamageStates
2016-05-16 20:00:53 +02:00
reaperrr
407a061c0a Merge pull request #11176 from pchote/lobby-trait-checkbox-prep
Query lobby checkbox state via their owning traits.
2016-05-16 19:00:35 +02:00
reaperrr
9cca92942e Merge pull request #11130 from viszkoktamas/viewportBookmark
Add hotkeys for save areas of the map
2016-05-16 18:37:56 +02:00
Viszkok Tamás
a89376daf0 Added hotkeys for save areas of the map 2016-05-16 14:01:49 +02:00
reaperrr
d03eaaaac0 Introduce UpgradeOnDamage trait 2016-05-16 02:41:12 +02:00
Mykogen
2bbbdbeedb Shift+hotkey queues 5 units for production. Fixes #5544 2016-05-16 00:02:00 +02:00
Matthias Mailänder
fc523ae953 Print actor information instead of the function name. 2016-05-15 16:21:32 +02:00
reaperrr
51194059b3 Fix WithParachute shadow position on elevated terrain 2016-05-15 16:05:15 +02:00
reaperrr
c2f537a43d Move parachute shadow anim ticking from Render to Tick 2016-05-15 16:04:01 +02:00
reaperrr
a670ea4bad Remove ITraitInfo from WithParachuteInfo
ITraitInfo is already implemented by UpgradableTraitInfo, so this was redundant.
2016-05-15 16:00:51 +02:00
Matthias Mailänder
0d500f4bb2 Merge pull request #11270 from reaperrr/fix-td-fieldcrash
Make FrozenUnderFog footprint include '_'
2016-05-15 15:40:08 +02:00
reaperrr
e59c7a8b1f Make FrozenUnderFog count passable footprint cells
To avoid crashing on actors with only passable footprint cells.
2016-05-15 14:56:08 +02:00
reaperrr
c201558023 Merge pull request #10714 from Mailaender/import-rules
Added basic RA2/TS mod rules importers
2016-05-15 14:46:24 +02:00
reaperrr
794db5a2f1 Play reload sounds only to owner 2016-05-15 13:53:21 +02:00
Matthias Mailänder
26c0f1ebc0 terrain palette auto detection 2016-05-15 11:46:46 +02:00
Paul Chote
0a7c80ef6e Prepare short game code for trait-defined lobby options. 2016-05-14 18:54:44 +01:00
Paul Chote
e3bc73a168 Prepare ally build adjacency code for trait-defined lobby options. 2016-05-14 18:54:44 +01:00
Paul Chote
c412e4e86c Prepare MapCreeps code for trait-defined lobby options. 2016-05-14 18:54:44 +01:00
Paul Chote
7e49ae7eb0 Prepare DeveloperMode code for trait-defined lobby options. 2016-05-14 18:54:44 +01:00
Paul Chote
a0b5b5ce66 Move initial map exploration to Shroud. 2016-05-14 18:54:44 +01:00
Paul Chote
dade84db85 Remove leftover dead fragile alliances code. 2016-05-14 18:54:44 +01:00
HenrytheSlav
a9bb79c0a8 Buildings get locked by Demolishable activity nefore their destruction 2016-05-14 11:23:21 +02:00
reaperrr
f31ea658ef Merge pull request #11148 from pchote/improve-scroll-input
Expose separate middle and right mouse scroll config.
2016-05-13 22:44:18 +02:00
abcdefg30
22ee4d1f39 Merge pull request #11186 from Mailaender/map-import-tileset
Made the legacy map import more robust
2016-05-10 18:03:16 +02:00
reaperrr
bd2a24af55 Merge pull request #11223 from Mailaender/missile-dead
Cleaned up logically dead Missile code.
2016-05-08 14:09:27 +02:00
reaperrr
eb6157f81e Merge pull request #11197 from pchote/add-sysinfo-opt-out-prompt
Add sysinfo opt out prompt
2016-05-08 13:10:55 +02:00
Paul Chote
bd7e53bec4 Merge pull request #11234 from obrakmann/fix11218-spawnactorondeath-dispose-race
Fix trait lookup of destroyed actor in SpawnActorOnDeath
2016-05-07 15:58:20 +01:00
Matthias Mailänder
5462097c42 Merge pull request #11205 from reaperrr/rangelimit-wdist
Refactored Missile.RangeLimit to be a WDist value
2016-05-07 15:10:49 +02:00
Oliver Brakmann
35dfb54459 Fix trait lookup of destroyed actor in SpawnActorOnDeath
The sequence of events leading to that crash looks like this:

1. Truk enters a building.

2. `Enter.FindAndTransitionToNextState()` is running, and since `DonateSupplies` uses `EnterBehaviour.Dispose`, `Actor.Dispose()` runs for the actor, queueing a FrameEndTask.

3. Truk is then killed:

 * `Health.InflictDamage()` first calls `SpawnActorOnDeath.Killed()`, which queues a FrameEndTask during which some trait lookups happen.

 * `Health.InflightDamage()` then calls `Actor.Dispose()` as well, queueing another FrameEndTask (which will never run, the game crashes before).

4. After the tick, the first FrameEndTask disposes of the actor. The second FrameEndTask would spawn the crate from the truk, but the trait lookups then fail and throw an exception.
2016-05-07 14:21:41 +02:00
Paul Chote
cf4ef11403 Merge pull request #11232 from abcdefg30/navalRepair
Fix possible instant repairs by spamming Repair activities
2016-05-07 10:30:57 +01:00
abcdefg30
25b1c991a2 Fix possible instant repairs by spamming Repair activities
Noticeable when spam-clicking on a naval yard/sub pen.
2016-05-06 17:51:24 +02:00
HenrytheSlav
1962ea3abc Fixes Utility import facings mirror-flip 2016-05-05 18:44:23 +02:00
Matthias Mailänder
3d865d46e7 Removed logically dead code.
targetPassedBy is always true in this section
and - times - is +.
2016-05-05 10:19:38 +02:00
Matthias Mailänder
1bc4200128 Merge pull request #11136 from SzabKel/musicButtons
Added music controlling hotkeys. Closes #3231
2016-05-03 07:16:05 +02:00