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
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
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
Sol
cb4a4d81ae
Merge branch 'iko5' into 'master'
...
IKO - 5 April
See merge request core-developers/forge!2664
2020-04-06 02:48:01 +00:00
Tim Mocny
349640a3a0
IKO - 5 April
2020-04-06 02:48:01 +00:00
Sol
c88399d7a0
Merge branch 'newBranch' into 'master'
...
Add network options, and some fixes during netplay,
See merge request core-developers/forge!2663
2020-04-06 02:45:15 +00:00
Anthony Calosa
aa86f8eae3
Forge constant for close command message
2020-04-06 09:21:10 +08:00
Anthony Calosa
b6408100e5
Merge remote-tracking branch 'remotes/core/master' into newBranch
2020-04-06 08:25:35 +08:00
Sol
88736fb3a7
Merge branch 'revert-93f1bb70' into 'master'
...
Revert "Merge branch 'keywordCounter' into 'master'"
See merge request core-developers/forge!2668
2020-04-06 00:11:34 +00:00
Sol
8523288884
Revert "Merge branch 'keywordCounter' into 'master'"
...
This reverts merge request !2667
2020-04-05 23:56:37 +00:00
Anthony Calosa
3d46a6e809
Merge remote-tracking branch 'remotes/core/master' into newBranch
2020-04-06 06:15:52 +08:00
Anthony Calosa
c82ed43c69
Update description
2020-04-06 05:18:53 +08:00
Anthony Calosa
9edaa9561e
Add Disconnect for Mobile
2020-04-06 05:02:25 +08:00
Michael Kamensky
93f1bb70b4
Merge branch 'keywordCounter' into 'master'
...
Keyword counter
Closes #1338
See merge request core-developers/forge!2667
2020-04-05 20:13:43 +00:00
Hans Mackowiak
3bb42a95c9
CounterPutEffect: add Choices with inbuilt ChosenCard Effect
2020-04-05 21:57:32 +02:00
Hans Mackowiak
6ce62b7316
Keyword Counter: special counters add keywords to cards
2020-04-05 17:29:21 +02:00
Michael Kamensky
e40388c244
Merge branch 'C2020-3' into 'master'
...
C20 - Jirina & Kalamax
See merge request core-developers/forge!2659
2020-04-05 09:03:18 +00:00
Tim Mocny
8eab842416
C20 - Jirina & Kalamax
2020-04-05 09:03:18 +00:00
Michael Kamensky
4febc835e3
Merge branch 'grammar' into 'master'
...
Little grammar fix
See merge request core-developers/forge!2660
2020-04-05 09:02:27 +00:00
Tim Mocny
56dbb45d63
Little grammar fix
2020-04-05 09:02:26 +00:00
Michael Kamensky
3b50a9ef8b
Merge branch 'iko4' into 'master'
...
IKO - 4 April
See merge request core-developers/forge!2661
2020-04-05 09:02:24 +00:00
Tim Mocny
ba3e8de481
IKO - 4 April
2020-04-05 09:02:24 +00:00
Anthony Calosa
a18f142add
Update SettingsPage Desktop
2020-04-05 12:34:56 +08:00
Anthony Calosa
c2e4888711
Merge remote-tracking branch 'origin/newBranch' into newBranch
2020-04-05 11:43:49 +08:00
Anthony Calosa
b466ff38a3
Update SettingsPage
2020-04-05 11:41:21 +08:00
Anthony Calosa
96ce695aae
Remove unnecessary lines
2020-04-05 01:15:09 +00:00
Anthony Calosa
52307c02d0
Add option to turn on Experimental Network Compatibility
...
the user can try to turn on this option to test compatibility, defaults to OFF
2020-04-05 07:14:03 +08:00
