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,869 Commits 31 Branches 187 Tags
37de739a9cb152816310e96ea5e010eadb7ee64c
Commit Graph

5306 Commits

Author SHA1 Message Date
Alumi
1eb6f33207 Refactor replace damage to handle all damage related replacments first, then run all buffered SAs after 2021-05-31 06:41:16 +00:00
tool4EvEr
65f400cf46 Fix NPE 2021-05-30 18:34:44 +02:00
Michael Kamensky
ecb1cb8a0e Merge branch 'cleaning' into 'master' 
Fix mana not replaced when generated for different player

See merge request core-developers/forge!4794
 2021-05-30 05:36:23 +00:00
tool4EvEr
d622f9075a Add ValidActivator 2021-05-29 20:59:49 +02:00
tool4EvEr
a5fc5c1e40 Fix mana not replaced when generated for different player 2021-05-29 17:06:08 +02:00
Northmoc
254ddf8dfb KeywordWithType.java special parsing for Affinity 2021-05-29 11:00:36 -04:00
Northmoc
4995cc8876 CardFactoryUtil.java implement optional additional param for complex Affinities 2021-05-29 10:59:15 -04:00
Northmoc
1f120a7faf Affinity reminder text remove extra "you" 2021-05-29 10:58:42 -04:00
Michael Kamensky
2a424ca3a9 Merge branch 'wave' into 'master' 
Fix Parallax Wave

Closes #1853

See merge request core-developers/forge!4774
 2021-05-28 15:35:21 +00:00
Bug Hunter
8effb2cb76 Fix Parallax Wave 2021-05-28 15:35:21 +00:00
Lyu Zong-Hong
bbbee3421d Fix bug that can't flip or transform when mutated 2021-05-28 21:17:24 +09:00
Michael Kamensky
2ac4b923fe Merge branch 'vectis' into 'master' 
MH2: Vectis Gloves and support

See merge request core-developers/forge!4772
 2021-05-28 08:59:01 +00:00
Michael Kamensky
cac15b1436 Merge branch 'taste' into 'master' 
MH2: Discerning Taste and Support

See merge request core-developers/forge!4770
 2021-05-28 08:57:41 +00:00
Northmoc
f0f017713e add Artifact landwalk to CombatUtil 2021-05-27 11:13:01 -04:00
Northmoc
bff5a13c25 add support for "RememberMovedToZone" to DigEffect 2021-05-27 09:08:52 -04:00
Anthony Calosa
94ec700c78 Merge branch 'kevlahnota-master-patch-24830' into 'master' 
Update ChangeTargetsEffect.java

See merge request core-developers/forge!4767
 2021-05-27 08:55:13 +00:00
Anthony Calosa
c96aeb25e5 Update ChangeTargetsEffect.java 2021-05-27 08:48:52 +00:00
Anthony Calosa
63ebd462b9 Update CopySpellAbilityEffect.java 2021-05-27 08:48:11 +00:00
Northmoc
c3f88773d2 support for RandomTargetRestriction on ChangeTargetsEffect 2021-05-26 23:36:29 -04:00
Northmoc
5c689ebf9b support for RandomTarget and RandomTargetRestriction on CopySpellAbilityEffect 2021-05-26 23:35:47 -04:00
Michael Kamensky
e3a2a98c2f Merge branch 'mimicvat' into 'master' 
Mimic Vat: Update trigger so it doesn't resolve when card moved

See merge request core-developers/forge!4741
 2021-05-26 04:34:55 +00:00
Michael Kamensky
35aaafeba6 Merge branch 'fires' into 'master' 
Fix Fires of Invention

See merge request core-developers/forge!4736
 2021-05-26 04:34:29 +00:00
Michael Kamensky
6a93608427 Merge branch 'yusri' into 'master' 
MH2: Yusri and support

See merge request core-developers/forge!4750
 2021-05-26 04:32:52 +00:00
