external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,631 Commits 31 Branches 187 Tags
a5ee901bba734eb8065da14aaddea24514b4c7a5
Commit Graph

17449 Commits

Author SHA1 Message Date
Northmoc
c07a63cd7e price_of_loyalty.txt 2021-07-09 07:22:54 -04:00
Northmoc
60b27803ce jaded_sell_sword.txt 2021-07-09 07:22:54 -04:00
Northmoc
c5c58885e6 devour_intellect.txt 2021-07-09 07:22:53 -04:00
Michael Kamensky
0c748c091e Merge branch 'dividedfix' into 'master' 
Fix assignGenericAmount dialog when no targets (Lathiel)

See merge request core-developers/forge!4967
 2021-07-09 09:42:37 +00:00
Andreas Bendel
2e03b172b2 Update de-DE.properties 
'translated' Ante and Sideboard label
not much to do
 2021-07-09 06:21:10 +00:00
Michael Kamensky
6474f2a7eb Merge branch 'small_fixes' into 'master' 
AFR card scripts 08 Jul

See merge request core-developers/forge!4968
 2021-07-09 04:14:33 +00:00
Michael Kamensky
51df73d918 Merge branch 'afr_8' into 'master' 
AFR - 8 Jul

See merge request core-developers/forge!4966
 2021-07-09 04:13:36 +00:00
Michael Kamensky
98cf75e92e Merge branch 'card_targeting_fixes' into 'master' 
Card script fixes for Issue #1893

See merge request core-developers/forge!4963
 2021-07-09 04:12:42 +00:00
Wendell Wilkerson
f06fa47e75 Merge branch 'master' into card_targeting_fixes 2021-07-08 21:56:35 -05:00
Wendell Wilkerson
06c60a2540 updated from MR comments 2021-07-08 21:48:04 -05:00
Northmoc
8bf557cc19 check_for_traps.txt fix reveal, descs 2021-07-08 20:38:50 -04:00
paul_snoops
00e256edf7 AFR card scripts 08 Jul 2021-07-08 22:16:56 +01:00
paul_snoops
cd7bd9263a AFR card scripts 08 Jul 2021-07-08 22:15:54 +01:00
paul_snoops
933d92bdd4 AFR card scripts 08 Jul 2021-07-08 22:04:58 +01:00
tool4EvEr
101ce59f06 Clean up 2021-07-08 21:04:32 +02:00
paul_snoops
4c71f76260 AFR card scripts 08 Jul 2021-07-08 18:46:15 +01:00
Northmoc
c7cb42cd7b skeletal_swarming.txt 2021-07-08 12:16:00 -04:00
tool4EvEr
a1964eb75e Fix assignGenericAmount dialog when no targets (Lathiel) 2021-07-08 17:49:42 +02:00
Northmoc
fb0c44fce6 long_rest.txt 2021-07-08 11:33:13 -04:00
Northmoc
3f263fefee ochre_jelly.txt 2021-07-08 11:33:12 -04:00
leriomaggio
0feee4c67b Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-08 07:57:52 +01:00
leriomaggio
b42a59a1db Switch Back to "Preferred Art" option name 2021-07-08 07:57:34 +01:00
leriomaggio
4875b512de Switches KeepAlive Key on mac to F4 (from F1) to workaround help 
F1 key is sometimes mapped to invoke help menus (e.g. Discord)
 2021-07-08 07:55:59 +01:00
leriomaggio
e350539520 Preference for Preferred Art: Updated default value with new name 2021-07-08 07:51:06 +01:00
Northmoc
2cc6128f1f treasure_chest.txt 2021-07-07 23:46:01 -04:00
Northmoc
da6c027315 treasure_vault.txt 2021-07-07 23:45:24 -04:00
Northmoc
e4f7bd1f68 hobgoblin_bandit_lord.txt 2021-07-07 23:17:25 -04:00
Northmoc
5de6401ed8 xorn.txt 2021-07-07 22:58:10 -04:00
Northmoc
2e469be484 flameskull.txt 2021-07-07 22:58:10 -04:00
Northmoc
2074320961 westgate_regent.txt 2021-07-07 22:58:09 -04:00
Northmoc
626124c912 true_polymorph.txt 2021-07-07 22:58:09 -04:00
Wendell Wilkerson
2bf066b937 Merge branch 'master' into card_targeting_fixes 2021-07-07 20:47:29 -05:00
Michael Kamensky
8de27ddb0c Merge branch 'afr_7' into 'master' 
AFR - 7 Jul

See merge request core-developers/forge!4964
 2021-07-07 20:26:40 +00:00
Michael Kamensky
030ed46cae Merge branch 'AFR_7_7' into 'master' 
AFR card scripts 07 Jul

See merge request core-developers/forge!4962
 2021-07-07 20:26:09 +00:00
Northmoc
d020e8a7d1 acererak_the_archlich.txt 2021-07-07 16:06:37 -04:00
Northmoc
27624ae6e2 blue_dragon.txt fix 2021-07-07 15:13:08 -04:00
Northmoc
10bbd4d07f blue_dragon.txt 2021-07-07 15:05:21 -04:00
Northmoc
a2fa475c43 white_dragon.txt 2021-07-07 14:46:20 -04:00
Northmoc
9965517329 loyal_warhound.txt 2021-07-07 14:46:04 -04:00
paul_snoops
9469f1bdaf AFR card scripts 07 Jul 2021-07-07 19:19:26 +01:00
paul_snoops
5163836668 AFR card scripts 07 Jul 2021-07-07 16:57:34 +01:00
paul_snoops
322008b458 AFR card scripts 07 Jul 2021-07-07 16:34:49 +01:00
paul_snoops
059641f71d AFR card scripts 07 Jul 2021-07-07 15:45:51 +01:00
Wendell Wilkerson
636cbaeb5f fixed charm cards in bug reports 2021-07-07 08:44:05 -05:00
Northmoc
7188f2ccb3 bruenor_battlehammer.txt 2021-07-07 09:43:09 -04:00
paul_snoops
28cd8c877d AFR card scripts 07 Jul 2021-07-07 14:03:54 +01:00
Lyu Zong-Hong
6849578899 Add Wish and update Frontier Explorer 2021-07-07 18:13:06 +09: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