Commit Graph

3490 Commits

Author SHA1 Message Date
Anthony Calosa
d4a28c0e7b uncomment 2021-05-24 16:23:23 +08:00
Anthony Calosa
0e50de91b4 cleanup 2021-05-24 16:22:09 +08:00
Anthony Calosa
aca091e3c3 [Mobile] Refactor preloading ItemPool
Dont preload ItemPool on Android devices with less than 5GB RAM and Desktop/Mobile port
2021-05-24 16:09:40 +08:00
leriomaggio
c03da7eb74 Revert to CollectorNumber in PaperCard as String to handle cases of mulitple art (e.g. 21a). 2021-05-23 16:52:12 +01:00
leriomaggio
a0c126f39e Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-05-23 14:50:49 +01:00
leriomaggio
354d184664 Display new collectorNumber info in Column List view for cards
This addresses Issue #1846
Further changes are due to CardEditions missing collector number information
2021-05-23 14:45:29 +01:00
leriomaggio
fbbae218c0 Integration with PaperCard CollectorNumber, and FIX to new Scryfall API specs 2021-05-23 14:33:48 +01:00
tool4EvEr
6618f71297 PlayEffect: avoid confirmAction 2021-05-21 23:03:33 +02:00
Michael Kamensky
37e5dda38f Merge branch 'npefix' into 'master'
chooseSomeType: Fix NPE

See merge request core-developers/forge!4715
2021-05-20 04:53:12 +00:00
tool4EvEr
6f9d557a64 Clean up 2021-05-19 16:29:38 +02:00
tool4EvEr
ce3bab8a33 Fix for Temporal Extortion 2021-05-19 00:09:55 +02:00
tool4EvEr
ac7fc21db5 Fix NPE 2021-05-18 22:58:56 +02:00
tool4EvEr
4aafafb5bd Minor cleanup 2021-05-16 12:52:02 +02:00
Hans Mackowiak
ff7f81c307 Card property targeted player 2021-05-15 15:27:15 +00:00
Michael Kamensky
ab3b682c47 Merge branch 'tokencards' into 'master'
Add Time Sidewalk and Bone Rattler

See merge request core-developers/forge!4690
2021-05-11 16:48:08 +00:00
Hythonia
84a7b79e3c Add Time Sidewalk and Bone Rattler 2021-05-11 09:12:05 +02:00
Michael Kamensky
8440f72e9e Merge branch 'cascade' into 'master'
PlayAi confirmAction only when card is worth it

See merge request core-developers/forge!4661
2021-05-09 04:01:22 +00:00
Alumi
fe95ad2e11 Refactor Damage Prevention - Step 2 2021-05-08 13:57:03 +00:00
tool4EvEr
3ab7886eab Refactor confirmAction 2021-05-07 18:14:20 +02:00
Anthony Calosa
99b2cbb606 [Mobile] add Alternate Player Zone Layout (Landscape) 2021-05-05 11:34:36 +08:00
friarsol
b21e4f5296 Fix AutoUpdater to point to the new snapshot location 2021-05-03 21:32:55 -04:00
Michael Kamensky
90afe81856 Merge branch 'modaloption' into 'master'
Add preference how to display alternate card states in deck views

See merge request core-developers/forge!4625
2021-05-02 14:25:36 +00:00
Bug Hunter
c13e379908 Add preference how to display alternate card states in deck views 2021-05-02 14:25:35 +00:00
Anthony Calosa
6d31a2f656 Update GuiDownloadZipService.java 2021-05-01 14:27:02 +00:00
Anthony Calosa
fa4e4cb2bb [Mobile] ExceptionInInitializerError (forge.screens.FScreen in <init>)
- it seems it was trying to draw the bug reporter interface while ending the graphics if sentry is not enabled
2021-05-01 13:15:10 +08:00
Anthony Calosa
9fee1fda1e update order Message 2021-04-30 22:21:56 +08:00
Anthony Calosa
77e56e8da9 [Android] don't load forge.profile.properties when the user is using the obb directory
- until google permits unrestricted access outside the app-specific directory on certain apps via flag, the option to use obb as entrypoint is required since accessing outside the scoped storage is really not recommended (https://issuetracker.google.com/issues?q=scoped%20storage%20slow).
2021-04-27 21:04:51 +08:00
Anthony Calosa
d227da0c10 refactor getStartingPlaneswalkerOptions 2021-04-25 11:49:05 +08:00
Michael Kamensky
9b83c78346 Merge branch 'conquest' into 'master'
Allow cards from precon products in Planar Conquest

See merge request core-developers/forge!4573
2021-04-24 07:36:12 +00:00
Lyu Zong-Hong
2d7e88a8c2 Update in-game text and also English and Japanese localization 2021-04-23 11:01:34 +09:00
Anthony Calosa
345316b9b0 update check 2021-04-23 09:12:02 +08:00
Northmoc
e8c0655186 allow precon cards in Planar Conquest 2021-04-22 12:18:42 -04:00
tool4EvEr
2fe9c38fff Fix mana conversion checking wrong card from hand 2021-04-20 20:21:39 +02:00
Bug Hunter
b7a475cc0a Temporary clones: restore Remembered/Imprinted 2021-04-20 04:00:41 +00:00
Adam Pantel
17b5098602 Costs should trigger Ranar/Laelia 2021-04-18 04:19:32 +00:00
Adam Pantel
b33e262de6 Ranar v2 2021-04-17 04:22:25 +00:00
Anthony Calosa
fffd2afe5e refactor decompression 2021-04-17 03:27:46 +08:00
Michael Kamensky
59f414f707 Merge branch 'fixmp' into 'master'
Fix Multiplayer LTB triggers

Closes #1324

See merge request core-developers/forge!4511
2021-04-16 04:59:35 +00:00
Lyu Zong-Hong
a1f69f0732 Add Shaman's Trance 2021-04-16 08:22:37 +09:00
austinio7116
84014ce9b5 Historic GA fix 2021-04-15 18:56:25 +01:00
tool4EvEr
2f7a30f920 Fix Multiplayer LTB triggers 2021-04-15 18:54:57 +02:00
Anthony Calosa
816bb2008a update zip decompression
closes #1802
2021-04-15 23:18:40 +08:00
Anthony Calosa
641b5af8eb Update CardArchetypeLDAGenerator.java 2021-04-15 10:06:33 +00:00
Michael Kamensky
22ffcf5660 Merge branch 'historicLDA' into 'master'
Historic Archetype Random Deck Generation

See merge request core-developers/forge!4488
2021-04-15 06:30:19 +00:00
austinio7116
529fc42b72 Merge branch 'coremaster' into historicLDA
# Conflicts:
#	forge-gui/res/formats/Sanctioned/Historic.txt
2021-04-14 19:09:01 +01:00
Alumi
1e0c3e7621 Check if chosen targets meets MustTarget requirements in setupTargets() too. (For spell that has multiple targeting SAs) 2021-04-14 18:06:55 +00:00
Lyu Zong-Hong
7b6e08f791 Remove X max limit for Emblazoned Golem 2021-04-14 16:29:57 +09:00
austinio7116
93ff8cfe1b Added Historic Random Deck Generation 2021-04-12 14:36:57 +01:00
Anthony Calosa
89fab45eb7 unused import 2021-04-12 18:21:54 +08:00
Anthony Calosa
36c3c43f86 Merge branch 'master' into 'master'
Simplify ManaConversion scripts, remove Flash/Ice Cave technical debt

See merge request core-developers/forge!4479
2021-04-12 10:14:23 +00:00