Commit Graph

22819 Commits

Author SHA1 Message Date
abcdefg30
9240d53228 Merge pull request #12615 from pchote/fix-yaml-merging-again
Fix yaml merging (again).
2017-01-27 13:39:49 +01:00
Paul Chote
255214e77c Fix timed external conditions being rejected instead of reset. 2017-01-26 22:52:26 +00:00
Paul Chote
33210ad818 Merge pull request #12631 from drscream/fix/liblua-lookup-smartos
Lookup for liblua in /opt/local/lib
2017-01-26 22:47:46 +00:00
abcdefg30
77663ba2d6 Merge pull request #12624 from pchote/fix-ref-sell
Only remove resources when a silo/refinery is killed.
2017-01-26 18:16:50 +01:00
abcdefg30
5496c9be00 Merge pull request #12627 from GraionDilach/veins-fix
Fix vein attack animation moving along with target.
2017-01-26 18:15:55 +01:00
Paul Chote
5377d70f92 Style fixes. 2017-01-26 17:27:13 +01:00
abcdefg30
5ff47162ec Merge pull request #12513 from reaperrr/cnc-warhead-saving
Some minor TD weapon yamls restructuring
2017-01-26 17:22:00 +01:00
Thomas Merkel
b4cdf18367 Lookup for liblua in /opt/local/lib which is required to work on SmartOS with pkgsrc
We need to lookup also for liblua at /opt/local/lib which is used as PREFIX in pkgsrc on SmartOS.
2017-01-26 13:17:06 +01:00
Zimmermann Gyula
cc71582419 Fix vein attack animation moving along with target. 2017-01-26 11:01:36 +01:00
Zimmermann Gyula
8e9370054d Add a disable option to LeavesTrails->StartDelay via negative values. 2017-01-26 11:01:35 +01:00
Paul Chote
3b4f515e2a Only remove resources when a silo/refinery is killed. 2017-01-25 20:07:15 +00:00
RoosterDragon
6a0b993fa2 Remove attackBases member from AutoTarget.
We can use the activeAttackBases member everywhere.
2017-01-25 18:29:33 +00:00
reaperrr
2760829353 Rename TD largecaliber.yaml to ballistics.yaml
Mostly because Grenade was added to it.
2017-01-25 18:57:58 +01:00
reaperrr
5f6a350d41 Make TD Chemspray inherit ^FlameWeapon
Results in a small reduction of yaml lines and makes it easier to make
across-the-board changes in the future.
2017-01-25 18:50:43 +01:00
reaperrr
7496bfff7c Move TD TiberiumExplosion to explosions.yaml 2017-01-25 18:50:42 +01:00
abcdefg30
248d9df3ab Merge pull request #12622 from MustaphaTR/d2k-ai-building
D2K - Some AI Fixes
2017-01-25 15:50:18 +01:00
abcdefg30
2eb8718938 Merge pull request #12618 from MustaphaTR/d2k-ai-fremen
D2K - Make AI able to use Fremen SW.
2017-01-25 15:45:26 +01:00
Mustafa Alperen Seki
ec4f79f372 Reorder D2K rule files on mod.yaml
This effects the order on map editor.
2017-01-25 11:33:18 +02:00
Mustafa Alperen Seki
86180adc13 Some AI fixes and reorder Structures on AI.yaml 2017-01-25 11:20:56 +02:00
Paul Chote
b803034cef Resolve yaml removals in weapon definitions. 2017-01-24 22:19:17 +00:00
abcdefg30
f6c66c4f63 Merge pull request #12598 from MustaphaTR/d2k-str-repair-and-damage
D2K - Fix Low Repair and Terrain Damage.
2017-01-24 20:05:45 +01:00
abcdefg30
68dd2b57fc Merge pull request #12621 from MustaphaTR/d2k-debris-bounce
D2K - Add bouncing to Debris.
2017-01-24 20:03:28 +01:00
abcdefg30
f3e58056fa Merge pull request #12614 from reaperrr/prep-slim-ra-weapons4-other
Prepare RA weapons for inheritance part 4 - other weapons
2017-01-24 16:45:13 +01:00
abcdefg30
83d6100c18 Merge pull request #12619 from MustaphaTR/d2k-orni-target-types2
D2K - Remove the unused "TargetTypes: Air" from ornithopter
2017-01-24 15:49:01 +01:00
abcdefg30
b053da6e63 Merge pull request #12520 from reaperrr/prep-slim-ra-weapons
Prepare for slimming RA weapon yamls Part 1 - explosions
2017-01-24 15:47:17 +01:00
Mustafa Alperen Seki
4601331f7f Add bouncing to D2K Debris. 2017-01-24 15:04:29 +02:00
Mustafa Alperen Seki
5c24512735 Make D2K AI able to use Fremen SW. 2017-01-24 14:13:54 +02:00
Mustafa Alperen Seki
61b0d46155 Remove unused "TargetTypes: Air" from ornithopter 2017-01-24 12:33:20 +02:00
abcdefg30
274cf14c6f Merge pull request #12613 from reaperrr/prep-slim-ra-weapons3-misl
Prepare RA weapons for inheritance part 3 - Missiles
2017-01-23 23:01:17 +01:00
abcdefg30
8910a8aec5 Merge pull request #12612 from reaperrr/prep-slim-ra-weapons2-small
Prepare RA weapons for inheritance part 2 - small arms
2017-01-23 22:59:48 +01:00
Paul Chote
2be8cedddf Add StringComparison arguments to StartsWith. 2017-01-23 20:22:46 +00:00
reaperrr
9f9bda9634 Move FLAK weapons up in RA smallcaliber.yaml 2017-01-23 21:19:28 +01:00
reaperrr
decf2150a7 Move RA Colt45 down inside smallcaliber.yaml 2017-01-23 21:19:27 +01:00
reaperrr
58a79162f5 Remove watersplash from RA Napalm bombs
They are rarely used anyway, and this allows the weapon to make use of inheritance more easily later on.
2017-01-23 21:17:20 +01:00
reaperrr
b57411b0f6 Move RA Grenade and DepthCharge to largecaliber.yaml 2017-01-23 21:17:18 +01:00
reaperrr
ce41a037ee Move APTusk up in RA missiles.yaml 2017-01-23 21:14:53 +01:00
reaperrr
319d53990a Move SubMissiles down in RA missiles.yaml 2017-01-23 21:14:51 +01:00
reaperrr
3c2fe1e1a7 RA missile warhead naming fixes
To make inheritance easier later on.
2017-01-23 21:14:50 +01:00
reaperrr
6fe223ba0e Streamline cosmetic RA building explosions 2017-01-23 21:11:00 +01:00
reaperrr
12b9c97f0b Rename and in a few cases move around warheads in RA explosions.yaml
To make inheriting easier down the road.
2017-01-23 21:11:00 +01:00
reaperrr
e75e6ce614 Move nuke explosions to end of RA explosions.yaml 2017-01-23 21:11:00 +01:00
reaperrr
9d62c1a1d6 Merge pull request #12610 from obrakmann/sysinfo-64bit
Add OS bitness to sysinfo query
2017-01-23 20:49:50 +01:00
Paul Chote
f4bcf79e7c Merge pull request #12524 from paulvt/deb-packaging-lintian-clean
Debian packaging lintian clean
2017-01-23 18:20:10 +00:00
abcdefg30
d165523072 Merge pull request #12608 from MustaphaTR/d2k-crate-terrain-types
D2K - Add more tile types to possible places Crates can spawn
2017-01-23 13:49:31 +01:00
Mustafa Alperen Seki
695b6e5c9a Add Transition, Spice and Concrete to Crate's TerrainTypes 2017-01-23 07:53:08 +02:00
Oliver Brakmann
53c037aa53 Add OS bitness to sysinfo query 2017-01-22 21:36:32 +01:00
Oliver Brakmann
6177855e20 Merge pull request #12607 from MustaphaTR/d2k-fix-carryall-on-concrete
D2K - Fix Carryalls can't land on Concrete
2017-01-22 21:07:11 +01:00
Oliver Brakmann
9993a235a7 Convert ResupplyAircraft into a CompositeActivity 2017-01-22 20:42:19 +01:00
Oliver Brakmann
9b0780e87c Make FlyAttack use child activities 2017-01-22 20:41:41 +01:00
Oliver Brakmann
e49b3d6458 Adjust existing activities for changed NextActivity semantics
To make sure existing checks against NextActivity don't check the parent activity by mistake
2017-01-22 20:41:37 +01:00