CCTV-1
|
1f4f7fc7f4
|
translate mobile online screen
|
2020-04-15 14:05:05 +08:00 |
|
CCTV-1
|
e85ed216be
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-15 13:58:10 +08: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 |
|
Tim Mocny
|
4be26f575c
|
IKO - Mythos cycle tweaks
|
2020-04-13 04:42:16 +00:00 |
|
Sol
|
84519d10ea
|
Merge branch 'iko12' into 'master'
IKO - 12 April
See merge request core-developers/forge!2700
|
2020-04-13 01:26:11 +00:00 |
|
Tim Mocny
|
380a2649d0
|
IKO - 12 April
|
2020-04-13 01:26:11 +00:00 |
|
Sol
|
e555c577de
|
Merge branch 'iko11' into 'master'
IKO - 11 April
See merge request core-developers/forge!2694
|
2020-04-13 01:08:46 +00:00 |
|
Tim Mocny
|
377c0b6a9a
|
IKO - 11 April
|
2020-04-13 01:08:45 +00:00 |
|
Sol
|
63f0df433f
|
Merge branch 'ikoeditionsupdate' into 'master'
More complete IKO editions file - probably not final, but parsed from scryfall
See merge request core-developers/forge!2696
|
2020-04-13 00:56:40 +00:00 |
|
Sol
|
1fb56331f9
|
Merge branch 'typos' into 'master'
More typos
See merge request core-developers/forge!2699
|
2020-04-13 00:55:34 +00:00 |
|
Tim Mocny
|
5a348f06cd
|
More typos
|
2020-04-13 00:55:34 +00:00 |
|
austinio7116
|
d869d6b43f
|
Corrected edition type
|
2020-04-12 18:05:46 +01:00 |
|
Michael Kamensky
|
6e9827719b
|
Merge branch 'spellAbilityXPaid' into 'master'
SpellAbility: do xPaid inside spellAbility
See merge request core-developers/forge!2698
|
2020-04-12 15:19:04 +00:00 |
|
Hans Mackowiak
|
0d1105377e
|
SpellAbility: do xPaid inside spellAbility
|
2020-04-12 15:19:04 +00:00 |
|
Michael Kamensky
|
9b9f88129f
|
Merge branch 'iko10' into 'master'
IKO - 10 April
See merge request core-developers/forge!2687
|
2020-04-12 15:07:02 +00:00 |
|
Tim Mocny
|
d7d59d64b8
|
IKO - 10 April
|
2020-04-12 15:07:01 +00:00 |
|
austinio7116
|
015e51d668
|
More complete IKO editions file - probably not final, but parsed from scryfall
|
2020-04-12 12:32:21 +01:00 |
|
Sol
|
8f8fca8d80
|
Merge branch 'tormods' into 'master'
Tormod's Crypt fix
See merge request core-developers/forge!2691
|
2020-04-11 23:50:49 +00:00 |
|
Tim Mocny
|
81d8c42f29
|
Tormod's Crypt fix
|
2020-04-11 23:50:49 +00:00 |
|
Sol
|
630b9d3dd7
|
Merge branch 'counters' into 'master'
IKO - Counters revisions
See merge request core-developers/forge!2692
|
2020-04-11 23:50:29 +00:00 |
|
Tim Mocny
|
0db2e0d95b
|
IKO - Counters revisions
|
2020-04-11 23:50:29 +00:00 |
|
Sol
|
0be5a1180f
|
Merge branch 'newBranch' into 'master'
Fix chooseEntitiesForEffect, Fix Scry Crash (Desktop vs Mobile)
See merge request core-developers/forge!2688
|
2020-04-11 23:46:50 +00:00 |
|
Sol
|
079ad0223a
|
Merge branch 'typos' into 'master'
Typos
See merge request core-developers/forge!2690
|
2020-04-11 23:44:54 +00:00 |
|
Tim Mocny
|
bcdc3c849a
|
Typos
|
2020-04-11 23:44:54 +00:00 |
|
Hans Mackowiak
|
cb7d879abb
|
Merge branch '1358-choosegenericeffect-atrandom-param-update-needed' into 'master'
Resolve "ChooseGenericEffect AtRandom param update needed"
Closes #1358
See merge request core-developers/forge!2693
|
2020-04-11 20:48:04 +00:00 |
|
Hans Mackowiak
|
a0ea1f1d3f
|
ChooseGenericEffect: when using AtRandom with IsPresent Requirement add check when no choices left
|
2020-04-11 20:08:18 +02:00 |
|
Michael Kamensky
|
b4cc8421c5
|
Merge branch 'mythosCycle' into 'master'
IKO: Mythos cycle
See merge request core-developers/forge!2689
|
2020-04-11 10:21:38 +00:00 |
|
Hans Mackowiak
|
1ac8026b7f
|
IKO: Mythos cycle
|
2020-04-11 10:21:38 +00:00 |
|
Anthony Calosa
|
f68e3dee71
|
Fix crash for scry (desktop vs android) match
|
2020-04-11 17:44:30 +08:00 |
|