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
50,086 Commits 31 Branches 187 Tags
e18007e902014ec84c46fd9a9e2bbce46eca154d
Commit Graph

16365 Commits

Author SHA1 Message Date
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
4aafafb5bd Minor cleanup 2021-05-16 12:52:02 +02:00
Alumi
419a513d8f Deal damage use damage map 2021-05-16 06:51:38 +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
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
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
Bug Hunter
39c764e283 Update forge-gui/res/cardsfolder/r/rot_hulk.txt 2021-05-12 07:38:40 +00:00
Hans Mackowiak
34ab157046 StaticAbilities: moved Defender into CantAttack 2021-05-12 06:35:15 +00: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
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
Andreas Bendel
53409a6c70 Update de-DE.properties 
translated SwitchStates and AltZoneTabs
 2021-05-10 18:25:37 +00:00
Bug Hunter
4f38f5a389 Fix Grindstone & Painter's Servant interaction 2021-05-10 16:51:06 +00: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
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
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
644f80df57 Merge branch 'Williams-master-patch-45382' into 'master' 
Update Resale Promos.txt

See merge request core-developers/forge!4677
 2021-05-08 13:56:17 +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
John
1da27edde6 Update Resale Promos.txt 2021-05-08 09:37:38 +00:00
Hythonia
75da8833dc Urza's Saga fix 2021-05-08 10:22:33 +02:00
Alumi
288267ae11 Refactor Damage Prevention - Step 1 2021-05-08 04:34:42 +00: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
paul_snoops
551968a38c Initial edition files for MH2, AFR, PWP21 2021-05-07 15:37:18 +01:00
paul_snoops
e954102f81 Initial edition files for MH2, AFR, PWP21 2021-05-07 14:23:04 +01:00
paul_snoops
42b553266a Initial edition files for MH2, AFR, PWP21 2021-05-07 09:26:45 +01:00
Churrufli
d98d2915ca Net Deck Archive Updates 2021-05-07 09:18:14 +02:00
friarsol
28793abc7a Migrate STX and other scripts to alpha folders 2021-05-06 20:42:17 -04:00
Michael Kamensky
6fcdee14e4 Merge branch 'master' into 'master' 
Better AI for SpecificCard Auras

See merge request core-developers/forge!4660
 2021-05-05 17:47:31 +00:00
Hythonia
8c139ad044 Better AI for SpecificCard Auras, attempt 2 2021-05-05 15:47:43 +02:00
Hythonia
a801424b35 Better AI for SpecificCard Auras 2021-05-05 14:48:40 +02:00
Anthony Calosa
0061f35b46 Merge branch 'master' into 'master' 
[Mobile] add Alternate Player Zone Layout (Landscape)

See merge request core-developers/forge!4658
 2021-05-05 03:53:49 +00:00
Anthony Calosa
ff20646a63 Merge branch 'escape' into 'master' 
Fix Escape Protocol

Closes #1817

See merge request core-developers/forge!4657
 2021-05-05 03:53:26 +00:00
Anthony Calosa
99b2cbb606 [Mobile] add Alternate Player Zone Layout (Landscape) 2021-05-05 11:34:36 +08:00
tool4EvEr
15e8eee373 Fix Escape Protocol 2021-05-04 20:38:03 +02:00