Commit Graph

2663 Commits

Author SHA1 Message Date
Anthony Calosa
c3dd154ef5 Fix duplicate dependencies
-xstream greater than 1.4.9 needs higher android.jar (would remove support for devices lower than Android 8 unless we use the java 7 variant), latest guava and maybe other higher libs needs desugaring for android to work.
2021-03-24 10:22:43 +08:00
Anthony Calosa
e4a0ce9165 [Mobile] Preferred Art Options 2021-03-22 21:46:39 +08:00
Leandro Doctors
5d8bbf8687 Merge branch 'rename-assets-to-skin' into 'master'
refactor: rename 'assets' package to 'skin'

See merge request core-developers/forge!4223
2021-03-20 17:58:15 +00:00
Anthony Calosa
39b356bcac [Mobile] refactor loading overlay on deck editor/chooser
- only show the overlay if it needs initializing/refreshing on the catalog/collection page
2021-03-20 19:07:35 +08:00
Anthony Calosa
1e766b8662 [Mobile] minor improvements 2021-03-20 15:21:15 +08:00
Anthony Calosa
3995a20a81 limit usage 2021-03-20 04:26:16 +08:00
Leandro Doctors
993fb3b518 refactor: rename 'assets' package to 'skin' 2021-03-19 14:27:10 -03:00
Anthony Calosa
0501ac9735 update imports 2021-03-18 17:24:44 +08:00
Anthony Calosa
f71e31c3a8 Merge remote-tracking branch 'core/master' into rollback_Phase_dev
# Conflicts:
#	forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
#	forge-gui-mobile/src/forge/screens/match/MatchController.java
#	forge-gui/src/main/java/forge/gamemodes/net/server/NetGuiGame.java
#	forge-gui/src/main/java/forge/gui/interfaces/IGuiGame.java
2021-03-18 17:19:08 +08:00
Leandro Doctors
0978162bf5 Organize imports 2021-03-17 11:52:50 -03:00
Leandro Doctors
f3fd57c014 fixup! Merge branch 'reorganize-forge-gui' into 'master' 2021-03-17 11:50:26 -03:00
Leandro Doctors
fe76d8b934 refactor: group gui-related packages
This is just a first step...
Probably there are many other classes that should be either completely
added here, or decomposed and partially added here.
2021-03-17 11:18:16 -03:00
Leandro Doctors
92110c1931 refactor: group game modes-related packages 2021-03-17 11:10:41 -03:00
Leandro Doctors
df64f5574d refactor: group local instance-related packages
forge-gui-desktop/src/main/java/forge/itemmanager/views/ImageView.java
forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
2021-03-17 11:10:41 -03:00
Michael Kamensky
1cd7e4e234 - An option to exclude promos from quest reward pool 2021-03-14 09:53:10 +03:00
Anthony Calosa
68ecf41511 [Mobile] add Experimental Rollback Phase 2021-03-14 11:57:20 +08:00
Lyu Zong-Hong
7e150fcfc4 Fix TextRenderer bug when hiding reminder texts 2021-03-13 12:50:00 +09:00
Lyu Zong-Hong
3803f80938 Update Japanese Translations 2021-03-13 12:21:34 +09:00
Michael Kamensky
0ecbc3732e Merge branch 'master' into 'master'
Net Deck Archive Block (Desktop & Android)

