Commit Graph

44177 Commits

Author SHA1 Message Date
Jamin W. Collins
226716c816 updating Pioneer ban list
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-02-28 19:18:59 -07:00
Jamin W. Collins
3c6f82294b updating the Modern banned list
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2020-02-28 19:05:27 -07:00
Anthony Calosa
600d672b4a Update Sprite Icons on Mobile Forge
(Default theme)
2020-02-29 05:05:51 +08:00
Anthony Calosa
48cb11566f Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-02-28 23:16:14 +08:00
Anthony Calosa
c3be51c117 Fix Missing Translation on Planar Conquest 2020-02-28 23:15:29 +08:00
Hans Mackowiak
841808d99a Merge branch 'combo_attack' into 'master'
Band Together / Combo Attack

See merge request core-developers/forge!2551
2020-02-28 15:12:42 +00:00
Tim Mocny
258f0a2072 Band Together / Combo Attack 2020-02-28 15:12:42 +00:00
Michael Kamensky
0b2e60b0c1 Merge branch 'maddening_imp' into 'master'
Maddening Imp round 2

See merge request core-developers/forge!2559
2020-02-28 05:11:31 +00:00
Tim Mocny
669bc9ceaa Maddening Imp round 2 2020-02-28 05:11:31 +00:00
Michael Kamensky
93d9d12879 Merge branch 'maddening_imp' into 'master'
Today's fixes

See merge request core-developers/forge!2558
2020-02-27 04:34:47 +00:00
Tim Mocny
9d0f3f325b Today's fixes 2020-02-27 04:34:47 +00:00
Michael Kamensky
d66b61f0a3 Merge branch 'quenchable_fire' into 'master'
Quenchable Fire - Ready!

Closes #580

See merge request core-developers/forge!2533
2020-02-26 20:01:06 +00:00
Tim Mocny
9d79b6c262 Quenchable Fire - Ready! 2020-02-26 20:01:06 +00:00
Michael Kamensky
7721b227cb Merge branch '24Feb2020' into 'master'
Nahiri, the Lithomancer +2 ability (cosmetic only)

See merge request core-developers/forge!2554
2020-02-26 19:58:08 +00:00
Tim Mocny
d1106f8df7 Nahiri, the Lithomancer +2 ability (cosmetic only) 2020-02-26 19:58:07 +00:00
Michael Kamensky
794fcdafe5 Merge branch 'sld51' into 'master'
SLD - IWD 2020 cards

See merge request core-developers/forge!2557
2020-02-26 19:57:31 +00:00
Tim Mocny
344126d5aa SLD - IWD 2020 cards 2020-02-26 19:57:31 +00:00
Anthony Calosa
2a72a87ef4 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-02-26 23:42:42 +08:00
Michael Kamensky
7b1af4035d Merge branch 'attachNPEfix' into 'master'
AttachEffect: ChooseAnObject if list is empty and chosen is null, don't add to list

See merge request core-developers/forge!2556
2020-02-26 11:05:24 +00:00
Hans Mackowiak
931d08d3ac AttachEffect: ChooseAnObject if list is empty and chosen is null, don't add to list 2020-02-26 11:05:23 +00:00
Michael Kamensky
ea582088a6 Merge branch 'newBranch' into 'master'
Updated Sprite Buttons on Mobile Forge

See merge request core-developers/forge!2552
2020-02-26 04:00:34 +00:00
Sol
468dd46205 Merge branch 'bronzetablet' into 'master'
Bronze Tablet

Closes #37

See merge request core-developers/forge!2493
2020-02-25 16:39:46 +00:00
Tim Mocny
b03f263fce Bronze Tablet 2020-02-25 16:39:45 +00:00
Anthony Calosa
15b69d3d70 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-02-26 00:07:16 +08:00
Hans Mackowiak
8004892058 Merge branch '1298-wrong-player-controls-etb-trigger-of-clone' into 'master'
Resolve "Wrong player controls ETB trigger of Clone"

Closes #1302 and #1298

