external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,595 Commits 31 Branches 187 Tags
4108b56135ad60198b718c6f4a48f2c33e38cc7c
Commit Graph

51595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Kamensky
1db289c35e Merge branch 'soulecho' into 'master' 
Fix Soul Echo

See merge request core-developers/forge!4691
 2021-05-11 18:10:46 +00:00
tool4EvEr
c8a4a41eaf Fix Soul Echo 2021-05-11 19:51:00 +02:00
Michael Kamensky
6221f87b8c Merge branch 'master' into 'master' 
Net Decks Archive Updates

See merge request core-developers/forge!4689
 2021-05-11 16:48:10 +00: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
Michael Kamensky
38d6ab9895 Merge branch 'refactor_cant_be_prevented' into 'master' 
Refactor damage can't be prevented effect

Closes #1232

See merge request core-developers/forge!4686
 2021-05-11 16:47:55 +00:00
Alumi
4d6da7454c Refactor damage can't be prevented effect 2021-05-11 16:47:54 +00:00
Churrufli
19ac30eed0 Net Decks Archive Updates 2021-05-11 09:29:42 +02:00
Hythonia
84a7b79e3c Add Time Sidewalk and Bone Rattler 2021-05-11 09:12:05 +02:00
Michael Kamensky
e2fc8015b8 Merge branch 'twosat-master-patch-29098' into 'master' 
Update de-DE.properties

See merge request core-developers/forge!4687
 2021-05-11 03:46:02 +00:00
Hans Mackowiak
5aac30f44a Merge branch 'colors' into 'master' 
ColorIdentity: Check for CDA text

See merge request core-developers/forge!4672
 2021-05-10 19:36:09 +00:00
Bug Hunter
d9340349fa ColorIdentity: Check for CDA text 2021-05-10 19:36:09 +00:00
Hans Mackowiak
82019b5f40 Merge branch 'samename' into 'master' 
ChangeZoneAi: Fix crash

Closes #1830

See merge request core-developers/forge!4688
 2021-05-10 19:35:22 +00:00
tool4EvEr
06e0a82927 Fix crash 2021-05-10 21:17:17 +02:00
Andreas Bendel
53409a6c70 Update de-DE.properties 
translated SwitchStates and AltZoneTabs
 2021-05-10 18:25:37 +00:00
Hans Mackowiak
59b68d80ca Merge branch 'servant' into 'master' 
Fix Grindstone & Painter's Servant interaction

See merge request core-developers/forge!4679
 2021-05-10 16:51:06 +00:00
Bug Hunter
4f38f5a389 Fix Grindstone & Painter's Servant interaction 2021-05-10 16:51:06 +00:00
Anthony Calosa
7a0bb07fc1 Merge branch 'kevlahnota-master-patch-01624' into 'master' 
unused import

See merge request core-developers/forge!4685
 2021-05-10 07:50:36 +00:00
Anthony Calosa
b1d3e712be unused import 2021-05-10 07:50:23 +00:00
Anthony Calosa
bc0cd4a783 Merge branch 'prevent' into 'master' 
prevent damage bug

See merge request core-developers/forge!4682
 2021-05-10 07:46:32 +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
Michael Kamensky
dd40a1de6b Merge branch 'update_prevention_predition' into 'master' 
Update AI damage prevention prediction code

See merge request core-developers/forge!4683
 2021-05-10 03:26:41 +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
tool4EvEr
46a4243093 prevent damage bug 2021-05-09 22:47:31 +02:00
Michael Kamensky
03bee3e11e Merge branch 'refactor_fog_protection' into 'master' 
Refactor Damage Prevention - Step 3

See merge request core-developers/forge!4680
 2021-05-09 18:15:44 +00:00
Lyu Zong-Hong
20491e1136 Refactor fog and protection to use replacement effect 2021-05-09 20:17:26 +09:00
Michael Kamensky
4ea01ea135 Merge branch 'new_sets' into 'master' 
Initial edition files for MH2, AFR, PWP21

See merge request core-developers/forge!4671
 2021-05-09 04:01:31 +00:00