external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,916 Commits 32 Branches 187 Tags
829b9069e2bcabddf3f7a1c3a814b51a1c04bf70
Commit Graph

5679 Commits

Author SHA1 Message Date
Hans Mackowiak
437fdbc9f5 Merge branch 'fixXantcha' into 'master' 
Add CardOwner property

Closes #772

See merge request core-developers/forge!3617
 2021-01-19 00:15:25 +00:00
Hans Mackowiak
149f221d8b CardProperty: hotfix ArrayList from iterable 2021-01-18 12:03:09 +01:00
tool4EvEr
dd50ab03e8 Add CardOwner property 2021-01-17 22:44:44 +01:00
klaxnek
afe7f84571 Fix Android Lambda 2021-01-17 10:46:29 +00:00
Anthony Calosa
db96c30cb7 Fix android build (opcode error) 2021-01-17 17:14:27 +08:00
Sol
7646c99aca Merge branch 'fixConcedeFreeze' into 'master' 
Fix desktop multiplayer conceding

Closes #1685

See merge request core-developers/forge!3576
 2021-01-17 01:59:06 +00:00
Hans Mackowiak
e1324916bd PlayEffect: fix Miracle Trigger 2021-01-16 23:49:14 +01:00
Michael Kamensky
b5950f6c16 Merge branch 'illusionary_mask' into 'master' 
Illusionary mask

See merge request core-developers/forge!3591
 2021-01-16 16:33:39 +00:00
Alumi
f3ecad7895 Illusionary mask 2021-01-16 16:33:38 +00:00
Tim Mocny
617e77f505 KHM: Littjara Mirrorlake and support 2021-01-16 09:23:30 +00:00
Hans Mackowiak
6778b54afc Merge branch 'cleanupRestartGameEffect' into 'master' 
RestartGameEffect: Reuse more code

See merge request core-developers/forge!3594
 2021-01-15 09:51:13 +00:00
Bug Hunter
82a2468f70 RestartGameEffect: Reuse more code 2021-01-15 09:51:13 +00:00
Michael Kamensky
acc04122fd Merge branch 'triggerExcessDamage' into 'master' 
TriggerExcessDamage: add Trigger for Toralf, God of Fury

See merge request core-developers/forge!3590
 2021-01-15 05:29:31 +00:00
Anthony Calosa
2842304d09 Remove unused imports 2021-01-14 21:38:30 +08:00
Hans Mackowiak
3bc6ab5e9d Merge branch 'fixCommanderReplacement' into 'master' 
commander LTB triggers before returning to command zone

Closes #1493

See merge request core-developers/forge!3565
 2021-01-14 13:29:48 +00:00
Bug Hunter
0ff02de485 commander LTB triggers before returning to command zone 2021-01-14 13:29:48 +00:00
Hans Mackowiak
97ac79acca TriggerExcessDamage: add Trigger for Toralf, God of Fury 2021-01-14 09:17:40 +01:00
Michael Kamensky
9e647f7e02 Merge branch 'khm_valki–tibalt' into 'master' 
KHM: Valki/Tibalt

See merge request core-developers/forge!3585
 2021-01-14 05:11:07 +00:00
Michael Kamensky
f0834fd739 Merge branch 'fix-all-type-counter' into 'master' 
Fix Kadena's Silencer

Closes #1501

See merge request core-developers/forge!3584
 2021-01-14 05:10:34 +00:00