Northmoc
66ce27593b add support for multiple called flips to FlipCoinEffect 2021-05-25 13:57:33 -04:00
Northmoc
beb37bad9a Support for "NoColoredMana" 2021-05-25 08:41:40 -04:00
Michael Kamensky
3d5a7e9bc7 Merge branch 'foul' into 'master' 
Foul Emissary: Fix NPE

See merge request core-developers/forge!4739
 2021-05-25 06:21:36 +00:00
Northmoc
de1296f750 add support for "RememberAnimated" to AnimateEffectBase 2021-05-24 22:06:55 -04:00
tool4EvEr
97d9c57951 Update trigger so it doesn't resolve when card moved 2021-05-24 14:04:46 +02:00
tool4EvEr
2f26cbe676 Fix NPE 2021-05-24 12:24:15 +02:00
tool4EvEr
70b24f9b86 Fix Sen Triplets interaction 2021-05-24 10:55:51 +02:00
tool4EvEr
ef4ab9570a Clean up 2021-05-24 08:13:09 +02:00
Michael Kamensky
6207299219 Merge branch 'cleanup' into 'master' 
Another few small non-functional changes to clean up some redundancy

See merge request core-developers/forge!4734
 2021-05-24 03:29:07 +00:00
Michael Kamensky
8eb8c666b6 Merge branch 'hellkite' into 'master' 
Refactor CardDamageHistory

See merge request core-developers/forge!4711
 2021-05-24 03:28:58 +00:00
Bug Hunter
8f40e8ae04 Refactor CardDamageHistory 2021-05-24 03:28:57 +00:00
tool4EvEr
6bce621da4 Fix Fires of Ivention 2021-05-24 00:42:34 +02:00
tool4EvEr
9e9bc5193f Cleanup 2021-05-23 23:23:42 +02:00
tool4EvEr
c39313d973 Clean up 2021-05-23 17:36:07 +02:00
tool4EvEr
727689a3bd Fix Plumb the Forbidden 2021-05-22 11:02:57 +02:00
tool4EvEr
80ddea2c8c Clean up 2021-05-21 23:07:42 +02:00
tool4EvEr
6618f71297 PlayEffect: avoid confirmAction 2021-05-21 23:03:33 +02:00
tool4EvEr
e5df3b9cb3 Fix workaround 2021-05-21 08:43:36 +02:00
Michael Kamensky
be6232ee82 Merge branch 'fixcount' into 'master' 
Cleanup xCount

See merge request core-developers/forge!4718
 2021-05-20 04:52:29 +00:00
Michael Kamensky
54446949a5 Merge branch 'combats' into 'master' 
Fix deadlock for impossible blocking requirements

See merge request core-developers/forge!4681
 2021-05-20 04:51:42 +00:00
Michael Kamensky
161d4ed314 Merge branch 'angel' into 'master' 
Fix paying negative life

See merge request core-developers/forge!4716
 2021-05-20 04:45:40 +00:00
tool4EvEr
f8adbcc252 Cleanup xCount 2021-05-19 20:03:17 +02:00
tool4EvEr
6f9d557a64 Clean up 2021-05-19 16:29:38 +02:00
Michael Kamensky
82756e1073 Merge branch 'cardfixes' into 'master' 
Minor card fixes

See merge request core-developers/forge!4714
 2021-05-19 03:52:38 +00:00
tool4EvEr
ce3bab8a33 Fix for Temporal Extortion 2021-05-19 00:09:55 +02:00
tool4EvEr
e56b8545c7 Fix paying negative life 2021-05-18 23:36:56 +02:00
Michael Kamensky
d11d58889b Merge branch 'kevlahnota-master-patch-22574' into 'master' 
NoSuchMethodError forge.game.trigger.TriggerAbilityTriggered in addTriggeringObject

See merge request core-developers/forge!4710
 2021-05-18 19:33:58 +00:00