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
Anthony Calosa
c714187eee
Refactor Object Decoder/Encoder
...
Prevent crash on netplay
2020-04-05 07:07:30 +08:00
Anthony Calosa
9f1b93373d
Refactor check permission without supportv4 dependency
2020-04-05 07:02:13 +08:00
Michael Kamensky
eeacdf6c80
Merge branch 'fixCyclingZero' into 'master'
...
GameActionUtil: fix CyclingForZero
Closes #1341
See merge request core-developers/forge!2662
2020-04-04 14:17:47 +00:00
Hans Mackowiak
bf60039ee7
GameActionUtil: fix CyclingForZero
2020-04-04 14:17:47 +00:00
Michael Kamensky
3eb322222a
Merge branch 'lukka' into 'master'
...
lukka_coppercoat_outcast.txt
Closes #1340
See merge request core-developers/forge!2655
2020-04-04 11:00:41 +00:00
Tim Mocny
ef95d3eab9
lukka_coppercoat_outcast.txt
2020-04-04 11:00:41 +00:00
Michael Kamensky
829e49a2ba
Merge branch 'patch-9' into 'master'
...
Mobile: Remove duplicated Enable Unknown Cards in SettingsPage.java
See merge request core-developers/forge!2657
2020-04-04 10:59:54 +00:00
Michael Kamensky
0a768211b9
Merge branch 'MTGA_Cube' into 'master'
...
support mtga cube
See merge request core-developers/forge!2658
2020-04-04 10:59:23 +00:00
CCTV-1
d0bdeec832
support mtga cube
2020-04-04 18:03:12 +08:00
klaxnek
9047168a3f
Remove duplicated Enable Unknown Cards in SettingsPage.java
2020-04-04 09:14:47 +00:00
Michael Kamensky
5cf56e12c3
Merge branch 'iko2' into 'master'
...
Ikoria round 1
See merge request core-developers/forge!2654
2020-04-04 03:52:01 +00:00
Tim Mocny
a67deeda15
Ikoria round 1
2020-04-04 03:52:00 +00:00
Michael Kamensky
0b2a1ce44a
Merge branch 'zilortha' into 'master'
...
Zilortha, Strength Incarnate
Closes #1337
See merge request core-developers/forge!2653
2020-04-04 03:51:32 +00:00
Tim Mocny
5ab7bcaf3f
Zilortha, Strength Incarnate
2020-04-04 03:51:32 +00:00
Michael Kamensky
18bd6ec204
Merge branch 'newBranch' into 'master'
...
Add simple instructions for permission and Netty update
See merge request core-developers/forge!2652
2020-04-04 03:51:01 +00:00
Anthony Calosa
da984227b1
Use Netty Default Object Decoder/Encoder
2020-04-03 21:35:05 +08:00
Anthony Calosa
bd5cc06504
remove unused imports
2020-04-03 19:02:48 +08:00
