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 |
|
Anthony Calosa
|
8f99034a02
|
Fix crash
|
2020-04-03 19:01:03 +08:00 |
|
Anthony Calosa
|
d66700cbf3
|
Preference for Desktop
|
2020-04-03 18:47:33 +08:00 |
|
Anthony Calosa
|
bb62c0bebb
|
Preference
|
2020-04-03 18:00:44 +08:00 |
|
Anthony Calosa
|
13652e30ac
|
Add Elsa Serializer Option (Off by default)
|
2020-04-03 18:00:10 +08:00 |
|
Anthony Calosa
|
b7d93783c0
|
Update Netty to 4.1.48.Final
|
2020-04-03 17:56:57 +08:00 |
|
Anthony Calosa
|
5ba9f5f58f
|
Move Option
|
2020-04-03 16:36:13 +08:00 |
|
Anthony Calosa
|
fa93702bc8
|
fix android - pc network (disables elsa atm, needs investigation since this work before)
|
2020-04-03 12:53:43 +08:00 |
|
Anthony Calosa
|
c9c4d5492d
|
Use statelist and onclick listener so the buttons don't bug out
|
2020-04-03 10:58:03 +08:00 |
|
Anthony Calosa
|
bcec151b1d
|
button color pressed state
|
2020-04-03 09:43:25 +08:00 |
|
Anthony Calosa
|
4039c28140
|
Remade the instructions (much better way)
|
2020-04-03 09:04:55 +08:00 |
|
Anthony Calosa
|
a5ad3ad60a
|
Add faster way to access storage permission (app details)
|
2020-04-03 00:50:23 +08:00 |
|
Michael Kamensky
|
495257882b
|
Merge branch 'newBranch' into 'master'
Update LibGDX March 29, 2020, Use Google cache
See merge request core-developers/forge!2649
|
2020-04-02 13:17:58 +00:00 |
|
Anthony Calosa
|
58f6463a5d
|
Add reminder text on Storage Permission
The app displays message when it doesn't start properly because of Storage Permission
|
2020-04-02 18:20:01 +08:00 |
|
Michael Kamensky
|
65b7f2f4a3
|
Merge branch 'master' into 'master'
Added puzzles PS_THB8 and PS_THB9 - Possibility Storm - Theros Beyond Death 08 and 09.
See merge request core-developers/forge!2651
|
2020-04-02 09:30:49 +00:00 |
|
Agetian
|
ed67aafe2e
|
- Added puzzles PS_THB8 and PS_THB9.
|
2020-04-02 12:25:29 +03:00 |
|
Anthony Calosa
|
71cc16953c
|
Merge remote-tracking branch 'remotes/core/master' into newBranch
|
2020-04-02 12:24:28 +08:00 |
|
Anthony Calosa
|
9a1e467bb7
|
Update LibGDX March 29, 2020, Use Google cache
(reverted the cache so there's room for dependency like android-support-v4, permissions in the future,
lighter than cache2k)
|
2020-04-02 12:15:01 +08:00 |
|
Michael Kamensky
|
a4d9e1ef84
|
Merge branch 'silverbl' into 'master'
Silverblade Paladin detail cleanup
See merge request core-developers/forge!2648
|
2020-03-31 17:15:35 +00:00 |
|
Tim Mocny
|
41dbc468bd
|
Silverblade Paladin detail cleanup
|
2020-03-31 17:15:35 +00:00 |
|
Michael Kamensky
|
8a9984f7df
|
Merge branch 'newBranch' into 'master'
Fix Plane and Phenomenon not triggering when the player PlaneswalkTo/Encounter to it...
See merge request core-developers/forge!2646
|
2020-03-31 15:47:56 +00:00 |
|
Anthony Calosa
|
eca7ea2fbe
|
Fix Skybreen
|
2020-03-31 23:41:20 +08:00 |
|
Anthony Calosa
|
05e160cebe
|
Merge remote-tracking branch 'remotes/core/master' into newBranch
|
2020-03-31 23:15:33 +08:00 |
|
Anthony Calosa
|
447c3dff5a
|
Fix Plane and Phenomenon not triggering when the player PlaneswalkTo/Encounter to it...
|
2020-03-31 23:12:22 +08:00 |
|
Michael Kamensky
|
2dd97028b1
|
Merge branch 'tawnos' into 'master'
Tawnos's Coffin!
Closes #114
See merge request core-developers/forge!2637
|
2020-03-31 13:11:46 +00:00 |
|