external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,086 Commits 31 Branches 187 Tags
e18007e902014ec84c46fd9a9e2bbce46eca154d
Commit Graph

4949 Commits

Author SHA1 Message Date
Bug Hunter
32240b6004 ChangeZoneEffect: Don't modify tapped when replaced 2021-05-18 03:50:24 +00: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
Anthony Calosa
b1d3e712be unused import 2021-05-10 07:50:23 +00:00
Michael Kamensky
d4dc65c45f Merge branch 'show_remaining_shield' into 'master' 
Show remaining shields amount for damage prevention and redirection effect

See merge request core-developers/forge!4684
 2021-05-10 03:27:03 +00:00
Lyu Zong-Hong
ea65a3423e Show remaining shields amount for damage prevention and redirection effect 2021-05-10 10:04:45 +09:00
Lyu Zong-Hong
04811da9cc Update AI damage prevention prediction code 2021-05-10 08:09:27 +09:00
Lyu Zong-Hong
20491e1136 Refactor fog and protection to use replacement effect 2021-05-09 20:17:26 +09:00
Michael Kamensky
8440f72e9e Merge branch 'cascade' into 'master' 
PlayAi confirmAction only when card is worth it

See merge request core-developers/forge!4661
 2021-05-09 04:01:22 +00:00
Lyu Zong-Hong
d42ee05740 Fix NPE in getTotalPreventionShieldAmount 2021-05-09 07:46:04 +09:00
Michael Kamensky
c4bf644240 Merge branch 'refactor_static_prevention' into 'master' 
Refactor Damage Prevention - Step 2

See merge request core-developers/forge!4676
 2021-05-08 13:57:04 +00:00
Alumi
fe95ad2e11 Refactor Damage Prevention - Step 2 2021-05-08 13:57:03 +00:00
Michael Kamensky
46e5c3233a Merge branch 'master' into 'master' 
Spoiled cards from MH2 and AFR

See merge request core-developers/forge!4674
 2021-05-08 13:56:08 +00:00
Hythonia
75da8833dc Urza's Saga fix 2021-05-08 10:22:33 +02:00
Michael Kamensky
c40a132811 Merge branch 'refactor_prevention' into 'master' 
Refactor Damage Prevention - Step 1

See merge request core-developers/forge!4675
 2021-05-08 04:34:44 +00:00
Alumi
288267ae11 Refactor Damage Prevention - Step 1 2021-05-08 04:34:42 +00:00
Michael Kamensky
8f1a493327 Merge branch 'digreveal' into 'master' 
add support to Dig for Reveal$ False

See merge request core-developers/forge!4667
 2021-05-08 04:34:08 +00:00
Northmoc
f97adc325f simplify boolean function 2021-05-07 15:06:40 -04:00
Hythonia
8aa72e9397 MH2 and AFR 2021-05-07 19:45:55 +02:00
tool4EvEr
3ab7886eab Refactor confirmAction 2021-05-07 18:14:20 +02:00
Anthony Calosa
5ee94199bb Merge branch 'fixturns' into 'master' 
Fix multiplayer extra turns deadlock

See merge request core-developers/forge!4665
 2021-05-07 00:48:21 +00:00
Northmoc
1ce213004a add support to Dig for Reveal$ False 2021-05-06 17:23:45 -04:00
tool4EvEr
e223fa2002 Fix extra turns deadlock 2021-05-06 21:39:24 +02:00
Michael Kamensky
6fc542ff7d Merge branch 'clash' into 'master' 
ClashEffect: Fix Triggers

Closes #1821

See merge request core-developers/forge!4662
 2021-05-06 03:46:14 +00:00
tool4EvEr
1232f1be28 Fix Escalate Cost 2021-05-05 22:20:57 +02:00
tool4EvEr
738c7b968a Fix Triggers 2021-05-05 21:59:01 +02:00
tool4EvEr
d6e7d1ffee Check if card for PlayEffect is worth it 2021-05-05 21:14:15 +02:00
Hans Mackowiak
717a3eaede Merge branch 'fixstatic' into 'master' 
Fix StaticEffect missing changes from RemoveLandTypes

See merge request core-developers/forge!4655
 2021-05-05 10:41:02 +00:00
Michael Kamensky
92472c815a Merge branch 'partner2' into 'master' 
Partner with: better fix

See merge request core-developers/forge!4650
 2021-05-04 18:18:02 +00:00
Michael Kamensky
1afce00069 Merge branch 'controllers' into 'master' 
getAllPossibleAbilities: Restore old controllers

Closes #1806

See merge request core-developers/forge!4646
 2021-05-04 18:17:41 +00:00