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

5333 Commits

Author SHA1 Message Date
Michael Kamensky
1601afdfc0 Merge branch 'costs' into 'master' 
Fix CostSacrifice paying from Effect

See merge request core-developers/forge!5138
 2021-07-31 04:47:24 +00:00
Bug Hunter
a9f5ab8772 Fix CostSacrifice paying from Effect 2021-07-31 04:47:23 +00:00
Michael Kamensky
74038eefb5 Merge branch 'fixnpe' into 'master' 
Fix NPE

See merge request core-developers/forge!5141
 2021-07-31 04:47:09 +00:00
tool4EvEr
39bf803a92 Clean up 2021-07-30 21:39:44 +02:00
tool4EvEr
3445c65eb5 Fix NPE 2021-07-30 20:42:38 +02:00
Michael Kamensky
33377abc9f Merge branch 'managorger' into 'master' 
J21: Managorger Phoenix and support

See merge request core-developers/forge!5140
 2021-07-30 17:01:05 +00:00
Northmoc
46efa00f36 add Count$TriggeredManaCostDevotion.<Color> 2021-07-30 11:10:42 -04:00
Michael Kamensky
b17875b5fd Merge branch 'phase' into 'master' 
Fix failing triggers when removed from combat

See merge request core-developers/forge!5106
 2021-07-30 04:24:51 +00:00
Bug Hunter
358c6986e0 Fix failing triggers when removed from combat 2021-07-30 04:24:48 +00:00
Michael Kamensky
e8113dc203 Merge branch 'costs' into 'master' 
Some cost fixes

See merge request core-developers/forge!5135
 2021-07-30 04:24:45 +00:00
tool4EvEr
39c7c18386 Fix Standstill 2021-07-29 22:01:47 +02:00
tool4EvEr
4980bb235c Fix Strive check 2021-07-29 20:59:18 +02:00
Michael Kamensky
43cf318007 Merge branch 'perpetual' into 'master' 
Jumpstart Historic Horizons – some cards with "perpetual" mechanic

See merge request core-developers/forge!5129
 2021-07-29 05:15:15 +00:00
Michael Kamensky
c213dc0ecd Merge branch 'tome' into 'master' 
Jumpstart Historic Horizons – Tome of the Infinite

See merge request core-developers/forge!5130
 2021-07-29 05:14:38 +00:00
Northmoc
0822a4de0d add "RememberMade" to MakeCardEffect 2021-07-28 16:06:59 -04:00
Northmoc
c9dae7c666 support using ChosenName for MakeCardEffect 2021-07-28 16:06:25 -04:00
Northmoc
09795207ff add "ClearNamedCard" to CleanUpEffect 2021-07-28 16:05:17 -04:00
Northmoc
af5d8cd988 ChooseCardNameEffect - support choosing from list, with support for random too 2021-07-28 16:03:55 -04:00
Northmoc
953430255e - I'm dumb 2021-07-28 10:42:51 -04:00
Northmoc
a14b13164f - clean up line that sets "prompt" 2021-07-28 09:54:07 -04:00
Northmoc
bd7ab26f3e Support "ChoicePrompt" for GenericChoice 2021-07-28 09:36:16 -04:00
tool4EvEr
a00e408c84 Fix assigning damage to lost players 2021-07-28 06:30:06 +02:00
Lyu Zong-Hong
106515d217 Fix for broken Maven build 2021-07-27 14:38:22 +09:00
Hans Mackowiak
6562a04667 Class: use Static Ability to follow CR 2021-07-27 04:59:50 +00:00
Michael Kamensky
bb65d4d2ec Merge branch 'manor' into 'master' 
JHH: Some "seek" cards

See merge request core-developers/forge!5119
 2021-07-27 04:55:21 +00:00
Michael Kamensky
119a53b0fd Merge branch 'acolyte' into 'master' 
JHH: Subversive Acolyte

See merge request core-developers/forge!5118
 2021-07-27 04:54:36 +00:00
Northmoc
175db96e4f CardFactoryUtil - add getMostProminentCreatureType 2021-07-26 19:44:19 -04:00
Northmoc
64e95df6a2 CardProperty - add "MostProminentCreatureTypeInLibrary" 2021-07-26 19:42:43 -04:00
Northmoc
de4ae7bb3c CharmEffect.java support GameActivationLimit in formatted desc 2021-07-26 19:09:25 -04:00
tool4EvEr
7eec98db61 Fix CostSacrifice OriginalHost 2021-07-26 21:55:50 +02:00
tool4EvEr
9c57f10461 Fix achievement 2021-07-26 21:55:49 +02:00
tool4EvEr
91e8c24769 Clean up 2021-07-26 21:55:48 +02:00
tool4EvEr
20bc46c0fd Correctly evaluate modal faces 2021-07-26 21:55:47 +02:00
Northmoc
329b5953cc AbilityUtils.java - support "Caster" as Defined 2021-07-26 10:06:53 -04:00
Northmoc
ef00ba8a8a Support "Condition$ TargetIsTriggerRemembered" in TriggerDamageDone.java 2021-07-26 07:50:08 -04:00
Northmoc
4ce37bcaf8 Add "TriggerRememberDefined" (seems to work) 2021-07-26 07:50:07 -04:00
tool4EvEr
8a80a39416 CounterEffect: fix missing trigger 2021-07-25 13:11:51 +02:00
Michael Kamensky
6dcad6fad0 Merge branch 'AFC_Fiendlash' into 'master' 
Added Fiendlash for review

See merge request core-developers/forge!5061
 2021-07-25 09:31:05 +00:00
Michael Kamensky
ba7f08d5ec Merge branch 'tokenset' into 'master' 
Some improvements to token image fetching (especially emblems)

See merge request core-developers/forge!5105
 2021-07-25 04:27:44 +00:00
Northmoc
97225782c1 Emblems - common rarity 2021-07-24 13:05:06 -04:00
Northmoc
8b96079f6e EffectEffect add set to Emblem imagekey 2021-07-24 13:04:27 -04:00
Michael Kamensky
921369628b Merge branch 'dealdamage' into 'master' 
Fix dealDamage ignoring amount changes

See merge request core-developers/forge!5104
 2021-07-24 16:42:44 +00:00
tool4EvEr
2480296113 Fix dealDamage ignoring amount changes 2021-07-24 14:15:52 +02:00
tool4EvEr
ac6219f4bd Clean up 2021-07-24 11:27:37 +02:00
Wendell Wilkerson
c70ab7b722 fix for LKI on DamageDoneOnce trigger 2021-07-24 00:22:48 -05:00
Michael Kamensky
2b342d7118 Merge branch 'dungeon' into 'master' 
Add Dungeon to EditionSectionWithCollectorNumbers

See merge request core-developers/forge!5099
 2021-07-24 05:17:57 +00:00
tool4EvEr
1534636a64 Fix Serpentine Spike 2021-07-23 20:24:17 -04:00
Northmoc
94da5f3c3a add Remember objects from Damage effects to GameAction before the maps are cleared 2021-07-23 20:24:16 -04:00
Northmoc
a8205192ca remove Remember functions from DamageAllEffect 2021-07-23 20:24:09 -04:00
Northmoc
22337e4a7b remove Remember functions from DamageDealEffect 2021-07-23 20:21:18 -04:00