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

5026 Commits

Author SHA1 Message Date
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
tool4EvEr
a335d60fcb Fix addToCombat not checking for changes in defenders 2021-05-14 16:17:21 +02:00
Bug Hunter
80a1c13a07 Fix trigger running with no zone for Wall of Stolen Identity 2021-05-14 05:39:08 +00:00
tool4EvEr
3681dba5fb Fix loop of selecting same card when optional 2021-05-13 13:55:19 +02:00
Bug Hunter
f3b771cb7d Fix stateBasedAction_Saga 2021-05-12 14:47:32 +00:00
Hans Mackowiak
34ab157046 StaticAbilities: moved Defender into CantAttack 2021-05-12 06:35:15 +00:00
Michael Kamensky
e76403f54f Merge branch 'ruxa' into 'master' 
Fix Muraganda Petroglyphs not affecting face-down with morph

See merge request core-developers/forge!4692
 2021-05-12 05:23:50 +00:00
Lyu Zong-Hong
0eff1225b8 Fix BecomesTarget not triggering for Spellskite's ability 2021-05-12 09:26:06 +09:00
tool4EvEr
4e2d024b2a Fix Muraganda Petroglyphs not affecting face-down with morph 2021-05-11 20:11:26 +02:00
Michael Kamensky
ab3b682c47 Merge branch 'tokencards' into 'master' 
Add Time Sidewalk and Bone Rattler

See merge request core-developers/forge!4690
 2021-05-11 16:48:08 +00:00
Alumi
4d6da7454c Refactor damage can't be prevented effect 2021-05-11 16:47:54 +00:00
Hythonia
84a7b79e3c Add Time Sidewalk and Bone Rattler 2021-05-11 09:12:05 +02:00
Bug Hunter
d9340349fa ColorIdentity: Check for CDA text 2021-05-10 19:36:09 +00:00