external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,686 Commits 32 Branches 187 Tags
01d117b07ef9dc8c57b409d47444e06e2e11f93c
Commit Graph

51686 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
bda997ef1e Merge branch 'wish' into 'master' 
Add Wish and update Frontier Explorer

See merge request core-developers/forge!4960
 2021-07-07 10:36:39 +00:00
Lyu Zong-Hong
6849578899 Add Wish and update Frontier Explorer 2021-07-07 18:13:06 +09:00
paul_snoops
96785e1353 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2021-07-07 05:11:52 +01:00
Michael Kamensky
a02f29ba8a Merge branch 'AFR_cards' into 'master' 
AFR card scripts 05 Jul

See merge request core-developers/forge!4950
 2021-07-07 02:55:46 +00:00
Michael Kamensky
76e361287a Merge branch 'vecna' into 'master' 
AFR: Vecna

See merge request core-developers/forge!4959
 2021-07-07 02:55:03 +00:00
Michael Kamensky
2f9e2dc2ef Merge branch 'afr_6' into 'master' 
AFR - 6 July

See merge request core-developers/forge!4957
 2021-07-07 02:53:23 +00:00
Wendell Wilkerson
a3b685a937 fixed two target DealDamage cards 2021-07-06 21:29:00 -05:00
Northmoc
9543534dda AnimateEffectBase - support "GainsTriggeredAbilitiesOf" 2021-07-06 19:58:34 -04:00
Northmoc
af0056d971 the_book_of_vile_darkness.txt 2021-07-06 19:57:30 -04:00
Northmoc
cec46460f4 hand_of_vecna.txt 2021-07-06 19:57:14 -04:00
Northmoc
789fb973a9 vecna token 2021-07-06 19:56:43 -04:00
paul_snoops
1a38a62941 AFR card scripts 05 Jul 2021-07-06 22:52:04 +01:00
paul_snoops
a52df6e4d1 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2021-07-06 18:21:22 +01:00
paul_snoops
82ce6d1e3d AFR card scripts 05 Jul 2021-07-06 18:20:38 +01:00
paul_snoops
f71804a56f AFR card scripts 05 Jul 2021-07-06 18:13:33 +01:00
Bug Hunter
5f0662c139 Merge branch 'import' into 'master' 
Fix import

See merge request core-developers/forge!4958
 2021-07-06 16:16:02 +00:00
tool4EvEr
c70b3ba4ae Fix import 2021-07-06 18:15:49 +02:00
Bug Hunter
4fbe9084e2 Merge branch 'twosat-master-patch-21869' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4956
 2021-07-06 16:08:06 +00:00
Bug Hunter
2381589bea Merge branch 'add_sideboard_ante_label' into 'master' 
Add Ante and Sideboard label to PlayerDetailsPanel to allow view cards in them

See merge request core-developers/forge!4940
 2021-07-06 16:07:32 +00:00
Alumi
fcdb9b25bd Add Ante and Sideboard label to PlayerDetailsPanel to allow view cards in them 2021-07-06 16:07:31 +00:00
Northmoc
6cc745526b teleportation_circle.txt 2021-07-06 10:19:06 -04:00
Northmoc
745a33ef8c mind_flayer.txt 2021-07-06 10:18:50 -04:00
Andreas Bendel
dc54a94bcc Update de-DE.properties 
lblBlock was missing
 2021-07-06 12:06:36 +00:00
paul_snoops
eb519f4278 Merge branch 'master' of https://git.cardforge.org/core-developers/forge 2021-07-06 11:08:27 +01:00
paul_snoops
934c780b73 AFR card scripts 05 Jul 2021-07-06 11:05:28 +01:00
paul_snoops
dc0ed6e233 AFR card scripts 05 Jul 2021-07-06 11:02:29 +01:00
Wendell Wilkerson
9245841d4d fixed Acorn Catapult not creating token when planeswalker targeted, fixed discard and token issues with Prismari Command 2021-07-06 03:44:47 -05:00
leriomaggio
b0c1f1cb0b Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-06 08:36:40 +01:00
leriomaggio
574d967cd4 New method to get Art Preference from CardDb, and refined load card method passing on edition from requestInfo 
The revised implementation of `attemptToLoadCard` method now also takes into consideration any setcode that may be present into request info.

