Commit Graph

22252 Commits

Author SHA1 Message Date
reaperrr
f550c3b762 Merge pull request #12315 from obrakmann/activities-pt1
Activities re-write, part 1 (aka the boring bits)
2016-11-18 13:52:06 +01:00
reaperrr
026ab9e2d7 Merge pull request #12302 from Jiyuu/modifyingpowershell
Restructuring make script
2016-11-18 13:33:28 +01:00
reaperrr
43b495b19f Merge pull request #12337 from roundowl/patch-2
Make friendly units aware of friendly mines
2016-11-18 13:02:30 +01:00
abcdefg30
c12cfbcc18 Merge pull request #12374 from reaperrr/fix-ts-depot
Fix TS service depot depth sorting
2016-11-17 21:53:08 +01:00
reaperrr
d8d7c0c0f7 Merge pull request #12352 from abc013/EmitCivs
Let civilian buildings spawn civilians on death
2016-11-16 19:08:00 +01:00
Taryn Hill
be0798999d Merge pull request #12378 from pchote/boolexpr
Add a boolean expression parser
2016-11-16 09:39:47 -06:00
Paul Chote
cc34f8e557 Add a boolean expression parser. 2016-11-15 21:45:00 +00:00
Oliver Brakmann
fd22b19183 Use consistent spelling of 'interrupt[a|i]ble' 2016-11-13 15:50:22 +01:00
reaperrr
0479b7ffb5 Merge pull request #12341 from reaperrr/no-overlay-delayedaction
Remove hardcoded buildComplete delay in some overlays
2016-11-13 13:24:42 +01:00
reaperrr
0c78527ae8 Merge pull request #12354 from pchote/fix-smudge-out-of-bounds
Add map bounds checks to TerrainSpriteLayer and SmudgeLayer.
2016-11-13 13:08:51 +01:00
Taryn Hill
40fcd21e5f Merge pull request #12369 from pchote/ts-development-prompt
Add an introduction dialog for non-{DEV_VERSION} TS builds.
2016-11-12 20:12:33 -06:00
abc013
e4354ce08c Added SpawnActorOnDeath: Civilians to ^CivBuilding 2016-11-12 14:45:49 +01:00
reaperrr
29355129d2 Fix TS service depot depth sorting 2016-11-12 12:56:37 +01:00
Paul Chote
988778fe1f Add an introduction dialog for non-{DEV_VERSION} TS builds. 2016-11-11 17:03:18 +00:00
abcdefg30
e7e17a0f5a Merge pull request #12323 from pchote/fix-dedicated-upnp-crash
Fix dedicated server crash with AllowPortForward.
2016-11-11 15:18:37 +01:00
Paul Chote
bbe4864921 Fix dedicated server crash with AllowPortForward. 2016-11-11 13:06:00 +00:00
reaperrr
7ba0c22346 Merge pull request #12096 from pchote/game-timer-tooltip
Show replay percentage as a tooltip.
2016-11-06 16:59:07 +01:00
Paul Chote
7a4d7989fe Merge pull request #12347 from tohava/del_delayedaction_in_weaponinfo
Remove DelayedAction from WeaponInfo
2016-11-05 18:16:19 +00:00
Paul Chote
77e0c579ba Merge pull request #12287 from reaperrr/interface-cleanups03
Third round of interface moving, making explicit and cleanup
2016-11-05 18:02:39 +00:00
reaperrr
162fef3da1 Fix style nit 2016-11-05 18:54:41 +01:00
Paul Chote
e187b985fe Prevent smudges from spawning in bogus cells. 2016-11-05 17:45:27 +00:00
Paul Chote
4db93f70c7 Add a cell sanity check to TerrainSpriteLayer. 2016-11-05 17:44:02 +00:00
Ori Bar
fabe799907 Remove DelayedAction from WeaponInfo and replace it with the more serialization friendly DelayedImpact 2016-11-04 02:24:43 +02:00
Jiyuu
dbea8d9515 Restructuring the make script & making the "all" command fetch dependencies as well 2016-11-03 22:49:19 +02:00
roundowl
194caa0163 Makes friendly units aware of mines
Added BlockFriendly boolean into Mine trait parameters. If set to true, friendly units vulnerable to mines will route around tiles with friendly mines in them.
2016-11-03 23:07:57 +03:00
reaperrr
e8027a6fdf Remove hardcoded buildComplete delay in some overlays
There certainly was and possibly still is some issue this was trying to
work around, but unless it's a deal-breaker, we should rather try to fix that
issue directly instead of keeping some uncommented magical work-around.
2016-11-02 22:01:45 +01:00
reaperrr
8cda0dd360 Merge pull request #12332 from abc013/NineLivesAuthor
Changed the Author of 'Nine Lives' to PizzaAtomica
2016-11-02 20:56:40 +01:00
reaperrr
8c15aa2ce4 Merge pull request #12331 from abc013/BeThVeFix
Fixed tiling error on the map 'Behind the Veil'
2016-11-02 20:50:29 +01:00
abc013
1d39ce8739 Change the Author of 'Nine Lives' to PizzaAtomica 2016-11-01 12:51:12 +01:00
abc013
c1eced55bf Fixed tiling error on the map 'Behind the Veil' 2016-11-01 12:41:56 +01:00
reaperrr
03fd591a00 Remove some unused usings 2016-10-31 21:12:41 +01:00
Oliver Brakmann
2c66ee8c13 Add native support for uninterruptible activities
This pattern occurs a few times throughout the code, so it makes sense to bake it into the Activity class itself.
2016-10-31 18:46:27 +01:00
Oliver Brakmann
3e9bf7aa4d Turn Actor.GetCurrentActivity into a property 2016-10-31 18:46:27 +01:00
reaperrr
ad6ea52bff Make IPowerModifier require explicit implementation
Plus some 'collateral' explicit implementations on the affected traits.
2016-10-30 20:22:16 +01:00
reaperrr
2d0560dcb7 Make RangeModifier interfaces require explicit implementation 2016-10-30 20:22:16 +01:00
reaperrr
02f14f0761 Make IInaccuracyModifier require explicit implementation 2016-10-30 20:22:16 +01:00
reaperrr
80d9241bbe Make IReloadModifier require explicit implementation 2016-10-30 20:22:16 +01:00
reaperrr
fc2f006ec1 Make IFirepowerModifier require explicit implementation 2016-10-30 20:22:16 +01:00
reaperrr
4af7134115 Require explicit ISpeedModifier implementation
Plus misc "collateral" explicit interfaces.
2016-10-30 20:22:16 +01:00
reaperrr
97c2c24e8d Require explicit implementation of IDamageModifier 2016-10-30 20:22:16 +01:00
reaperrr
f8077dc113 Move combat modifier interfaces (damage, speed etc.) to mod code 2016-10-30 20:22:16 +01:00
reaperrr
9dfddaf5d9 Move IRenderInfantrySequenceModifier to mod code and require explicit...
implementation.
2016-10-30 20:22:16 +01:00
Paul Chote
6b29d70520 Merge pull request #12284 from reaperrr/interface-cleanups02
More explicit interface cleanups
2016-10-30 18:40:43 +00:00
reaperrr
3fca63e9a2 Make Armament implement interfaces explicitly 2016-10-30 19:17:45 +01:00
reaperrr
ce52bc9d7b Some more misc explicit interface implementations
'Fallout' from working on other things.
2016-10-30 19:17:41 +01:00
reaperrr
61779bf02a Make WithSpriteTurret ITick implementation explicit 2016-10-30 19:17:39 +01:00
abcdefg30
89187d1557 Merge pull request #12309 from reaperrr/DelayedAction-riddance2
Get rid of DelayedAction in Beacons and PlaceBuilding
2016-10-30 18:05:46 +01:00
abcdefg30
2125799e3a Merge pull request #12308 from reaperrr/refactor-shroud-traits
Refactor Shroud and shroud-modifying traits
2016-10-30 17:55:59 +01:00
Paul Chote
1829011393 Merge pull request #12317 from cjshmyr/lua-wpos-subtract-error
Fix Lua error message for WPos subtraction
2016-10-30 14:51:38 +00:00
Curtis Shmyr
b1bea831de Fix Lua error message for WPos subtraction 2016-10-29 13:56:01 -06:00