external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,558 Commits 32 Branches 187 Tags
901b7159479e616d792b25dd00556a9ccb2fb38a
Commit Graph

17938 Commits

Author SHA1 Message Date
Wendell Wilkerson
b130e7f658 third batch 2021-07-11 11:43:43 -05:00
tool4EvEr
79bb2639a8 Fix Arsenal Thresher 2021-07-11 17:36:49 +02:00
Wendell Wilkerson
ba2a48600c second batch 2021-07-11 10:35:31 -05:00
Michael Kamensky
cbd8f0297c Merge branch 'afc_roll_dice' into 'master' 
Update RollDice effect to support AFC cards

See merge request core-developers/forge!4983
 2021-07-11 14:42:10 +00:00
Michael Kamensky
f48fa6baef Merge branch 'gain_class_level' into 'master' 
Implement Class mechanism

See merge request core-developers/forge!4955
 2021-07-11 13:17:53 +00:00
Alumi
83eb0f8ee4 Implement Class mechanism 2021-07-11 13:17:51 +00:00
Lyu Zong-Hong
4c8acb251e Update RollDice effect to support AFC cards 2021-07-11 19:13:47 +09:00
tool4EvEr
4b785fd75b Fix Scavenge for CDA 2021-07-11 09:45:14 +02:00
tool4EvEr
c491f6dfb6 Fix FailedToTarget 2021-07-11 09:44:57 +02:00
tool4EvEr
2e55b6c884 Fix zone 2021-07-11 09:44:39 +02:00
Wendell Wilkerson
25d30254a1 first batch of AFR cards 2021-07-11 01:25:11 -05:00
Michael Kamensky
d4b0c648e9 Merge branch 'afr_jul_10' into 'master' 
Added AFR RollDice cards and Temple of the Dragon Queen

See merge request core-developers/forge!4978
 2021-07-11 04:01:53 +00:00
Alumi
4fe67ccb8c Added AFR RollDice cards and Temple of the Dragon Queen 2021-07-11 04:01:53 +00:00
Michael Kamensky
6ff7ccd3ac Merge branch 'equipExtras' into 'master' 
CardFactoryUtil: add way to add Extra Parameters and Extra Description

See merge request core-developers/forge!4980
 2021-07-11 04:01:28 +00:00
Hans Mackowiak
e0f01a3168 CardFactoryUtil: add way to add Extra Parameters and Extra Description 2021-07-11 03:01:21 +02:00
Wendell Wilkerson
5d6939b2f2 Merge branch 'master' into AFR_charm_cards 2021-07-10 10:37:25 -05:00
Wendell Wilkerson
30d276aa29 fixes to address thread comments 2021-07-10 10:35:17 -05:00
Michael Kamensky
3dd44ba71a Merge branch 'update_wrapped_description' into 'master' 
Update the implementation of trigger replacing ABILITY text

Closes #1914

See merge request core-developers/forge!4976
 2021-07-10 12:33:59 +00:00
Michael Kamensky
affbd917b3 Merge branch 'path' into 'master' 
Fix Descendants' Path shuffling

See merge request core-developers/forge!4977
 2021-07-10 09:05:51 +00:00
Hans Mackowiak
3126d7ac5d Merge branch 'treasureSpent' into 'master' 
CastTotalManaSpent Treasure

See merge request core-developers/forge!4948
 2021-07-10 07:49:13 +00:00
Hans Mackowiak
1f0e49d1d4 CastTotalManaSpent Treasure 2021-07-10 07:49:12 +00:00
tool4EvEr
60d4991a84 Fix Descendants' Path shuffling 2021-07-10 09:41:35 +02:00
Lyu Zong-Hong
d5149293da Update the implementation of trigger replacing ABILITY text. 2021-07-10 15:22:55 +09:00
Wendell Wilkerson
75ccabff9c added creatures with charm triggers 2021-07-09 23:30:37 -05:00
Michael Kamensky
dd6dc739fb Merge branch 'propertyfix' into 'master' 
ThisTargetedController

Closes #1909

See merge request core-developers/forge!4974
 2021-07-10 03:42:11 +00:00
Wendell Wilkerson
ac094f4af4 added AFR charm instants 2021-07-09 22:11:07 -05:00
leriomaggio
2d3d67176a Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-09 20:08:34 +01:00
tool4EvEr
cdb2330792 Fix Ram Through 2021-07-09 20:22:23 +02:00
Michael Kamensky
7744552450 Merge branch 'stackdesc' into 'master' 
Various fixes

See merge request core-developers/forge!4972
 2021-07-09 16:15:59 +00:00
Northmoc
9e92e46cad goblin_morningstar.txt 2021-07-09 11:10:28 -04:00
Northmoc
962d5c2105 aberrant_mind_sorceror.txt 2021-07-09 10:17:46 -04:00
Northmoc
ef4536d033 dragon_turtle.txt 2021-07-09 08:55:19 -04:00
Northmoc
01376d82db said_done.txt fix Duration 2021-07-09 08:49:27 -04:00
Northmoc
570abfcd21 spoils_of_the_hunt.txt - add AILogic 2021-07-09 08:08:13 -04:00
Northmoc
5bf0ad547e hunters_edge.txt - add AILogic 2021-07-09 08:07:32 -04:00
Northmoc
f8a256ea27 hunters_edge.txt tidy up 2021-07-09 08:00:23 -04:00
Northmoc
e46001cc91 price_of_loyalty.txt fix Pump param 2021-07-09 07:56:34 -04:00
Northmoc
07261e8525 spoils_of_the_hunt.txt 2021-07-09 07:55:00 -04:00
Northmoc
64f022f809 kalain_reclusive_painter.txt 2021-07-09 07:22:55 -04:00
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