UberWaffe
94b1f53ebf
Rebased. (+1 squashed commits)
...
Squashed commits:
[43010a0] Fixes. (+1 squashed commits)
Squashed commits:
[94ee90e] Fixes. (+1 squashed commits)
Squashed commits:
[ef827c7] Style cop updates. Updates to LevelUp, Cloak, and UnitUpgrade to allow multiple units within range, plus maximum extra unit limit. (+1 squashed commits)
Squashed commits:
[2103b01] Dupe crate action updates and fixes. (+2 squashed commit)
Squashed commit:
[0f4df4a] Added DuplicateUnitCrateAction.
[2787fa1] Clarity update. (+1 squashed commits)
Squashed commits:
[93ddc3b] Crate updates.
+Multiple units per crate allowed.
+Allow time delay on crate actions.
2014-07-20 21:37:40 +02:00
reaperrr
582c1016e9
Merge pull request #5998 from Mailaender/ts-bibs
...
Added bibs to Tiberian Sun refinery and factories
2014-07-20 12:48:53 +02:00
Matthias Mailänder
702b3f7d20
these are already fixed with the addition of isometry
2014-07-20 11:29:12 +02:00
Matthias Mailänder
dbe64f496b
add bibs to refinery and factories
2014-07-20 11:28:06 +02:00
Matthias Mailänder
6c1efac235
Merge pull request #5977 from pchote/oi-keep-moving
...
Don’t cancel MoveAdjacentTo / MoveWithinRange when target becomes invalid
2014-07-19 09:39:32 +02:00
Matthias Mailänder
d2aa97c1d1
Merge pull request #5990 from pchote/repair-fix
...
Play the correct race notification when repairing an ally’s structure.
2014-07-19 08:08:05 +02:00
Paul Chote
850fcd5100
Fix a typo.
2014-07-19 18:03:21 +12:00
Paul Chote
5b0cee78cf
Calculate a new path (and possibly new target cell) if the original path is blocked.
2014-07-19 18:03:21 +12:00
Paul Chote
e805461be7
Don’t cancel MoveAdjacentTo / MoveWithinRange when target becomes invalid.
...
Move to the last known position instead. Fixes #5968 .
2014-07-19 15:42:52 +12:00
Paul Chote
c2ba2fe12b
Play the correct race notification when repairing an ally’s structure.
2014-07-19 15:33:06 +12:00
obrakmann
312041b9c8
Merge pull request #5988 from pchote/shellmap-paradrop
...
Fix scripted paradrops.
2014-07-19 05:01:27 +02:00
Oliver Brakmann
0cf49ad49f
Fix old-lua paradrop too.
2014-07-19 14:42:36 +12:00
Paul Chote
87e425042f
Fix scripted paradrops.
2014-07-19 14:40:29 +12:00
obrakmann
54191039a9
Merge pull request #5989 from pchote/frozen-target-fix
...
Fix frozen actors being targetable under shroud.
2014-07-19 04:16:56 +02:00
Paul Chote
bcc32d15ed
Fix frozen actors being targetable under shroud. Fixes #5979 , #5978 .
2014-07-19 12:56:52 +12:00
Paul Chote
0f03d6bee8
Merge pull request #5987 from reaperrr/gem-mine-palette
...
Fixes gem mine desert palette
2014-07-19 12:00:49 +12:00
reaperrr
a447e35695
Fixes gem mine desert palette.
2014-07-18 22:47:11 +02:00
Paul Chote
58abd45ed9
Merge pull request #5967 from obrakmann/fix5651
...
Fix aircraft losing selection outside the map borders
2014-07-18 20:36:02 +12:00
Paul Chote
8a65632851
Merge pull request #5965 from WolfGaming/CustomPrereqChange
...
Adds the RequiresPrerequisites field into ProvidesCustomPrerequisite
2014-07-18 20:29:11 +12:00
Oliver Brakmann
42f963d687
Fix aircraft losing selection outside the map borders
...
Fixes #5651
2014-07-18 10:03:57 +02:00
WolfGaming
7b10da6bde
Adds the RequiresPrerequisites field into ProvidesCustomPrerequisite and all the logic behind it.
2014-07-18 06:11:03 +00:00
Chris Forbes
62820430de
Merge pull request #5974 from pchote/cratefix
...
Fix unit collection crates and drop-zone maps.
2014-07-18 12:58:24 +12:00
abcdefg30
8f60b9b652
Fixed drop-zone units
2014-07-18 11:39:43 +12:00
Paul Chote
e3dae2edd0
Replace the obsolete race check from GiveUnitCrateAction.
2014-07-15 10:15:35 +12:00
Paul Chote
8bce37710b
Merge pull request #5955 from Squiggles211/production_cancel_fix
...
Restored PlaceBuilding order's ProductionQueue checks.
2014-07-14 20:06:50 +12:00
Chris Forbes
709f29184a
Merge pull request #5954 from abcdefg30/fixhijacker
...
Made Hijacker buildable by soviets
2014-07-14 08:45:51 +12:00
Squiggles211
006f7b888a
Restored production queue current item checks
...
Fixes regression #5948 where you could freely build any building by
canceling the production before deploying by restoring the currentItem
checks in the PlaceBuilding order to ensure that the production is still
valid.
2014-07-13 14:06:30 -05:00
abcdefg30
1ef3099910
Hijacker again buildable by soviets
2014-07-13 20:39:54 +02:00
Matthias Mailänder
aca0b9d7dd
Merge pull request #5932 from MustaphaTR/d2k-only-inf-fix
...
D2K - Fixed some tiles should be only infantry
2014-07-13 08:34:06 +02:00
Chris Forbes
e7cd4e07f9
Merge pull request #5946 from Phrohdoh/MoreTraitDocs
...
Added some trait [Desc()]s.
2014-07-13 17:51:55 +12:00
Taryn Hill
da001385ae
Added some trait [Desc()]s.
2014-07-12 13:31:14 -05:00
Matthias Mailänder
a03d607878
Merge pull request #5930 from MustaphaTR/ra-oil-explode
...
RA - Explosive Oil Derricks
2014-07-12 11:25:30 +02:00
Chris Forbes
d8df332d97
Merge pull request #5940 from Mailaender/fort-lonestar-tech-disable
...
Fixed unbuildable high-tech on Fort Lonestar
2014-07-12 20:28:56 +12:00
Matthias Mailänder
e512799eeb
disable tech properly
2014-07-12 09:47:42 +02:00
Matthias Mailänder
8afddd9497
Merge pull request #5938 from abcdefg30/fortlonestar
...
Fixed a bug in Fort Lonestar
2014-07-12 09:45:00 +02:00
abcdefg30
b87ea6ddef
Update fort-lonestar.lua
2014-07-11 23:47:02 +02:00
Mustafa Alperen Seki
70af7f3595
Changed some tiles types
2014-07-11 16:34:16 +03:00
Mustafa Alperen Seki
b6a39c5993
Explosive Oil Derricks
2014-07-11 15:08:41 +03:00
Matthias Mailänder
a357bceb35
Merge pull request #5926 from pchote/ra-tabs
...
Fixes #5915
2014-07-11 13:42:21 +02:00
Matthias Mailänder
43242245b8
Merge pull request #5927 from MustaphaTR/ra-building-sort
...
Fixes #5914
2014-07-11 13:34:11 +02:00
Mustafa Alperen Seki
5fa4a5fa20
Sort Changes
2014-07-11 12:56:45 +03:00
Paul Chote
393702fe67
Fix bogus inconsistencies in the ra tab images:
...
- Soviet-normal tab glyphs were off by 1px.
- Allied-selected tabs had random semi-transparent pixels.
- Most tabs had a discoloured pixel near the left edge.
2014-07-11 20:04:03 +12:00
Paul Chote
1aacb21b04
Enable correct tab images for helicopters and aircraft.
2014-07-11 18:27:35 +12:00
Paul Chote
fc882437f0
Fix incorrect soviet tab image coordinates.
2014-07-11 18:26:00 +12:00
Daniel Hernandez
bac2b4f28e
Add opposing-faction tab art for aircraft and navy,
2014-07-11 18:11:40 +12:00
Paul Chote
ee27b248d8
Remove bitrotted tab source artwork.
2014-07-11 18:09:32 +12:00
Paul Chote
fd2254f9db
Merge pull request #5924 from Cr0s/patch-1
...
Fixed typo in HackyAI building placement code
2014-07-11 18:07:32 +12:00
Paul Chote
be2357f509
Merge pull request #5917 from pavlos256/deterministic-sort
...
Make tiles sorting deterministic in all cases
2014-07-11 17:53:08 +12:00
Cr0s
0f363d4c0f
Fixed typo in HackAI building placement code
2014-07-11 05:44:45 +04:00
Matthias Mailänder
efeba3ec4f
Merge pull request #5898 from MustaphaTR/d2k-techlevel
...
D2k Tech Level
2014-07-10 19:05:35 +02:00
