Commit Graph

4900 Commits

Author SHA1 Message Date
Alumi
92d9bebc58 Add Japanese localization and fix split card view 2021-02-19 04:05:22 +00:00
Northmoc
53fa576d64 skinshifter.txt and CharmEffect.java support 2021-02-18 19:51:08 -05:00
Hans Mackowiak
38b584d431 ChangeZoneEffect: add WithCountersType for non Battlefield 2021-02-18 15:13:30 +01:00
Michael Kamensky
df61b15f8e Merge branch 'fixLivio' into 'master'
Livio, Oathsworn Sentinel: fix first ability by adding Chooser to known origin

See merge request core-developers/forge!3886
2021-02-18 09:41:09 +00:00
Michael Kamensky
7443cac601 Merge branch 'excess' into 'master'
Fix excess damage calculation

See merge request core-developers/forge!3883
2021-02-18 05:16:42 +00:00
Michael Kamensky
d47c1a55f8 Merge branch 'iguana' into 'master'
Impatient Iguana

See merge request core-developers/forge!3884
2021-02-18 05:16:06 +00:00
Michael Kamensky
195669fe77 Merge branch 'geometric' into 'master'
Geometric Weird

See merge request core-developers/forge!3879
2021-02-18 05:15:59 +00:00
Michael Kamensky
c2e31a28dc Merge branch 'vazal' into 'master'
Vazal the Compleat

See merge request core-developers/forge!3882
2021-02-18 05:14:49 +00:00
tool4EvEr
3fdb0c6d44 Add Chooser to known Origin for Livio 2021-02-17 19:32:26 +01:00
Adam Pantel
eeb3284f1b Impatient Iguana 2021-02-17 13:23:51 -05:00
Adam Pantel
9af2f4b17e Fix excess damage calculation 2021-02-17 11:49:19 -05:00
Adam Pantel
18921e954a Mirrored Lotus 2021-02-17 10:14:13 -05:00
Adam Pantel
36313ca4e2 Geometric Weird 2021-02-17 09:38:35 -05:00
Adam Pantel
6c3f1e5f2f Vazal the Compleat 2021-02-17 09:33:32 -05:00
Michael Kamensky
6bd7d027e5 Merge branch 'reveal_foretold_endgame' into 'master'
Reveal foretold cards and other face-down cards when a player leaves the game or the game ends

See merge request core-developers/forge!3865
2021-02-17 04:07:59 +00:00
Alumi
3ff19f7957 Reveal foretold cards and other face-down cards when a player leaves the game or the game ends 2021-02-17 04:07:59 +00:00
Anthony Calosa
cddd0f6fb3 updateMergeCollections 2021-02-17 10:50:25 +08:00
Bug Hunter
64c1f2dec9 Fix ExcludedDestinations logic 2021-02-16 16:29:55 +00:00
Hans Mackowiak
54f1767d01 Merge branch 'fixCantBeCast' into 'master'
Fix CantBeCast Origin check

See merge request core-developers/forge!3864
2021-02-16 08:47:11 +00:00
tool4EvEr
79d69ce4e7 Fix CantBeCast Origin 2021-02-15 22:17:12 +01:00
Michael Kamensky
ed6200b999 Merge branch 'fixCascade' into 'master'
Add new cascade ruling

See merge request core-developers/forge!3850
2021-02-15 20:15:24 +00:00
Michael Kamensky
dbdef270aa Merge branch 'fix_imprint_mutate' into 'master'
Fix imprint cards that are not working correctly with mutate

See merge request core-developers/forge!3844
2021-02-15 17:48:41 +00:00
tool4EvEr
76d3b089f7 Add new cascade ruling 2021-02-15 17:41:11 +01:00
Adam Pantel
e374769016 Fix static cleanup triggers 2021-02-15 10:29:46 -05:00
Michael Kamensky
1b770df558 Merge branch 'fix_subgame_mutate' into 'master'
Handle mutate and subgame interaction

See merge request core-developers/forge!3846
2021-02-15 08:23:52 +00:00
Lyu Zong-Hong
88faa0ee5f Handle mutate and subgame interaction 2021-02-15 17:14:06 +09:00
Hans Mackowiak
b6a2232776 fix copied trigger 2021-02-15 08:38:29 +01:00
Lyu Zong-Hong
2ff7d25a85 Fix imprint cards that are not working correctly with mutate 2021-02-15 15:49:20 +09:00
Hans Mackowiak
78d41c7da8 Merge branch 'fix_spell_ability_mutate' into 'master'
Fix some spells that is not working correctly with mutated creatures

See merge request core-developers/forge!3841
2021-02-15 06:47:00 +00:00
Anthony Calosa
14da7efe1d [Mobile] add zoom view for mutated cards 2021-02-15 13:38:07 +08:00
Lyu Zong-Hong
8b43b24eb1 Fix some spells that is not working correctly with mutated creatures 2021-02-15 14:02:12 +09:00
Hans Mackowiak
a624cf565a GameAction: copy changed card traits when moving to stack 2021-02-14 15:21:12 +01:00
Hans Mackowiak
0bf7770cf1 Merge branch 'fixCountersAddedThisTurn' into 'master'
Enable Trigger/Replacements to use CountersAddedThisTurn

See merge request core-developers/forge!3821
2021-02-14 02:01:12 +00:00
Northmoc
bc5dce6fad remove old unwanted boolean 2021-02-13 20:18:10 -05:00
Northmoc
6749aa271b remove bad Override 2021-02-13 20:17:43 -05:00
Tim Mocny
d7f0665bae Nethroi (IKO) 2021-02-14 00:57:22 +00:00
tool4EvEr
46525a2369 Enable Trigger/Replacements to use CountersAddedThisTurn 2021-02-13 23:17:45 +01:00
Sol
dbcc277abb Merge branch 'mutate' into 'master'
Mutate

See merge request core-developers/forge!3772
2021-02-13 20:13:37 +00:00
Michael Kamensky
da6bf2c358 [maven-release-plugin] prepare for next development iteration 2021-02-13 18:00:08 +03:00
Michael Kamensky
0503686649 [maven-release-plugin] prepare release forge-1.6.38 2021-02-13 17:59:59 +03:00
Hans Mackowiak
543fa42b29 EffectEffect: fix trigger on Effects 2021-02-13 07:58:14 +01:00
Lyu Zong-Hong
39659f40c1 Also imprint all merged components 2021-02-13 15:01:36 +09:00
Michael Kamensky
2f8433eb9e [maven-release-plugin] prepare for next development iteration 2021-02-13 08:49:39 +03:00
Michael Kamensky
ab8502e86c [maven-release-plugin] prepare release forge-1.6.37 2021-02-13 08:49:30 +03:00
Lyu Zong-Hong
d099ea0828 Minor fixes 2021-02-13 10:36:44 +09:00
Adam Pantel
1103b36479 Some minor cleanup 2021-02-12 21:21:29 +00:00
Lyu Zong-Hong
7938e6bb84 Fix triggered object issue 2021-02-13 00:09:55 +09:00
Lyu Zong-Hong
bca0282cae Merge branch 'master' into mutate 2021-02-12 22:32:58 +09:00
Lyu Zong-Hong
58f27c4466 Fix commander damage record and view, also other bugs 2021-02-12 22:25:47 +09:00
Hans Mackowiak
6ed3f8ab3e Merge branch 'fixCards' into 'master'
Update more cards with ValidSA

See merge request core-developers/forge!3804
2021-02-12 13:22:41 +00:00