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 |
|
Anthony Calosa
|
7abbab5f42
|
Fix chooseEntitiesForEffect (Cards like Once Upon a Time, etc.. using this will work on network)
|
2020-04-11 15:06:00 +08:00 |
|
Michael Kamensky
|
9033bbd410
|
Merge branch 'oracle' into 'master'
Oracle changes - April 10
See merge request core-developers/forge!2685
|
2020-04-11 04:43:01 +00:00 |
|
Tim Mocny
|
8d96dd99fa
|
Oracle changes - April 10
|
2020-04-11 04:43:00 +00:00 |
|
Michael Kamensky
|
e327c74976
|
Merge branch 'otters' into 'master'
205.3 subtype lists - Lukka and Otter
See merge request core-developers/forge!2686
|
2020-04-11 04:42:45 +00:00 |
|
Tim Mocny
|
4319111c55
|
205.3 subtype lists - Lukka and Otter
|
2020-04-11 04:42:45 +00:00 |
|
Michael Kamensky
|
efaac25920
|
Merge branch 'c20.9' into 'master'
C20 - 9 April
See merge request core-developers/forge!2683
|
2020-04-11 04:40:39 +00:00 |
|
Tim Mocny
|
82ffc4e9d5
|
C20 - 9 April
|
2020-04-11 04:40:38 +00:00 |
|
Michael Kamensky
|
bda8c00e13
|
Merge branch 'iko9' into 'master'
IKO - 9 April
See merge request core-developers/forge!2682
|
2020-04-11 04:40:17 +00:00 |
|
Tim Mocny
|
e21d2408bb
|
IKO - 9 April
|
2020-04-11 04:40:17 +00:00 |
|
Michael Kamensky
|
aede20c610
|
Merge branch 'mirrodin' into 'master'
Mirrodin Besieged corrections
See merge request core-developers/forge!2684
|
2020-04-10 10:11:37 +00:00 |
|
Tim Mocny
|
205f3462b1
|
Mirrodin Besieged corrections
|
2020-04-10 10:11:37 +00:00 |
|
Michael Kamensky
|
742cfea656
|
Merge branch 'agitatorant' into 'master'
agitator_ant.txt
See merge request core-developers/forge!2679
|
2020-04-09 05:13:38 +00:00 |
|
Tim Mocny
|
7af1f7a452
|
agitator_ant.txt
|
2020-04-09 05:13:38 +00:00 |
|
Michael Kamensky
|
e649db6775
|
Merge branch 'iko8' into 'master'
IKO - 8 April
See merge request core-developers/forge!2680
|
2020-04-09 05:06:48 +00:00 |
|
Tim Mocny
|
461b72376f
|
IKO - 8 April
|
2020-04-09 05:06:47 +00:00 |
|
Michael Kamensky
|
9b03426f0e
|
Merge branch 'cache' into 'master'
Mana Cache!
Closes #81
See merge request core-developers/forge!2639
|
2020-04-09 05:06:11 +00:00 |
|
Tim Mocny
|
e1b14ecb51
|
Mana Cache!
|
2020-04-09 05:06:11 +00:00 |
|
Michael Kamensky
|
972327bd72
|
Merge branch 'iko7' into 'master'
IKO - 7 April
See merge request core-developers/forge!2676
|
2020-04-09 05:04:35 +00:00 |
|
Tim Mocny
|
db25466646
|
IKO - 7 April
|
2020-04-09 05:04:35 +00:00 |
|
Michael Kamensky
|
68ad5ad9c0
|
Merge branch 'typo' into 'master'
Random typo
See merge request core-developers/forge!2678
|
2020-04-09 05:04:12 +00:00 |
|
Tim Mocny
|
053fc12b35
|
Random typo
|
2020-04-09 05:04:12 +00:00 |
|
Michael Kamensky
|
5ec5cb5f7f
|
Merge branch 'newBranch' into 'master'
fix desktop generated name
See merge request core-developers/forge!2681
|
2020-04-09 05:03:59 +00:00 |
|
Anthony Calosa
|
ccf2abc391
|
fix desktop generated name
|
2020-04-09 08:46:37 +08:00 |
|
CCTV-1
|
d2e5eb133b
|
Merge remote-tracking branch 'upstream/master'
|
2020-04-08 08:47:11 +08:00 |
|
Michael Kamensky
|
5ba4ebbe38
|
Merge branch 'sld' into 'master'
SLD cards 59-62
Closes #1342
See merge request core-developers/forge!2677
|
2020-04-07 17:06:24 +00:00 |
|
Tim Mocny
|
5c1702c25b
|
SLD cards 59-62
|
2020-04-07 17:06:24 +00:00 |
|
Michael Kamensky
|
65da3d55a2
|
Merge branch 'newBranch' into 'master'
Update Disconnect button view
See merge request core-developers/forge!2675
|
2020-04-07 17:06:18 +00:00 |
|
Anthony Calosa
|
3e1fe53b77
|
Update Disconnect button view
|
2020-04-07 19:00:53 +08:00 |
|