Commit Graph

3490 Commits

Author SHA1 Message Date
Alumi
903b0130c7 Add Ertai's Meddling 2021-03-19 16:11:46 +00:00
Anthony Calosa
41b9bd3e06 Support loading Custom Cards & Editions from User Folder 2021-03-20 00:01:15 +08: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
Hans Mackowiak
d0e0b11186 better alias for XStream IO 2021-03-17 19:20:56 +01:00
Hans Mackowiak
9dca989b76 fixes QuestIO and GauntletIO 2021-03-17 18:27:56 +01:00
Leandro Doctors
aecd600367 fixup! add forge.quest.data.QuestData to fix old quests 2021-03-17 14:00:37 -03:00
Hans Mackowiak
412e77bdde add forge.quest.data.QuestData to fix old quests 2021-03-17 17:23:10 +01: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
Hans Mackowiak
0dfe28a861 CardTraitBase: matchesValid as instance method, better use for isValid
Conflicts:
	forge-gui/res/cardsfolder/d/day_of_the_dragons.txt
	forge-gui/res/cardsfolder/d/deputy_of_detention.txt
	forge-gui/res/cardsfolder/i/induced_amnesia.txt
	forge-gui/res/cardsfolder/l/living_lore.txt
	forge-gui/res/cardsfolder/p/phyrexian_devourer.txt
	forge-gui/res/cardsfolder/p/prototype_portal.txt
	forge-gui/res/cardsfolder/s/search_the_city.txt
	forge-gui/res/cardsfolder/s/skyclave_apparition.txt
	forge-gui/res/cardsfolder/s/soul_foundry.txt
	forge-gui/res/cardsfolder/s/strata_scythe.txt
	forge-gui/res/cardsfolder/s/sutured_ghoul.txt
2021-03-15 18:22:24 +00:00
Hans Mackowiak
34a813baeb ChangeZoneEffect: add UntilHostLeavesPlay to use GameCommand instead of StaticTrigger 2021-03-15 15:36:55 +00:00
Hans Mackowiak
350fed6d77 Remove RememberMap, use EnteredSinceYourLastTurn instead 2021-03-15 13:39:34 +01:00
Michael Kamensky
147a85e0e5 - Clarification and announcement. 2021-03-14 09:55:18 +03:00
Michael Kamensky
1cd7e4e234 - An option to exclude promos from quest reward pool 2021-03-14 09:53:10 +03:00
Michael Kamensky
5cbc578a9c - Exclude promos from Quest Mode starting pool and random reward pool 2021-03-14 09:08:37 +03:00
Anthony Calosa
68ecf41511 [Mobile] add Experimental Rollback Phase 2021-03-14 11:57:20 +08:00
Hans Mackowiak
174836a57f SacrificeAllEffect: check timestamp for LKI objects 2021-03-13 10:39:59 +01:00
Churrufli
b92fab3c57 Net Deck Archive sorting by date desc 2021-03-12 09:37:26 +01:00
Churrufli
b2634686e6 Net Deck Archive Block (Desktop & Android) 2021-03-11 13:06:46 +01:00
Michael Kamensky
076e27851f - ConquestUtil: skip promos (again) and other reprints when choosing the starting Planeswalker 2021-03-10 09:08:32 +03:00
Anthony Calosa
e73f117037 [Desktop] update ImageView for Decks 2021-03-07 08:39:12 +08:00
Anthony Calosa
f206a5f084 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 17:55:46 +00:00
Lyu Zong-Hong
9ae07284d8 Add CJK font setting and dowloader for mobile port 2021-03-05 20:25:07 +09:00
Hans Mackowiak
784acdba73 fix broken CardDetailUtil 2021-03-04 07:45:33 +01: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
502dbf9c45 Update AbstractGuiGame.java 2021-03-03 22:39:27 +00:00
Michael Kamensky
23121a46af Merge branch 'fixpay' into 'master'
Force player choice for mandatory costs

See merge request core-developers/forge!4074
2021-03-03 18:20:12 +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
Anthony Calosa
ff4803c506 prevent NPE
it seems repeated momir ai games and you switch to human player and start any game causes the NPE resulting to crashing the UI
2021-03-03 18:43:25 +08:00
CCTV-1
31f9503af8 Merge remote-tracking branch 'upstream/master' into donot_translation_token 2021-03-03 12:31:55 +08:00
tool4EvEr
65fc79a746 Force player choice for mandatory costs 2021-03-02 19:33:40 +01:00
Churrufli
0219991703 Net Deck Archive Categories (Android implementation) 2021-03-02 10:08:15 +01:00
Churrufli
f02a3c8786 Net Deck Archive Vintage (Desktop implementation) 2021-03-02 09:24:10 +01:00
Churrufli
8d3238cefa Net Deck Archive Legacy (Desktop implementation) 2021-03-01 09:34:17 +01:00
Anthony Calosa
0ed07d91cb [Mobile] Add Scroll Indicator on Matchscreen 2021-03-01 13:50:41 +08:00
Michael Kamensky
8f2b268f75 Skip promo sets when determining starter Planeswalker options in Planar Conquest. 2021-02-28 18:29:04 +00:00
Anthony Calosa
58bc169b6e Update AbstractGuiGame.java 2021-02-28 10:09:42 +00:00
Michael Kamensky
50425bf68e - Rewrite Dev features to use getGui().many correctly.
- Revert the ListChooser thing for now.
2021-02-28 07:40:21 +03:00
tool4EvEr
4226cd21d2 Fix mana restriction check for subabilities 2021-02-27 21:00:36 +01:00
Hans Mackowiak
aeb868d427 InputSelectTargets: fix use of isWithSameCardType for GUI 2021-02-27 15:31:35 +01:00
Hans Mackowiak
7e9ea10bb0 AbstractGuiGame: have many call choices when max is <= 1 2021-02-27 10:57:29 +01:00
Michael Kamensky
1509d7c888 Merge branch 'netdecksarchive' into 'master'
Net Deck Archive Pioneer (Desktop implementation)

See merge request core-developers/forge!4015
2021-02-26 04:10:54 +00:00
Churrufli
97367ed7e6 Net Deck Archive Pioneer (Desktop implementation) 2021-02-25 23:32:57 +01:00
tool4EvEr
c59cd875b8 Fix crash for triggers with no description 2021-02-25 22:12:23 +01:00
Churrufli
d16beb8d32 New Net Deck Category: Deck Modern Archive 2021-02-24 12:07:41 +01:00