external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,974 Commits 33 Branches 187 Tags
a5f4375ff27f2894ff94dd19a6c35cbef390b51a
Commit Graph

4900 Commits

Author SHA1 Message Date
tool4EvEr
bff6d43701 Gorm the Great and support 2021-04-02 13:55:36 +02:00
tool4EvEr
095769b7cd Use StackDescription for AltCosts 2021-04-02 10:20:22 +02:00
Anthony Calosa
2ed264b2b1 Merge branch 'new-cards-2' into 'master' 
Add SpellCastOrCopy trigger

See merge request core-developers/forge!4338
 2021-04-02 07:44:56 +00:00
Adam Pantel
ec6ed8cea5 Remove redundant checks 2021-04-02 00:31:49 -04:00
Michael Kamensky
970d82e48e Merge branch 'fuse' into 'master' 
Fuse: add keyword to card text

See merge request core-developers/forge!4337
 2021-04-02 04:08:27 +00:00
Hans Mackowiak
479f72f160 AbilityUtils: add Valid to xCount to fix Mana Echoes 2021-04-02 00:53:46 +02:00
Adam Pantel
3abdeee850 Combine into one class 2021-04-01 16:23:33 -04:00
Adam Pantel
dfec2dc308 Add SpellCastOrCopy trigger 2021-04-01 15:36:51 -04:00
tool4EvEr
20f7bf5ebf Fuse: add keyword to card text 2021-04-01 20:46:31 +02:00
Michael Kamensky
ea2eb39975 Merge branch 'master' into 'master' 
Strixhaven fun with these new cards

See merge request core-developers/forge!4331
 2021-04-01 15:46:20 +00:00
Hythonia
3e3b14779e STX: Golden Ratio, Strixhaven Stadium and more 2021-04-01 11:26:34 +02:00
Michael Kamensky
5fe1de5f7f Merge branch 'multiple' into 'master' 
Multiple Choice

See merge request core-developers/forge!4320
 2021-04-01 08:02:39 +00:00
Hans Mackowiak
0cd376e039 CopySpellAbilityEffect: better description for optional 2021-03-31 09:26:45 +02:00
Michael Kamensky
9591ed744b Merge branch 'stx_30' into 'master' 
STX - 30 Mar

See merge request core-developers/forge!4316
 2021-03-31 04:51:15 +00:00
Northmoc
b99e1f7b28 support for second SVar check 2021-03-30 22:59:59 -04:00
Adam Pantel
39b09c5b25 Symmetry Master 2021-03-30 19:31:41 -04:00
Northmoc
05cf67d3e1 prompt support for Wandering Archaic 2021-03-30 18:19:00 -04:00
Anthony Calosa
6592694778 fix NPE 2021-03-30 17:28:08 +00:00
Adam Pantel
e233eed8eb STX cards 2021-03-30 12:44:14 -04:00
Hans Mackowiak
f53aff1882 SpellAbility: use SpellAbility for additionalAbilities so Trigger can have cost 2021-03-30 04:47:44 +00:00
tool4EvEr
baf5479d0b Fix RememberDiscarded 2021-03-29 18:52:13 +02:00
Bug Hunter
82f0c85bd0 Fix alternate state descriptions when viewed from original 2021-03-29 07:59:43 +00:00
Michael Kamensky
9802cb62d9 Merge branch 'update_word_of_command' into 'master' 
Update Word of Command mana payment check conditions

See merge request core-developers/forge!4291
 2021-03-28 12:26:30 +00:00
Michael Kamensky
97ff18c3e2 Merge branch 'uvilda' into 'master' 
Uvilda

See merge request core-developers/forge!4288
 2021-03-28 09:35:44 +00:00
Adam Pantel
6bc01c3472 Uvilda 2021-03-28 03:14:37 -04:00
tool4EvEr
3d9d6d45fe Fix NPE when targeting different players hidden zone 2021-03-28 09:05:31 +02:00
Lyu Zong-Hong
7fc85a47be Update Word of Command mana payment check conditions 2021-03-28 15:09:01 +09:00
Michael Kamensky
36e395e3a3 Merge branch 'master' into 'master' 
STX cards + Abundant Harvest

See merge request core-developers/forge!4285
 2021-03-27 15:54:25 +00:00
Lyu Zong-Hong
c990c8af56 Fix crash when mutate under an MDFC backside creature. 2021-03-27 22:00:20 +09:00
Hythonia
24f1285a43 Breena and PlayerProperty.java update 2021-03-27 12:02:13 +01:00
Hans Mackowiak
088b4fa07e Card: add turnInController to keep track under which control it entered 2021-03-27 11:35:52 +01:00
Michael Kamensky
44bb2ff0f5 Merge branch 'drawing' into 'master' 
Move all hidden zone changing after choosing

See merge request core-developers/forge!4256
 2021-03-27 04:37:27 +00:00
Bug Hunter
4effb02219 Move all hidden zone changing after choosing 2021-03-27 04:37:27 +00:00
Michael Kamensky
5d7ad6bb81 Merge branch 'master' into 'master' 
STX: One Ward, two card

See merge request core-developers/forge!4273
 2021-03-27 04:37:13 +00:00
Michael Kamensky
ddf8df9c71 Merge branch 'fixStartDraw' into 'master' 
Don't count draws before game started

Closes #1781

See merge request core-developers/forge!4275
 2021-03-27 04:34:09 +00:00
Michael Kamensky
b312f28ab6 Merge branch 'add_word_of_command' into 'master' 
Add Word of Command

See merge request core-developers/forge!4281
 2021-03-27 04:33:42 +00:00
Lyu Zong-Hong
2e768cb77b Add Word of Command 2021-03-27 12:25:20 +09:00
tool4EvEr
afb06baa56 Don't count draws before game started 2021-03-26 20:20:24 +01:00
Northmoc
067f0b3a66 bandaid for CharmEffect.java description builder 2021-03-26 14:44:32 -04:00
Hythonia
351f9c1976 STX: Ward's TriggerDescription 2021-03-26 18:14:27 +01:00
Northmoc
a11eff4d9a add Optional param and prompt to CharmEffect.java 2021-03-26 12:44:11 -04:00
Hythonia
3f06553604 Merge remote-tracking branch 'origin/master' 2021-03-26 16:34:34 +01:00
Hythonia
b038044347 STX: One Ward, two card 2021-03-26 15:01:59 +01:00
Michael Kamensky
a4d28b13ef Merge branch 'AIopponent' into 'master' 
AI Multiplayer improvements

See merge request core-developers/forge!4239
 2021-03-26 10:58:22 +00:00
Bug Hunter
fd01dc1bb1 AI Multiplayer improvements 2021-03-26 10:58:22 +00:00
Michael Kamensky
f935f57d23 Merge branch 'add_camouflage' into 'master' 
Add Camouflage

See merge request core-developers/forge!4268
 2021-03-26 10:57:03 +00:00
Michael Kamensky
50a6037a6d Merge branch 'onyx' into 'master' 
professor_onyx.txt

See merge request core-developers/forge!4262
 2021-03-26 10:56:10 +00:00
Hythonia
7952bdcb48 Revert "ManaEffect rework" 
This reverts commit 9db11ce6
 2021-03-26 11:37:57 +01:00
Hythonia
dfdf3160d3 Merge remote-tracking branch 'origin/master' 2021-03-26 11:20:36 +01:00
Lyu Zong-Hong
ce4f12179c Add Camouflage 2021-03-26 13:05:04 +09:00