Anthony Calosa
2d908b7f1b Fix split card ability texts 2021-01-14 11:13:28 +08:00
Northmoc
af27f2924a add ExiledWithEffectSoure 2021-01-13 16:12:44 -05:00
Northmoc
370cb47791 add ImprintRevealed to RevealHand 2021-01-13 16:12:43 -05:00
tool4EvEr
539bfac280 Check for lost player right before passing 2021-01-13 21:53:29 +01:00
tool4EvEr
afce0b1af4 Partial Rollback 2021-01-13 19:38:05 +01:00
friarsol
4d6ab47ecf Fix Kadena's Silencer 2021-01-12 22:46:57 -05:00
tool4EvEr
bdad27588e Add more resets for crazy corner cases 2021-01-12 22:04:32 +01:00
tool4EvEr
3d53311663 Fix Karn Liberated leaving emblems + phased out 2021-01-12 20:35:03 +01:00
Bug Hunter
58a18686da Fix multiplayer spells on lost players 2021-01-11 17:26:31 +00:00
Hans Mackowiak
7892d0f369 fix facedown removed from stack 2021-01-10 18:56:33 +01:00
tool4EvEr
fcc0cb9d0c Fix multiplayer conceding 2021-01-09 21:24:28 +01:00
Hans Mackowiak
3243133831 CardUtil getThisTurnEntered return LKI list 2021-01-09 15:53:00 +01:00
Bug Hunter
3fdac76ed0 Fix AbilityMana triggering too early on spent mana 2021-01-09 10:14:49 +00:00
Hans Mackowiak
584b6bd81e WrappedAbility: fix TriggeredRemembered being sacrificed 2021-01-09 06:15:05 +00:00
Sol
bf19fcfc83 Merge branch 'fixStackDesc' into 'master' 
Fix remaining placeholders in stackDescription

Closes #1349

See merge request core-developers/forge!3537
 2021-01-09 02:27:52 +00:00
Hythonia
c75fa0f057 Kraul Harpooner fix 2021-01-06 15:07:33 +00:00
Hans Mackowiak
b7db7bccfd SetStateEffect: use getCardState to support LKI 2021-01-05 11:44:55 +01:00
Hans Mackowiak
9e91a0ac09 Forecast boast 2021-01-05 05:54:12 +00:00
Anthony Calosa
aa15eaf007 Remove Unused Import 2021-01-04 09:38:35 +08:00
Hans Mackowiak
357243f540 Merge branch 'ChooseCardAmount' into 'master' 
Extend ChooseCardEffect amount

See merge request core-developers/forge!3551
 2021-01-03 18:05:28 +00:00
tool4EvEr
1e747a96bd Support for default placeholders 2021-01-03 00:50:01 +01:00
Michael Kamensky
ccb1a4e0b8 Merge branch 'aiSacToReduceCost' into 'master' 
AI: logic for X in Sac cost

See merge request core-developers/forge!3540
 2021-01-02 05:15:08 +00:00
Hans Mackowiak
7c9ac66e8a AI: logic for X in Sac cost 2021-01-02 05:15:08 +00:00
Hans Mackowiak
4eff3eac31 DelayedTriggerEffect: fix controller of the trigger 2021-01-01 20:38:04 +01:00
Michael Kamensky
6841f3c084 Merge branch 'triggerHandlerHostCleanup' into 'master' 
TriggerHandler: remove that host is reset from triggeredCard

See merge request core-developers/forge!3547
 2021-01-01 07:25:48 +00:00
Michael Kamensky
d51f1c1d5e Merge branch 'tawnos' into 'master' 
Fix Tawnos's Coffin

See merge request core-developers/forge!3546
 2021-01-01 07:25:26 +00:00
Hans Mackowiak
560da26ac9 TriggerHandler: remove that host is reset from triggeredCard 2020-12-31 20:14:27 +01:00
Northmoc
f36ff1e3a9 EffectEffect.java - add NoteCounterDefined$ param 2020-12-30 18:57:10 -05:00
Northmoc
a35dbfdb70 CountersNoteEffect.java - rollback the duct tape fix from last time 2020-12-30 18:50:06 -05:00
Sol
333aeb35dd Merge branch 'panglacial' into 'master' 
Panglacial Wurm fix

See merge request core-developers/forge!3004
 2020-12-30 02:36:32 +00:00
Tim Mocny
f700b9d43b Butcher Orgg!!! 2020-12-30 02:35:25 +00:00