See merge request core-developers/forge!4175
2021-03-11 14:30:13 +00:00
Anthony Calosa
6594c7f009 [Mobile] fix copying commander netdeck to clipboard
- resolves an issue that you can't copy to clipboard commander netdecks and import it again since "Commander" is a decksection
2021-03-11 21:42:44 +08:00
Churrufli
b2634686e6 Net Deck Archive Block (Desktop & Android) 2021-03-11 13:06:46 +01:00
Anthony Calosa
b1e6521d53 [Mobile] update FDeckChooser
- select the index as workaround to refresh the display for other deck category
2021-03-11 18:59:54 +08:00
Anthony Calosa
5f4a1f1a49 [Mobile] fix netdecks not loading decks imageview on activation
- Adds a different method to select the netdeck category on imageview
2021-03-11 12:23:24 +08:00
Anthony Calosa
bd02ac4c0c Revert "Merge branch 'master' into 'master'"
This reverts merge request !4165
2021-03-10 15:20:26 +00:00
Anthony Calosa
33e5fa7115 refresh on activate when imageview 2021-03-10 22:44:54 +08:00
Anthony Calosa
7daf310959 [Mobile] Fix deck selection and generated commander decks with images 2021-03-10 21:26:48 +08:00
Anthony Calosa
2d51428123 Update digital sets 2021-03-10 19:17:50 +08:00
Anthony Calosa
92a2bf68f7 Update Edition Types 2021-03-10 12:06:22 +08:00
Anthony Calosa
0394b65f43 Update Deck ImageView
- [Desktop] double right click / [Mobile] multiple tap - add deck to favorites
2021-03-10 09:30:12 +08:00
Anthony Calosa
0d35f4806e [Mobile] Fix AI selected decks on activate 2021-03-08 11:21:54 +08:00
Anthony Calosa
6c0f63039e [Mobile] Revert deck chooser activation 2021-03-08 10:37:13 +08:00
Michael Kamensky
7d47cf2a06 - Preparing Forge for Android publish 1.6.39.001 [incremental]. 2021-03-07 08:12:56 +03:00
Michael Kamensky
cbc0051f8a [maven-release-plugin] prepare for next development iteration 2021-03-07 08:00:39 +03:00
Michael Kamensky
0437e9354b [maven-release-plugin] prepare release forge-1.6.39 2021-03-07 08:00:30 +03:00
Lyu Zong-Hong
84d2f43265 Fix crash issue in TextRenderer 2021-03-06 21:15:33 +09:00
Michael Kamensky
4474a7f6d2 Merge branch 'fix_cjk_text_wrap' into 'master'
[Mobile] Fix CJK text line wrap for Android/Mobile port

See merge request core-developers/forge!4119
2021-03-06 09:36:02 +00:00
Alumi
f6569872ce [Mobile] Fix CJK text line wrap for Android/Mobile port 2021-03-06 09:36:02 +00:00
Lyu Zong-Hong
bace635203 Update CJK font list 2021-03-06 17:49:05 +09:00
Lyu Zong-Hong
6ba389149c Refresh skins and fonts list after download them 2021-03-06 09:32:18 +09:00
Anthony Calosa
3d0a7a9c93 [Android] Fix startup with CJK Fonts 2021-03-06 06:15:16 +08:00
Anthony Calosa
b6f27ad512 Add castable cards available from command
- if somehow you have a lot of cards mixed in graveyard or exile, this will be an easier way to find them
2021-03-05 18:31:59 +00:00
Lyu Zong-Hong
9ae07284d8 Add CJK font setting and dowloader for mobile port 2021-03-05 20:25:07 +09:00
Anthony Calosa
af4ea4fa9a update android check for FileUriExposedException 2021-03-05 03:36:56 +00:00
Anthony Calosa
e030e28d80 [Mobile] Add support for viewing both sides of facedown DFC 2021-03-05 01:53:14 +08:00
Anthony Calosa
47bfda3510 [Mobile] fix stack description 2021-03-04 18:41:15 +08:00
Michael Kamensky
ab537a9e69 Merge branch 'donot_translation_token' into 'master'
do not translation non card clone token

See merge request core-developers/forge!2478
2021-03-04 03:46:46 +00:00
Anthony Calosa
17944c0e41 Add Disable Card Images Option 2021-03-04 02:15:16 +08:00
Anthony Calosa
36e55ae72f Add option to enable/disable Non-Legal Cards
Playtest and Un-sets Cards
2021-03-03 22:29:44 +08:00
CCTV-1
31f9503af8 Merge remote-tracking branch 'upstream/master' into donot_translation_token 2021-03-03 12:31:55 +08:00
Churrufli
12ff52e051 Net Deck Archive Categories fix 2021-03-02 18:48:15 +01:00