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
Michael Kamensky
0b9a9fc2a9
Merge branch 'iko6' into 'master'
...
IKO - 6 April
See merge request core-developers/forge!2671
2020-04-07 04:21:17 +00:00
Tim Mocny
86ff6b402a
IKO - 6 April
2020-04-07 04:21:17 +00:00
Michael Kamensky
c43b14f850
Merge branch 'newBranch' into 'master'
...
Fix 180 rotation bug on Mobile
See merge request core-developers/forge!2670
2020-04-07 04:18:59 +00:00
Anthony Calosa
45b1e825e1
Fix 180 rotation bug on Mobile
...
(to repro, create local game human vs human, 2nd player will be rotated as usual, concede and
create a network game again, human vs human, or human vs AI)
2020-04-06 21:32:05 +08:00
CCTV-1
fa96bd5b5d
fix grammar errors
2020-04-06 18:30:54 +08:00
CCTV-1
6c671eaf9d
update translations
2020-04-06 18:24:03 +08:00
CCTV-1
190be3f7ea
translate new option
2020-04-06 18:23:37 +08:00
CCTV-1
7642d588a4
Merge remote-tracking branch 'upstream/master'
2020-04-06 18:12:05 +08:00
Hans Mackowiak
a43b2a859b
Merge branch 'revert-88736fb3' into 'master'
...
Keyword counter MK2
See merge request core-developers/forge!2669
2020-04-06 05:27:39 +00:00
Hans Mackowiak
5c79cb7de6
Revert "Merge branch 'revert-93f1bb70' into 'master'"
...
This reverts merge request !2668
2020-04-06 05:27:39 +00:00
Sol
b80d499a36
Merge branch 'startDuelSound' into 'master'
...
Start duel sound + correction in Unstable edition file (3 missing tokens)
See merge request core-developers/forge!2666
2020-04-06 02:48:25 +00:00
BlueWizard
0b5c70b4bd
Start duel sound + correction in Unstable edition file (3 missing tokens)
2020-04-06 02:48:25 +00:00
