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

50395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
48bc2174a4 Merge branch 'master' into 'master' 
update simplified chinese translation

See merge request core-developers/forge!4709
 2021-05-18 19:34:07 +00: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
Michael Kamensky
e18007e902 Merge branch 'fixnpe' into 'master' 
UntapAi: Fix NPE

See merge request core-developers/forge!4713
 2021-05-18 19:33:37 +00:00
Hythonia
1f13b8d43d Minor card fixes 2021-05-18 20:11:24 +02:00
tool4EvEr
c6b82043d0 Fix NPE 2021-05-18 19:29:37 +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
CCTV-1
442ea94cde translate "AltZoneTabs" 2021-05-18 18:47:29 +08:00
Michael Kamensky
13bd24ef83 Merge branch 'changezone' into 'master' 
ChangeZoneEffect: Don't modify tapped when replaced

See merge request core-developers/forge!4704
 2021-05-18 03:50:25 +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
Hans Mackowiak
bb6c5f8e44 Merge branch '1840-npe-at-forge-game-ability-abilityutils-xcount-abilityutils-java-1677' into 'master' 
Resolve "NPE at forge.game.ability.AbilityUtils.xCount(AbilityUtils.java:1677)"

Closes #1840

See merge request core-developers/forge!4703
 2021-05-16 13:56:21 +00:00
Bug Hunter
66d0141fae Merge branch 'fixcard' into 'master' 
Fix card

See merge request core-developers/forge!4707
 2021-05-16 13:02:04 +00:00
tool4EvEr
57cf7a582b Fix card 2021-05-16 15:02:00 +02:00
Michael Kamensky
706827fc0c Merge branch 'Williams-master-patch-55192' into 'master' 
Update Secret Lair Ultimate Edition.txt

See merge request core-developers/forge!4706
 2021-05-16 12:51:43 +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
John
1049deb299 Update Secret Lair Ultimate Edition.txt 2021-05-16 12:43:06 +00:00
tool4EvEr
19b928782a Clean import 2021-05-16 12:59:13 +02:00
tool4EvEr
4aafafb5bd Minor cleanup 2021-05-16 12:52:02 +02:00
leriomaggio
65ff5a8c51 Added Spotlight rubbish to ignore list 2021-05-16 11:46:23 +01:00
Hans Mackowiak
d2449c181a AiController: need to set triggered Object for ETB check 2021-05-16 09:18:31 +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
Michael Kamensky
a6ca193ae0 Merge branch 'cardPropertyTargetedPlayer' into 'master' 
Card property targeted player

See merge request core-developers/forge!4606
 2021-05-15 15:27:16 +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
Sol
c849c2b867 Merge branch 'scourge' into 'master' 
Fix Boneyard Scourge

See merge request core-developers/forge!4700
 2021-05-15 03:23:35 +00:00
Michael Kamensky
1571263575 Merge branch 'addtocombat' into 'master' 
Fix addToCombat not checking for changes in defenders

See merge request core-developers/forge!4701
 2021-05-14 17:35:06 +00:00
tool4EvEr
a335d60fcb Fix addToCombat not checking for changes in defenders 2021-05-14 16:17:21 +02:00
tool4EvEr
c78c182e32 Fix trigger 2021-05-14 15:15:50 +02:00
Michael Kamensky
8ff5d05078 Merge branch 'wall' into 'master' 
Fix trigger running with no zone for Wall of Stolen Identity

See merge request core-developers/forge!4666
 2021-05-14 05:39:09 +00:00
Bug Hunter
80a1c13a07 Fix trigger running with no zone for Wall of Stolen Identity 2021-05-14 05:39:08 +00:00
Hans Mackowiak
0b6ed46a0a Merge branch 'basecamp' into 'master' 
Fix Base Camp

See merge request core-developers/forge!4698
 2021-05-13 19:29:57 +00:00
tool4EvEr
cdaba3483a Fix Base Camp 2021-05-13 14:50:32 +02:00
tool4EvEr
3681dba5fb Fix loop of selecting same card when optional 2021-05-13 13:55:19 +02:00
Hans Mackowiak
ddbe5af21c Merge branch 'TRT-master-patch-01974' into 'master' 
Update forge-gui/res/cardsfolder/r/rot_hulk.txt

See merge request core-developers/forge!4695
 2021-05-12 14:52:37 +00:00
Hans Mackowiak
da4263131e Merge branch 'elspeth' into 'master' 
Fix stateBasedAction_Saga

Closes #1831

See merge request core-developers/forge!4693
 2021-05-12 14:47:33 +00:00
Bug Hunter
f3b771cb7d Fix stateBasedAction_Saga 2021-05-12 14:47:32 +00:00
Bug Hunter
39c764e283 Update forge-gui/res/cardsfolder/r/rot_hulk.txt 2021-05-12 07:38:40 +00:00
Michael Kamensky
9d4e02c2d4 Merge branch 'defenderStatic' into 'master' 
StaticAbilities: moved Defender into CantAttack

See merge request core-developers/forge!4563
 2021-05-12 06:35:16 +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
Michael Kamensky
3f7b1ce204 Merge branch 'fix_spellskite' into 'master' 
Fix BecomesTarget not triggering for Spellskite's ability

See merge request core-developers/forge!4694
 2021-05-12 05:23:42 +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