Commit Graph

44312 Commits

Author SHA1 Message Date
Anthony Calosa
d24fa32175 add flash indicator for desktop 2020-04-18 05:57:17 +08:00
Anthony Calosa
1f7dade4f9 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-04-18 05:56:27 +08:00
Michael Kamensky
58e99ca69b Merge branch 'iko16' into 'master'
IKO edition - Yidaro rarity fix

See merge request core-developers/forge!2720
2020-04-17 15:05:11 +00:00
Tim Mocny
ca43cf8934 IKO edition - Yidaro rarity fix 2020-04-17 15:05:11 +00:00
Michael Kamensky
56d14d25eb Merge branch 'winota' into 'master'
★Winota

See merge request core-developers/forge!2707
2020-04-17 13:08:58 +00:00
Tim Mocny
bf548096f1 ★Winota 2020-04-17 13:08:57 +00:00
Michael Kamensky
e53e9a5bdf Merge branch 'iko14a' into 'master'
Extinction Event

See merge request core-developers/forge!2711
2020-04-17 11:53:34 +00:00
Northmoc
64f1ad9778 extinction_event.txt 2020-04-17 07:43:34 -04:00
Michael Kamensky
c3621cc8e6 Merge branch 'master' into 'master'
Added Ikoria planeswalker achievements by Marek.

See merge request core-developers/forge!2719
2020-04-17 06:32:53 +00:00
Agetian
250f4484ce - Added Ikoria planeswalker achievements by Marek. 2020-04-17 08:11:36 +03:00
Michael Kamensky
4d65ab429d Merge branch 'kathril' into 'master'
Kathril, Aspect Warper

See merge request core-developers/forge!2718
2020-04-17 03:54:54 +00:00
Tim Mocny
2cfb4917b1 Kathril, Aspect Warper 2020-04-17 03:54:54 +00:00
Michael Kamensky
4bcb516abd Merge branch 'ikoc20translation' into 'master'
Add IKO and C20 Card Translations

See merge request core-developers/forge!2717
2020-04-17 03:54:46 +00:00
Anthony Calosa
29c4d6d4d1 limit rotate transform to overlay and child objects 2020-04-17 06:54:14 +08:00
Michael Kamensky
a7b3d18f66 Merge branch 'c20.14' into 'master'
C20 - 14 April

See merge request core-developers/forge!2712
2020-04-16 16:46:01 +00:00
Tim Mocny
32256a398a C20 - 14 April 2020-04-16 16:46:01 +00:00
klaxnek
14e6baf455 Add IKO and C20 Card Translations
Fixed cardnamesTranslations.py to support adding new patched cards.
2020-04-16 18:19:59 +02:00
klaxnek
24e7cc7999 Merge remote-tracking branch 'core-developers/master' 2020-04-16 17:57:58 +02:00
Sol
210a6637bb Merge branch 'iko14b' into 'master'
IKO edition/booster update

See merge request core-developers/forge!2713
2020-04-16 01:13:51 +00:00
Tim Mocny
23688b281b IKO edition/booster update 2020-04-16 01:13:51 +00:00
Anthony Calosa
f968e310f2 allow startRotateTransform for child FdisplayObject 2020-04-16 08:09:22 +08:00
Anthony Calosa
afc55d4b2e Refactor updatePhase 2020-04-16 07:43:03 +08:00
Anthony Calosa
ebd0e12bee Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-04-15 17:48:41 +08:00
Anthony Calosa
bd6a1f3a2b Update 2020-04-15 16:46:24 +08:00
Michael Kamensky
ca6873d893 Merge branch 'fixTriggerNullAi' into 'master'
WrappedAbility: fix trigger not set for confirmTrigger

See merge request core-developers/forge!2716
2020-04-15 08:13:16 +00:00
Hans Mackowiak
759703bf56 WrappedAbility: fix trigger not set for confirmTrigger 2020-04-15 08:13:16 +00:00
Hans Mackowiak
d52d850c85 Merge branch 'callofdd' into 'master'
★Call of the Death-Dweller

