Michael Kamensky
f5561a17f9
Merge branch 'AFR_fixes' into 'master'
...
Fixes from Alumi comments
See merge request core-developers/forge!4995
2021-07-12 16:12:47 +00:00
ArsenalNut
a3d5094175
Update skullport_merchant.txt
2021-07-12 15:52:29 +00:00
Northmoc
82a9582f34
inferno_of_the_star_mounts.txt
2021-07-12 10:45:52 -04:00
Wendell Wilkerson
7846128ba5
fixes from Alumi comments
2021-07-12 09:28:13 -05:00
Northmoc
4b542b9002
sudden_insight.txt
2021-07-12 10:23:07 -04:00
Northmoc
da4e428cb8
purple_worm.txt
2021-07-12 08:26:48 -04:00
John
0c6d965a1c
Update circle_of_the_moon_druid.txt
2021-07-12 12:04:51 +00:00
John
cfa2432cca
Update rally_maneuver.txt
2021-07-12 11:59:38 +00:00
John
0c61ae7a2b
Update lurking_roper.txt
2021-07-12 11:59:14 +00:00
John
9b8654a1af
Update elturgard_ranger.txt
2021-07-12 11:58:51 +00:00
John
ecf3dcca99
Update dire_wolf_prowler.txt
2021-07-12 11:58:22 +00:00
John
02c76474c8
Add new file
2021-07-12 10:27:11 +00:00
John
f8832a19c0
Add new file
2021-07-12 10:26:41 +00:00
John
413352a4d5
Add new file
2021-07-12 10:26:05 +00:00
John
fcd7fe840d
Add new file
2021-07-12 10:25:38 +00:00
John
2843bc18fc
Add new file
2021-07-12 10:25:09 +00:00
John
478b8e604f
Add new file
2021-07-12 10:24:42 +00:00
John
b9554604b6
Add new file
2021-07-12 10:24:13 +00:00
John
aec56d726d
Add new file
2021-07-12 10:23:48 +00:00
John
863d1d4884
Add new file
2021-07-12 10:23:12 +00:00
John
f2cfeb31b8
Add new file
2021-07-12 10:22:43 +00:00
John
ea50d8f947
Add new file
2021-07-12 10:22:11 +00:00
John
ee835d310a
Add new file
2021-07-12 10:21:39 +00:00
John
4567260d61
Add new file
2021-07-12 10:21:05 +00:00
John
d0a4ff54f7
Add new file
2021-07-12 10:19:18 +00:00
Alumi
767b6f1ea5
Merge branch 'patch-enable-custom-cards' into 'master'
...
Patch showing custom card warning properly
See merge request core-developers/forge!4993
2021-07-12 08:31:11 +00:00
leriomaggio
4eb2bcca89
Merge remote-tracking branch 'upstream/master' into patch-enable-custom-cards
2021-07-12 09:26:16 +01:00
leriomaggio
6b60e478ee
Patch showing custom card warning properly
2021-07-12 09:22:15 +01:00
Michael Kamensky
ecd7afdf4a
Merge branch 'treasuremana' into 'master'
...
AFR: mana from Treasure cards
See merge request core-developers/forge!4970
2021-07-12 07:40:03 +00:00
Michael Kamensky
31beff4f4f
Merge branch 'AFR_Artifacts' into 'master'
...
add last AFR artifacts and updated counter enum list to support HARMONY counters
See merge request core-developers/forge!4991
2021-07-12 07:37:32 +00:00
Michael Kamensky
642915a798
Merge branch 'AFR_Cards_20210710' into 'master'
...
AFR cards 20210710
See merge request core-developers/forge!4986
2021-07-12 07:37:15 +00:00
Michael Kamensky
6cdc5c0cf8
Merge branch 'AFR_another_card' into 'master'
...
Add Split the Party
See merge request core-developers/forge!4992
2021-07-12 07:36:26 +00:00
Michael Kamensky
eb20ff0a2a
Merge branch 'add_dragons_fire' into 'master'
...
Add Dragon's Fire
See merge request core-developers/forge!4988
2021-07-12 07:36:06 +00:00
Wendell Wilkerson
657eda2062
added Split the Party
2021-07-12 01:48:23 -05:00
Wendell Wilkerson
a6bf79500d
fixes from comments
2021-07-12 00:32:18 -05:00
Wendell Wilkerson
d4ff181a1f
added AILogic$ Aristocrat and fixed oracle text
2021-07-12 00:19:46 -05:00
Michael Kamensky
e516b00fa9
Merge branch 'afr_11' into 'master'
...
AFR - 11 Jul
See merge request core-developers/forge!4989
2021-07-12 04:50:28 +00:00
Michael Kamensky
6138235b8b
Merge branch 'add-custom-cards-support' into 'master'
...
New Option in Forge to enable the use of Custom Cards
Closes #1915
See merge request core-developers/forge!4987
2021-07-12 04:48:56 +00:00
Wendell Wilkerson
fd54ecb571
add Trickster's Talisman and fixed stack descriptions
2021-07-11 23:25:59 -05:00
Wendell Wilkerson
eec8b7a42a
add AFR artifact and updated counter enum list to support HARMONY counters
2021-07-11 22:31:58 -05:00
Northmoc
ccfe318363
dragons_disciple.txt
2021-07-11 22:37:03 -04:00
Lyu Zong-Hong
a83c06baf0
Add Dragon's Fire
2021-07-12 11:27:22 +09:00
Wendell Wilkerson
c7eff32f94
fixes from thread comments
2021-07-11 16:54:51 -05:00
leriomaggio
e67402d5ae
Change of policy for custom cards load
...
I've decided to use the option in settings only for gameplay, and so always allowing the load of custom cards.
This is because otherwise the option should be much more pervasive, so inhibiting card catalog, sets filters, ...
So the option will just control the use of custom cards in decks for gameplay (still false by default!)
2021-07-11 19:48:23 +01:00
leriomaggio
81e35ca7f7
Updated and Added translations for all langs for the new options
2021-07-11 19:45:47 +01:00
leriomaggio
72f3411242
CustomCard option also added to mobile settings pane.
2021-07-11 19:15:48 +01:00
leriomaggio
75f04de148
Merge remote-tracking branch 'upstream/master' into add-custom-cards-support
2021-07-11 19:10:52 +01:00
leriomaggio
2189a33171
A new "Custom Cards Deck" format will be returned for decks containing custom cards and not being matched with any other formats.
2021-07-11 19:10:32 +01:00
leriomaggio
72e40504d7
Deck conformance check now includes custom cards to be (eventually) used in games.
2021-07-11 19:07:23 +01:00
leriomaggio
811d6479f5
CardPool now includes the option to load custom cards and check preferences.
...
If Custom Card setting is disabled, an error message in logs will be printed accordingly.
Custom Cards will be loaded as such in Card Pool only if the option in settings is enabled.
2021-07-11 19:06:39 +01:00
