Commit Graph

39829 Commits

Author SHA1 Message Date
Hans Mackowiak
edaab9d7de TriggerType: add PayLife 2019-01-11 09:38:02 +00:00
Hans Mackowiak
842c6e681d TriggerPayLife: add new Trigger 2019-01-11 09:33:56 +00:00
Hans Mackowiak
05be8406cc Update TriggerLifeGained: better format 2019-01-11 09:31:53 +00:00
Hans Mackowiak
7aa879fb8e Update CostDraw: fix Description 2019-01-11 09:19:12 +00:00
Hans Mackowiak
1e6a9b8c26 Update CostDamage, fix Description 2019-01-11 09:17:55 +00:00
Hans Mackowiak
b2e9c88f62 CostPayLife: refund never called and doesn't work
negative amount can't be paid in the function
2019-01-11 09:16:50 +00:00
Michael Kamensky
948c13dd15 Merge branch 'deckicons' into 'master'
Add icons to duels and challenges in LEB and ARN worlds

See merge request core-developers/forge!1262
2019-01-09 06:04:07 +00:00
Rob Schnautz
b8f7d08fae Remove extraneous line 2019-01-09 05:50:07 +00:00
Rob Schnautz
576b7e2dd3 fix kane 2019-01-09 04:35:52 +00:00
Rob Schnautz
024b2e1a01 Add new quest opponent avatars to the downloader. 2019-01-09 04:23:24 +00:00
Rob Schnautz
daf4b9d974 ARN icons and some flavor text. 2019-01-08 03:25:43 +00:00
Rob Schnautz
36b3431975 rest of the LEB world icons 2019-01-08 02:54:36 +00:00
Rob Schnautz
3ded3926f4 Remove placeholder icons for shiny new icons. 2019-01-08 02:50:58 +00:00
Michael Kamensky
193a1cc255 Merge branch 'teysaKarlov' into 'master'
Teysa Karlov: add Dieharmonicon to TriggerHandler

See merge request core-developers/forge!1259
2019-01-06 11:12:38 +00:00
Hanmac
d0b569a07f Teysa Karlov: add Dieharmonicon to TriggerHandler 2019-01-06 11:38:58 +01:00
Michael Kamensky
b17edd31ac Merge branch 'tapAttacker' into 'master'
Taps Trigger now flag for being used as Attacker

See merge request core-developers/forge!1258
2019-01-06 05:34:09 +00:00
Hanmac
891f61701c Taps Trigger now flag for being used as Attacker 2019-01-05 20:52:40 +01:00
Hans Mackowiak
e35f5098b9 Merge branch 'charmNone' into 'master'
CharmEffect: now allows zero choices

See merge request core-developers/forge!1257
2019-01-05 12:01:30 +00:00
Hans Mackowiak
55da7435f8 CharmEffect: now allows zero choices 2019-01-05 12:01:30 +00:00
Michael Kamensky
f0a561b1ee Merge branch 'adaptBio' into 'master'
Adapt changes for Biomancer's Familiar

See merge request core-developers/forge!1256
2019-01-04 19:38:37 +00:00
Hans Mackowiak
bbd48d1033 Adapt changes for Biomancer's Familiar 2019-01-04 19:38:37 +00:00
Hans Mackowiak
847013c6c7 Merge branch 'morphSimFix' into 'master'
fixes for game sim

See merge request core-developers/forge!1255
2019-01-04 09:23:47 +00:00
Hanmac
61aa144631 fixes for game sim 2019-01-03 21:44:18 +01:00
Michael Kamensky
dd87f74eb4 Merge branch 'atEOTSvar' into 'master'
At eot svar

See merge request core-developers/forge!1254
2019-01-03 17:47:16 +00:00
Hanmac
95dbc5333e updated card scripts, remove EndOfTurnLeavePlay, add tokenscripts 2019-01-03 16:02:04 +01:00
Hanmac
0d2114416c extend AtEOT, fix resetTurnActivations 2019-01-03 15:54:53 +01:00
Michael Kamensky
215808b011 Merge branch 'facedown-reveal-fix' into 'master'
Fixed the reveal for face-down cards leaving battlefield/stack not working anymore.

