Commit Graph

44606 Commits

Author SHA1 Message Date
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
CCTV-1
d3e83b2601 translate new option 2020-04-02 21:35:12 +08:00
CCTV-1
0aee987536 Merge remote-tracking branch 'upstream/master' 2020-04-02 21:32:41 +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
Tim Mocny
24db729e96 Tawnos's Coffin! 2020-03-31 13:11:46 +00:00
Michael Kamensky
c10c9f441f Merge branch 'newBranch' into 'master'
Fix stack description

See merge request core-developers/forge!2645
2020-03-31 07:51:33 +00:00
Anthony Calosa
6bf72e6828 space 2020-03-31 14:49:24 +08:00
Anthony Calosa
bf7b446586 period 2020-03-31 14:46:42 +08:00
Anthony Calosa
ec463b414f Refactor description 2020-03-31 14:44:37 +08:00
Anthony Calosa
faf8c57907 Fix stack description
Fix "null damage" & "null counter" stack description, and Volcano Hellion crash
2020-03-31 13:36:45 +08:00
Michael Kamensky
7b90b6a801 Merge branch 'faerieart' into 'master'
Faerie Artisans - trigger tidying

See merge request core-developers/forge!2642
2020-03-31 05:03:55 +00:00
Tim Mocny
cd8410e87a Faerie Artisans - trigger tidying 2020-03-31 05:03:55 +00:00
Michael Kamensky
7dbf6519a0 Merge branch 'nissapilgfix' into 'master'
Nissa's Pilgrimage fix

See merge request core-developers/forge!2641
2020-03-31 05:03:35 +00:00
Tim Mocny
9811eedfc5 Nissa's Pilgrimage fix 2020-03-31 05:03:34 +00:00
Michael Kamensky
e337107575 Merge branch 'narcomofix' into 'master'
narcomoeba.txt fix

See merge request core-developers/forge!2640
2020-03-31 05:02:47 +00:00
Tim Mocny
70b7af6f16 narcomoeba.txt fix 2020-03-31 05:02:47 +00:00
Michael Kamensky
17584a03f1 Merge branch 'newBranch' into 'master'
Add preference to enable/disable loading of Unknown Cards.

See merge request core-developers/forge!2644
2020-03-31 05:01:51 +00:00
Michael Kamensky
2472db72ca Merge branch 'fix-multiplayer-crash' into 'master'
A player who lost cannot initiate combat

Closes #1255

See merge request core-developers/forge!2643
2020-03-31 05:01:24 +00:00
Anthony Calosa
e57e87d3c2 Fix double "- - " on stack description 2020-03-31 12:01:57 +08:00
Anthony Calosa
7c9849f845 Add preference to enable/disable loading of Unknown Cards.
If a user don't wants to load a certain cards from deleted set/s in edition folder,
you can do so by disabling this option.
2020-03-31 10:54:27 +08:00
friarsol
1c61030aae A player who lost cannot initiate combat 2020-03-30 21:40:46 -04:00
Sol
bd8b136b2b Merge branch 'pyramids' into 'master'
Pyramids!

Closes #95

See merge request core-developers/forge!2635
2020-03-29 02:39:47 +00:00
Tim Mocny
4bb0bcfa90 Pyramids! 2020-03-29 02:39:46 +00:00
Sol
084a9812a7 Merge branch 'draftable' into 'master'
More CN2 "draft matters" draftable

See merge request core-developers/forge!2632
2020-03-29 02:38:49 +00:00
Tim Mocny
65947bee28 More CN2 "draft matters" draftable 2020-03-29 02:38:48 +00:00
Sol
10acab8bb9 Merge branch 'naturalunity' into 'master'
Natural Unity fix

See merge request core-developers/forge!2634
2020-03-29 02:38:16 +00:00
Tim Mocny
eb03c01cb0 Natural Unity fix 2020-03-29 02:38:16 +00:00
Sol
9f8f7f132a Merge branch 'perimeter' into 'master'
Hold the Perimeter!

Closes #67

See merge request core-developers/forge!2631
2020-03-29 02:37:37 +00:00
Tim Mocny
62aec9956e Hold the Perimeter! 2020-03-29 02:37:36 +00:00
Michael Kamensky
9376ba3429 Merge branch 'mb1tweak' into 'master'
MB1 printsheets tweak

See merge request core-developers/forge!2630
2020-03-27 09:34:28 +00:00
Tim Mocny
7f8ddb0cab MB1 printsheets tweak 2020-03-27 09:34:28 +00:00
Michael Kamensky
dd3c93287e Merge branch 'latestbling' into 'master'
Editions files for SLU and SS3

See merge request core-developers/forge!2624
2020-03-26 04:19:05 +00:00
Tim Mocny
6da9d86b1b Editions files for SLU and SS3 2020-03-26 04:19:04 +00:00
Michael Kamensky
ad4d429aff Merge branch 'typo' into 'master'
SLD edition typo - rogue comma

See merge request core-developers/forge!2629
2020-03-26 04:18:26 +00:00
Tim Mocny
051e607724 SLD edition typo - rogue comma 2020-03-26 04:18:25 +00:00