See merge request core-developers/forge!2553
2020-02-25 15:03:21 +00:00
Hans Mackowiak
f03e386399 Resolve "Wrong player controls ETB trigger of Clone" 2020-02-25 15:03:20 +00:00
Anthony Calosa
40478a45ac Update Icons 2020-02-25 18:43:57 +08:00
Anthony Calosa
01a17b4b2c Upscaled Zone Icons and FlipCard Icons 2020-02-25 12:23:04 +08:00
friarsol
63f958fa60 Some cleanup 2020-02-24 20:56:59 -05:00
Michael Kamensky
c916c4da31 Merge branch 'tempest_efreet' into 'master'
Tempest Efreet

Closes #115

See merge request core-developers/forge!2550
2020-02-24 09:01:45 +00:00
Tim Mocny
9e79d7810f Tempest Efreet 2020-02-24 09:01:44 +00:00
Michael Kamensky
0dbbcd4edc Merge branch 'newBranch' into 'master'
Upscaled Start Button

See merge request core-developers/forge!2549
2020-02-24 09:00:58 +00:00
Anthony Calosa
eb039b3bdd Update Start Button 2020-02-23 22:38:33 +08:00
Michael Kamensky
9be6a5a6a3 Merge branch 'newBranch' into 'master'
Add Support for HD Buttons on Mobile Forge

See merge request core-developers/forge!2547
2020-02-23 12:44:06 +00:00
Anthony Calosa
81c06f230a Add Support for Upscaling Buttons on Mobile Forge 2020-02-23 19:10:11 +08:00
Michael Kamensky
645a11f9c3 Merge branch 'master' into 'master'
Initial logic implementation for Mercenaries

See merge request core-developers/forge!2546
2020-02-23 05:19:38 +00:00
Agetian
68ca9ec622 - Initial logic implementation for Mercenaries 2020-02-23 08:14:48 +03:00
Michael Kamensky
b4883eb77e Merge branch 'mercenaries' into 'master'
Mercenaries!

See merge request core-developers/forge!2545
2020-02-23 04:39:16 +00:00
Tim Mocny
7e57ffb62d Mercenaries! 2020-02-23 04:39:14 +00:00
Michael Kamensky
820666b278 Merge branch 'fumble' into 'master'
Fumble - Ready!

See merge request core-developers/forge!2535
2020-02-23 04:31:23 +00:00
Tim Mocny
9d0c2968aa Fumble - Ready! 2020-02-23 04:31:23 +00:00
Michael Kamensky
d3f2b07c83 Merge branch 'emergencypowers' into 'master'
Emergency Powers Addendum

See merge request core-developers/forge!2544
2020-02-23 04:31:04 +00:00
Tim Mocny
57ebad948d Emergency Powers Addendum 2020-02-23 04:31:04 +00:00
Michael Kamensky
3f1b9df62a Merge branch '1290-trigger-needs-cleanup-after-cost-is-paid' into 'master'
Resolve "Trigger needs cleanup after cost is paid"

Closes #1290

See merge request core-developers/forge!2543
2020-02-22 14:46:44 +00:00
Hans Mackowiak
f990f19795 Resolve "Trigger needs cleanup after cost is paid" 2020-02-22 14:46:44 +00:00
Michael Kamensky
b2e1855949 Merge branch '1295-runtimeexception-abilityfactory-getability-startled-awake-has-no-svar-trigbounce' into 'master'
Resolve "RuntimeException: AbilityFactory : getAbility -- Startled Awake has no SVar: TrigBounce"

Closes #1295

See merge request core-developers/forge!2540
2020-02-22 11:10:19 +00:00
Hans Mackowiak
850e54fbbc Resolve "RuntimeException: AbilityFactory : getAbility -- Startled Awake has no SVar: TrigBounce" 2020-02-22 11:10:19 +00:00
Michael Kamensky
9931b33be7 Merge branch '1294-anax-hardened-in-the-forge-power-abnormal' into 'master'
Resolve "'Anax, Hardened in the Forge' power abnormal"

Closes #1294

See merge request core-developers/forge!2542
2020-02-22 10:17:40 +00:00
Hans Mackowiak
040518d094 Resolve "'Anax, Hardened in the Forge' power abnormal" 2020-02-22 10:17:40 +00:00
Michael Kamensky
823c651532 Merge branch 'master' into 'master'
Added puzzle PS_THB4 - Possibility Storm - Theros Beyond Death 04

See merge request core-developers/forge!2541
2020-02-22 10:17:32 +00:00