external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,916 Commits 31 Branches 187 Tags
829b9069e2bcabddf3f7a1c3a814b51a1c04bf70
Commit Graph

5679 Commits

Author SHA1 Message Date
tool4EvEr
a00e408c84 Fix assigning damage to lost players 2021-07-28 06:30:06 +02:00
leriomaggio
2cc1ee724d Merged Conflict with CardDB method call 2021-07-28 01:16:20 +01:00
leriomaggio
b893283abc Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-28 01:14:00 +01: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
leriomaggio
c8e3eef7cf Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-25 08:09:22 +01:00
leriomaggio
2d189cda9a Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-25 08:09:09 +01: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
leriomaggio
01d117b07e Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-23 22:38:23 +01:00
tool4EvEr
911511d039 Add Dungeon to EditionSectionWithCollectorNumbers 2021-07-23 21:33:25 +02:00
Lyu Zong-Hong
a3372980e5 Update oracles with AFR release 2021-07-23 15:31:40 +09:00
Michael Kamensky
20712cc652 Merge branch 'share_the_spoils' into 'master' 
Add Share the Spoils

See merge request core-developers/forge!5084
 2021-07-23 04:24:00 +00:00
Lyu Zong-Hong
ebcfa5b084 Add ValidSA check to LandPlayed trigger 2021-07-23 11:38:55 +09:00
Lyu Zong-Hong
5d9e0f54a6 Merge branch 'master' into share_the_spoils 2021-07-23 10:38:42 +09:00
Michael Kamensky
09a4d6f4e2 Merge branch 'kheru' into 'master' 
Kheru Spellsnatcher: Fix playing MDFC lands

See merge request core-developers/forge!5086
 2021-07-22 15:37:30 +00:00
tool4EvEr
1665d3ec67 Kheru Spellsnatcher: Fix playing MDFC lands 2021-07-22 13:32:13 +02:00
Bug Hunter
21e16e24be PlayEffect fixes 2021-07-22 10:53:56 +00:00
Lyu Zong-Hong
996d6011f4 Add Share the Spoils 2021-07-22 16:34:11 +09:00
leriomaggio
a5ee901bba Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-21 17:32:02 +01:00
Michael Kamensky
d36d4398ac Merge branch 'thisturnentered' into 'master' 
getThisTurnEntered: check all players

See merge request core-developers/forge!5075
 2021-07-21 06:57:42 +00:00
Lyu Zong-Hong
da7d20ea60 Cleanup PlayEffect a bit 2021-07-21 07:55:56 +09:00
tool4EvEr
7deffd8b7b getThisTurnEntered: check all players 2021-07-20 22:33:08 +02:00
Alumi
3c9462ff34 Add Rod of Absorption 2021-07-20 16:03:25 +00:00
Bug Hunter
ec08814230 Merge branch 'master' into 'validblocker' 
# Conflicts:
#   forge-gui/res/cardsfolder/u/unexpected_windfall.txt
 2021-07-20 08:52:23 +00:00
Michael Kamensky
165bf3ac6f Merge branch 'cleanup' into 'master' 
Minor clean up

See merge request core-developers/forge!5068
 2021-07-20 03:27:23 +00:00