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

5440 Commits

Author SHA1 Message Date
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
Michael Kamensky
8cf01c318a Merge branch 'cleanup' into 'master' 
Fix onCleanupPhase skipping losers

See merge request core-developers/forge!4712
 2021-05-18 19:33:46 +00:00
Hythonia
1f13b8d43d Minor card fixes 2021-05-18 20:11:24 +02:00
tool4EvEr
671937ff7f Fix onCleanupPhase skipping losers 2021-05-18 19:07:54 +02:00
Anthony Calosa
27478966bc NoSuchMethodError forge.game.trigger.TriggerAbilityTriggered in addTriggeringObject 2021-05-18 14:43:43 +00:00
Bug Hunter
32240b6004 ChangeZoneEffect: Don't modify tapped when replaced 2021-05-18 03:50:24 +00:00
tool4EvEr
abd0880c66 Fix deadlock for impossible blocking requirements 2021-05-17 17:51:09 +02:00
Michael Kamensky
54009dcb06 Merge branch 'aicleanup' into 'master' 
Minor cleanup

See merge request core-developers/forge!4705
 2021-05-16 12:43:17 +00:00
tool4EvEr
4aafafb5bd Minor cleanup 2021-05-16 12:52:02 +02:00
Hans Mackowiak
9527a33a58 Merge branch 'refactor_damage_replacement' into 'master' 
Deal damage use damage map

See merge request core-developers/forge!4696
 2021-05-16 06:51:39 +00:00
Alumi
419a513d8f Deal damage use damage map 2021-05-16 06:51:38 +00:00
Michael Kamensky
a1e7ecbecc Merge branch 'etali' into 'master' 
PlayEffect: Fix loop of selecting same card when optional

Closes #1835

See merge request core-developers/forge!4697
 2021-05-16 03:47:07 +00:00
Michael Kamensky
f996c90653 Merge branch 'nextturn' into 'master' 
Refactor addUntilCommand

See merge request core-developers/forge!4702
 2021-05-15 17:33:05 +00:00
Bug Hunter
be2a7f5a51 Refactor addUntilCommand 2021-05-15 17:33:03 +00:00
Hans Mackowiak
ff7f81c307 Card property targeted player 2021-05-15 15:27:15 +00:00
Michael Kamensky
cad42948cd Merge branch '1836-npe-at-forge-game-gameaction-sacrificedestroy-gameaction-java-1709' into 'master' 
Resolve "NPE at forge.game.GameAction.sacrificeDestroy(GameAction.java:1709)"

Closes #1836

See merge request core-developers/forge!4699
 2021-05-15 12:40:13 +00:00
Hans Mackowiak
5ad88099e1 Resolve "NPE at forge.game.GameAction.sacrificeDestroy(GameAction.java:1709)" 2021-05-15 12:40:12 +00:00