See merge request core-developers/forge!2673
2020-04-15 07:16:28 +00:00
Tim Mocny
475ae289fd ★Call of the Death-Dweller 2020-04-15 07:16:27 +00:00
Anthony Calosa
427e34607d Prevent EmptyStackException 2020-04-15 13:43:58 +08:00
Anthony Calosa
2778318b10 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-04-15 12:49:58 +08:00
Anthony Calosa
102119679c Update Flash Icons
Add a helper icon for cards with flash or can be cast as though it had flash (if show ability icons is enabled)
2020-04-15 12:33:31 +08:00
Anthony Calosa
5467701fa0 Update Keyword Effects
Whenever a keyword is added/removed to the player, it will update the keyword card, and will auto remove it if its empty
2020-04-15 12:29:55 +08:00
Sol
d6dc081e42 Merge branch 'newBranch' into 'master'
Network Improvements

See merge request core-developers/forge!2701
2020-04-15 02:40:18 +00:00
Anthony Calosa
d87d825bce Network Improvements 2020-04-15 02:40:18 +00:00
Anthony Calosa
d4625864df Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-04-15 07:39:35 +08:00
Michael Kamensky
7ca5eee57e Merge branch 'iko13' into 'master'
IKO - 13 April

See merge request core-developers/forge!2704
2020-04-14 17:25:43 +00:00
Tim Mocny
38d708ce65 IKO - 13 April 2020-04-14 17:25:43 +00:00
Michael Kamensky
c6f1dc6bd1 Merge branch 'imagekeyrobustness' into 'master'
Alternative image lookup to avoid issues with multiple printings in a single...

See merge request core-developers/forge!2705
2020-04-14 06:27:07 +00:00
Michael Kamensky
aeb0bfc971 Merge branch 'counterPutChooser' into 'master'
CounterPutEffect: add Choicer Param

See merge request core-developers/forge!2709
2020-04-14 06:25:53 +00:00
Hans Mackowiak
f1690f2d84 CounterPutEffect: add Choicer Param 2020-04-14 06:25:53 +00:00
Anthony Calosa
e20c79fa4b Update 2020-04-14 10:10:53 +08:00
austinio7116
f6201d178e Alternative image lookup to avoid issues with multiple printings in a single edition - e.g. supporting loading *1.full.jpg if only .full.jpg is present, or loading the standard card if the promo is missing. 2020-04-13 17:47:30 +01:00
Anthony Calosa
17b2a2b023 Merge remote-tracking branch 'remotes/core/master' into newBranch 2020-04-13 22:21:25 +08:00
austinio7116
d17015cc88 Merge branch 'patch-5' into 'master'
Update ImageKeys.java to support .full images first art variant renaming optional

See merge request core-developers/forge!2703
2020-04-13 13:55:17 +00:00
Anthony Calosa
5649ac6d7d Update ImageKeys.java 2020-04-13 12:55:13 +00:00
Anthony Calosa
d1cc547239 Update ImageKeys.java to support .full images first art variant renaming optional 2020-04-13 12:51:23 +00:00
Michael Kamensky
ce1aca2674 Merge branch 'fixMaxTotalTargetCMC' into 'master'
SpellAbility: fix MaxTotalTargetCMC

Closes #1346

See merge request core-developers/forge!2702
2020-04-13 11:57:43 +00:00
Hans Mackowiak
f3729d0059 SpellAbility: fix MaxTotalTargetCMC 2020-04-13 11:57:43 +00:00
Anthony Calosa
d6c5d7f04d Network Improvements 2020-04-13 15:42:56 +08:00
Hans Mackowiak
fdd009908d Merge branch 'mythos2' into 'master'
IKO - Mythos cycle tweaks

See merge request core-developers/forge!2697
2020-04-13 04:42:16 +00:00