See merge request core-developers/forge!1253
2018-12-30 10:43:37 +00:00
Agetian
1ced8bba7d - Style fix. Added a comment. 2018-12-30 08:26:34 +03:00
Agetian
468ff7fc50 - Fixed the reveal for face-down cards leaving battlefield/stack not working anymore. 2018-12-30 08:19:29 +03:00
Hans Mackowiak
0eed2c67d1 Merge branch 'morphRework' into 'master'
Morph and Manifest are not to facedown anymore

See merge request core-developers/forge!1252
2018-12-29 19:18:35 +00:00
Hanmac
4168ef0b0d Morph and Manifest are not to facedown anymore 2018-12-29 15:45:20 +01:00
Michael Kamensky
bf59d932f4 Merge branch 'master' into 'master'
XMage cube ports update

See merge request core-developers/forge!1251
2018-12-27 18:21:14 +00:00
Agetian
765b0e4625 - XMage cube ports update (2 new cubes). 2018-12-27 21:19:45 +03:00
Michael Kamensky
16058bbea2 Merge branch 'tweak-target-overlay' into 'master'
Tweak target overlay

See merge request core-developers/forge!1248
2018-12-27 18:09:24 +00:00
Michael Kamensky
f47f95cd2e Merge branch 'seanceCopyFix' into 'master'
Seance: use AddTypes and AtEOT instead of extra Clones defined

See merge request core-developers/forge!1249
2018-12-27 18:09:00 +00:00
Hanmac
7f0f62abb6 Seance: use AddTypes and AtEOT instead of extra Clones defined 2018-12-27 17:31:34 +01:00
Hans Mackowiak
22627b57f0 Merge branch 'patch-2' into 'master'
Update growth_spiral.txt

Closes #792

See merge request core-developers/forge!1250
2018-12-27 16:23:02 +00:00
Hans Mackowiak
5a81cace02 Update growth_spiral.txt 2018-12-27 16:21:28 +00:00
Tim Scott
3f172e6872 Merge remote-tracking branch 'remotes/upstream-forge/master' into tweak-target-overlay 2018-12-27 08:08:00 -06:00
Michael Kamensky
52dcdaa47d Merge branch 'master' into 'master'
AI damage chaining: Eliminated a redundant call to canPlay (already tested at this point).

See merge request core-developers/forge!1247
2018-12-27 10:18:41 +00:00
Agetian
d4476cbd2b - Eliminated a redundant call to canPlay (already tested above). 2018-12-27 13:17:49 +03:00
Michael Kamensky
d2c4ab28c2 Merge branch 'master' into 'master'
Fixed the AI misplaying with Chamber Sentry.

Closes #791

See merge request core-developers/forge!1246
2018-12-27 05:23:31 +00:00
Agetian
23d67ab0cf - Fixed the AI misplaying with Chamber Sentry. 2018-12-27 08:21:28 +03:00
Tim Scott
3f55b9f503 Flesh out README. 2018-12-26 10:18:40 -06:00
Tim Scott
e222444809 Update readme with build info. 2018-12-26 09:32:22 -06:00
Tim Scott
83ed648966 Merge remote-tracking branch 'remotes/upstream-forge/master' into tweak-target-overlay 2018-12-26 08:44:28 -06:00
Hans Mackowiak
a5c1d88460 Merge branch 'putLandOptionalFix' into 'master'
Fix 'You may put' 'land card from your hand onto the battlefield' cards

See merge request core-developers/forge!1245
2018-12-26 10:28:58 +00:00
Hanmac
fee83e0db4 Fix 'You may put' 'land card from your hand onto the battlefield' cards 2018-12-26 11:19:23 +01:00
Michael Kamensky
d5a5ef1604 Merge branch 'playTriggerChangesZoneAll' into 'master'
Update PhaseHandler for Trigger ChangesZoneAll

See merge request core-developers/forge!1214
2018-12-25 19:00:28 +00:00
Hans Mackowiak
af38b9b0e4 Update Trigger ChangesZoneAll
CardZoneTable: for Origin + Destination => CardCollection Tables

GameAction: Refactor

HumanPlay: use executePayment List if able
2018-12-25 18:13:44 +01:00