Commit Graph

21826 Commits

Author SHA1 Message Date
Oliver Brakmann
fb1f8c4e01 Remove brain-dead logic from TakeOff
1. TakeOff's Tick() method never checks itself whether it is canceled
2. If NextActivity is null, TakeOff is the only activity on the queue
3. Takeoff canceling the queue then just cancels itself, with no effect at all

4. If Takeoff however is running as an inner activity, it will cancel the complete main queue, wrecking all sorts of havoc
2016-09-05 19:20:51 +02:00
Matthias Mailänder
c9474a857a Merge pull request #11956 from obrakmann/fix11953_fix-aircraft-reservation-madness
Fix aircraft reservation madness
2016-09-04 21:54:28 +02:00
Oliver Brakmann
7f64495d6f Make aircraft continue attack on same target after re-arming 2016-09-04 21:31:05 +02:00
Oliver Brakmann
e7d07e5a01 Fix FlyAttack not calling TakeOff for landed aircraft 2016-09-04 21:31:05 +02:00
Oliver Brakmann
6d15406ffe Fix aircraft reservation madness 2016-09-04 21:31:05 +02:00
reaperrr
6cc17b6af3 Merge pull request #11968 from pchote/gps-exploration
Explore shroud on first GPS launch, ignoring power/radar.
2016-09-04 21:27:53 +02:00
Matthias Mailänder
3ed241c4d4 Merge pull request #11951 from pchote/hack-production-locking
Rework external capture -> production interaction
2016-09-04 20:18:59 +02:00
Oliver Brakmann
a32a95a27c Merge pull request #11702 from Mailaender/infiltration-mission
Added Scott's Allies04 co-op multiplayer mission as "Infiltration"
2016-09-04 18:41:09 +02:00
Matthias Mailänder
76294c8273 Port the Co-Op Allies04 map to Lua. 2016-09-04 18:14:25 +02:00
Paul Chote
142caa6691 Explore shroud on first GPS launch, ignoring power/radar. 2016-09-04 16:40:48 +01:00
Taryn Hill
1592f9dd63 Merge pull request #11933 from Mailaender/mono-4.4.2
Updated Mono to version 4.4.2
2016-09-04 10:15:35 -05:00
Taryn Hill
0e73e88229 Merge pull request #11965 from pchote/fix-grenadier-stand
Fix grenadier attack and stand animations
2016-09-04 10:13:40 -05:00
Paul Chote
53f47f8ee1 Use explicit interfaces in WithBuildingPlaced(Overlay|Animation). 2016-09-04 15:25:50 +01:00
Paul Chote
21f9a0ec6c Remove tech disabling when building is locked. 2016-09-04 15:25:50 +01:00
Paul Chote
013b717a84 Disable unit production when building is locked. 2016-09-04 15:25:50 +01:00
Paul Chote
2df5918315 Disable BaseProvider when building is locked. 2016-09-04 15:25:50 +01:00
Paul Chote
a09b32b4f3 Disable WithBuildingPlacedAnimation while selling. 2016-09-04 15:25:49 +01:00
Oliver Brakmann
5c01647b20 Merge pull request #11949 from Mailaender/jes-infantry-sequence-polish
Polished the Dune 2000 infantry sequences
2016-09-04 13:59:11 +02:00
Oliver Brakmann
c58ec4d14f Merge pull request #11636 from abcdefg30/noGuard
Don't allow tanya to automatically target, but allow her to move within a attack-moving/guarding group
2016-09-04 13:44:46 +02:00
Paul Chote
48c9e74bb4 Merge pull request #11637 from abcdefg30/noMove
Fix the attack-move cursor appearing for units which can't attack-move
2016-09-04 11:06:58 +01:00
Paul Chote
85ab797705 Merge pull request #11957 from abc013/DisableReplayChat
Disabled chat input in replays
2016-09-04 10:43:34 +01:00
Paul Chote
f334505395 Fix grenadier FireDelay and LocalOffset. 2016-09-04 10:38:17 +01:00
Paul Chote
a7bfdd5eb1 Fix grenadier stand and attack sequences. 2016-09-04 10:37:37 +01:00
abcdefg30
29b0863076 Merge pull request #11964 from clemty/nod07a-fixcrash
fix crash in missions because cameras need .destroy, not .kill to be removed
2016-09-03 23:49:26 +02:00
abcdefg30
1a3c3bd21b Merge pull request #11960 from pchote/fix-parachute-death
Remove invalid cell check from Parachutable.
2016-09-03 23:45:54 +02:00
Oliver Brakmann
361c541f13 Merge pull request #11961 from pchote/fix-requiresmod
Fix crash when popping up the mod requirements dialog.
2016-09-03 23:42:49 +02:00
Oliver Brakmann
6a33c605b9 Merge pull request #11868 from abcdefg30/gpsBounty
Fix the floating text for bounties of actors not being InWorld showing up
2016-09-03 23:00:12 +02:00
clemty
47080d5dc0 fix removal of cameras in nod07a and nod08a
fixes #11963
2016-09-03 22:54:41 +02:00
Paul Chote
617f106e48 Fix crash when popping up the mod requirements dialog. 2016-09-03 19:28:10 +01:00
abc013
c7def33588 disabled chat input in replays 2016-09-03 20:26:05 +02:00
Matthias Mailänder
0ec0db72e4 Merge pull request #11952 from pchote/spectator-player-list
Include spectators in the player list.
2016-09-03 20:19:42 +02:00
Paul Chote
7725f6b952 Remove unnecessary and incorrect cell check.
This caused all cells inside the map to be
treated as valid parachute targets, ignoring
all later checks.
2016-09-03 19:16:06 +01:00
abcdefg30
9f72772a37 Remove the percentage parameter from GetBountyValue 2016-09-03 15:30:26 +02:00
abcdefg30
a76672b029 Cache GainsExperience and Cargo in GivesBounty 2016-09-03 15:30:25 +02:00
abcdefg30
278a812eec Display the value of the destroyed cargo actors 2016-09-03 15:30:24 +02:00
abcdefg30
81bdea1107 Fix the floating text for bounties of actors not being InWorld showing up 2016-09-03 15:30:24 +02:00
Matthias Mailänder
256834f044 Improve the light infantry death animations. 2016-09-03 14:38:02 +02:00
Matthias Mailänder
1ce421910b Add missing idle sequences to d2k infantry. 2016-09-03 14:24:33 +02:00
Paul Chote
67cc12436f Merge pull request #11918 from abc013/CapturableHuskFaction
Fix mcv husks losing their faction after being captured
2016-09-03 11:54:56 +01:00
Paul Chote
4a90ff834e Merge pull request #11867 from abcdefg30/gpsDot
Fix GPSDots being visible when the unit is not InWorld or dead
2016-09-03 11:35:14 +01:00
Paul Chote
e1fcfa3073 Include spectators in the player list. 2016-09-03 10:46:08 +01:00
reaperrr
b8f89ac5fb Merge pull request #11945 from MustaphaTR/ant-dog-fix
RA - Fix Dogs can attack Giant Ants
2016-09-02 22:35:18 +02:00
reaperrr
7311c69e35 Merge pull request #11944 from MustaphaTR/ant-zombie-kennel-fix
RA - Fix ants and zombies can be trained from kennel
2016-09-02 22:31:00 +02:00
abcdefg30
15214c21bc Merge pull request #11948 from pchote/fix-facing-normalization
Fix an off-by-one error in NormalizeFacing.
2016-09-02 22:17:36 +02:00
Matthias Mailänder
abbcdbd5df Add OnSelling and OnSold to the Lua API. 2016-09-02 21:59:59 +02:00
Matthias Mailänder
e3df47d6d2 Add Sell to the Lua API. 2016-09-02 21:59:59 +02:00
Paul Chote
9e867e23a9 Merge pull request #11941 from obrakmann/fix11940-std-scrolling-deadzone
Fix mouse input breakage
2016-09-02 20:45:56 +01:00
Oliver Brakmann
f554531bd2 Fix not showing scroll cursor during standard-scrolling
... when edge scrolling was also disabled.
2016-09-02 21:34:47 +02:00
Oliver Brakmann
f5be504640 Add a deadzone for standard scrolling 2016-09-02 21:34:46 +02:00
Oliver Brakmann
a8dc8454cb Fix ignoring deadzone with joystick scrolling
This re-introduces a bug where releasing the RMB button causes an order to be generated for the selected units if the user didn't move their mouse just prior.
2016-09-02 21:34:46 +02:00