This is to reduce db lookup operation and returning a card from a very specific set.
 2021-07-06 08:21:41 +01:00
leriomaggio
6adfa8b7a7 A few changes to all CardArtPreferences names and set value 
Setting the value of card art preference from string now is more reliable, and it falls back automatically to the default
(Latest Art All editions).
This is to allow setting the enum value from Forge Preference Labels.
 2021-07-06 08:19:31 +01:00
leriomaggio
ebc47cf1ec Changed all "Restart required" to "Requires Restart" (all uppercase) 
Messages on restart required are now all aligned, and with the same case.
 2021-07-06 08:13:34 +01:00
leriomaggio
b6509bd13b Renamed SetPolicy for old print (all editions) 
Won't exclude that I will come back at namings after having now worked on CardEdition.Type revision
 2021-07-06 08:11:58 +01:00
leriomaggio
8e2bb55fc6 Renamed SetPolicy for latest print (all editions) 
Won't exclude that I will come back at namings after having now worked on CardEdition.Type revision
 2021-07-06 08:11:22 +01:00
leriomaggio
91913879e9 Renamed SetPolicy for old art no promo 
The new name, i.e. OldArtExcludedPromoAndOnlineEditions is more self-explanatory - a bit long though.

Won't exclude that I will come back at namings after having now worked on CardEdition.Type revision
 2021-07-06 08:09:46 +01:00
Michael Kamensky
49a85dbe55 Merge branch 'master' into 'master' 
update simplified chinese translations

See merge request core-developers/forge!4954
 2021-07-06 05:43:40 +00:00
CCTV-1
e2b7fe37aa change traditional chinese to simplified chinese. 2021-07-06 13:18:38 +08:00
Michael Kamensky
251ffbf574 Merge branch 'editions-type-review' into 'master' 
ReNEWED Edition Types and Dates for Card Edition, ReNewed `Set` filter dialog panel in Desktop, NEW `Blocks` Card|Deck Catalog Filter, Updates to Formats

See merge request core-developers/forge!4878
 2021-07-06 04:23:24 +00:00
paul_snoops
0d01aeaceb AFR card scripts 05 Jul 2021-07-06 00:20:55 +01:00
paul_snoops
9fa1b6e585 Revert "AFR card scripts 05 Jul" 
This reverts commit d3dded47
 2021-07-06 00:11:09 +01:00
paul_snoops
d3dded4759 AFR card scripts 05 Jul 2021-07-06 00:01:10 +01:00
Bug Hunter
ae32a9f27b Merge branch 'playfix' into 'master' 
Small PlayEffect fix

See merge request core-developers/forge!4952
 2021-07-05 21:55:04 +00:00
tool4EvEr
80bc6785ba Small PlayEffect fix 2021-07-05 23:54:27 +02:00
paul_snoops
622fbe3192 AFR card scripts 05 Jul 2021-07-05 22:18:16 +01:00
Michael Kamensky
7516882c0d Merge branch '1911-painter-s-servant-devoid' into 'master' 
Resolve "Painter's Servant + Devoid"

Closes #1911

See merge request core-developers/forge!4951
 2021-07-05 18:57:21 +00:00
Hans Mackowiak
7a1a657ae9 Card: changedCardTypesCharacterDefining + changedCardColorsCharacterDefining for better apply in Order 2021-07-05 20:03:07 +02:00
paul_snoops
0f4af36c17 AFR card scripts 05 Jul 2021-07-05 16:15:50 +01:00
paul_snoops
70677a963a AFR card scripts 05 Jul 2021-07-05 16:10:32 +01:00
Michael Kamensky
41c3d6ebed Merge branch 'kethis' into 'master' 
Small fixes

See merge request core-developers/forge!4945
 2021-07-05 14:50:59 +00:00
Michael Kamensky
bdff72745a Merge branch 'volo_guide_to_monsters' into 'master' 
Add Volo, Guide to Monsters and support invert condition for card properties

See merge request core-developers/forge!4949
 2021-07-05 14:48:27 +00:00
paul_snoops
b57e3e89bf AFR card scripts 05 Jul 2021-07-05 14:12:47 +01:00