external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,660 Commits 31 Branches 187 Tags
b26c38cc83959b29c57c8118a548a67aab8d6bcb
Commit Graph

55660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Mocny
b26c38cc83 Tidy up a few cards 2022-02-20 04:18:29 +00:00
Michael Kamensky
8c126e3fa4 Merge branch 'TRT-master-patch-37300' into 'master' 
Update forge-gui/res/cardsfolder/s/skyclave_apparition.txt

See merge request core-developers/forge!6262
 2022-02-19 18:07:16 +00:00
Bug Hunter
d3a146ae9c Update forge-gui/res/cardsfolder/s/skyclave_apparition.txt 2022-02-19 11:45:16 +00:00
Michael Kamensky
267e071956 Merge branch 'aegar' into 'master' 
receivedDamageFromThisTurn: use LKI

Closes #1

See merge request core-developers/forge!6253
 2022-02-19 11:38:13 +00:00
Bug Hunter
d886ae876d receivedDamageFromThisTurn: use LKI 2022-02-19 11:38:10 +00:00
Michael Kamensky
e97b992b9a Merge branch 'neo_17' into 'master' 
NEO – 18 Feb

See merge request core-developers/forge!6258
 2022-02-19 11:37:15 +00:00
Tim Mocny
164da1f77f NEO – 18 Feb 2022-02-19 11:37:13 +00:00
Bug Hunter
af49902fbd Merge branch 'testfix' into 'master' 
Fix test

See merge request core-developers/forge!6261
 2022-02-19 10:51:58 +00:00
tool4EvEr
549045994b Fix test 2022-02-19 11:51:19 +01:00
Michael Kamensky
f4ac0eff75 Merge branch 'strike' into 'master' 
capital S Strike in scripts, lowercase s strike in descriptions/detail

See merge request core-developers/forge!6259
 2022-02-19 04:24:53 +00:00
Tim Mocny
429e8e715c capital S Strike in scripts, lowercase s strike in descriptions/detail 2022-02-19 04:24:52 +00:00
Michael Kamensky
d57d39754f Merge branch 'neo_march' into 'master' 
NEO: March cycle

Closes #2077

See merge request core-developers/forge!6133
 2022-02-19 04:24:21 +00:00
Tim Mocny
dc949b1a89 NEO: March cycle 2022-02-19 04:24:16 +00:00
Michael Kamensky
6eff8a0a7c Merge branch 'reveal_fixes' into 'master' 
DiscardEffect: don't reveal to all if effect is just look

See merge request core-developers/forge!6257
 2022-02-19 04:23:40 +00:00
Michael Kamensky
934107a531 Merge branch 'fix' into 'master' 
fix some bad Graveyard targeting

See merge request core-developers/forge!6260
 2022-02-19 04:22:33 +00:00
Northmoc
acb75de48c fix some bad Graveyard targeting 2022-02-18 17:46:32 -05:00
tool4EvEr
2886711f4e DiscardEffect: don't reveal to all if effect is just look 2022-02-18 22:38:34 +01:00
Michael Kamensky
8c8d7af137 Merge branch 'neo_rs' into 'master' 
NEO: Reckoner Shakedown and BranchEffect upgrade

See merge request core-developers/forge!6240
 2022-02-18 19:42:44 +00:00
Tim Mocny
00ceefa8d9 NEO: Reckoner Shakedown and BranchEffect upgrade 2022-02-18 19:42:44 +00:00
Bug Hunter
d1210d46c1 Merge branch 'fixstatic' into 'master' 
Fix StaticAbilityContinuous wrong indentation

See merge request core-developers/forge!6255
 2022-02-18 16:15:36 +00:00
TRT
b88ddf14e4 Fix StaticAbilityContinuous wrong indentation 2022-02-18 17:14:34 +01:00
Hans Mackowiak
88af696073 Merge branch 'TRT-master-patch-70820' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/shigeki_jukai_visionary.txt

See merge request core-developers/forge!6254
 2022-02-18 12:01:50 +00:00
Bug Hunter
f84acff981 Update forge-gui/res/cardsfolder/upcoming/shigeki_jukai_visionary.txt 2022-02-18 11:54:33 +00:00
Hans Mackowiak
7ef684c973 Merge branch 'excess2' into 'master' 
Rework ExcessDamage trigger

Closes #2097

See merge request core-developers/forge!6249
 2022-02-18 11:18:49 +00:00
Bug Hunter
e0c718c790 Rework ExcessDamage trigger 2022-02-18 11:18:47 +00:00
Paul Hammerton
03b47f69a2 Merge branch 'sld_update' into 'master' 
Update SLD - February 2022 Superdrop

See merge request core-developers/forge!6252
 2022-02-18 08:33:57 +00:00
Paul Hammerton
03c091fb80 Update Secret Lair Drop Series.txt 2022-02-18 08:31:19 +00:00
Michael Kamensky
770cfc57b3 Merge branch 'learn' into 'master' 
Learn: add missing reveal

See merge request core-developers/forge!6250
 2022-02-18 03:49:28 +00:00
Michael Kamensky
87bd3ace53 Merge branch 'altaddkw' into 'master' 
Improve Card Detail formatting for AlternateAdditionalCost keyword

See merge request core-developers/forge!6251
 2022-02-18 03:49:10 +00:00
tool4EvEr
b91a29ba31 Learn: add missing reveal 2022-02-17 20:29:00 +01:00
Northmoc
90cf9d7537 Improve Card Detail formatting for AlternateAdditionalCost keyword 2022-02-17 14:08:50 -05:00
Michael Kamensky
738afacbf7 Merge branch 'neo_17' into 'master' 
NEO - 17 Feb

See merge request core-developers/forge!6248
 2022-02-17 18:59:44 +00:00
Tim Mocny
64b17eabf6 NEO - 17 Feb 2022-02-17 18:59:43 +00:00
Michael Kamensky
1901595ae1 Merge branch 'excess' into 'master' 
Excess damage fix

See merge request core-developers/forge!6245
 2022-02-17 18:59:39 +00:00
TRT
1dca57c5b5 AI fix 2022-02-17 17:51:25 +01:00
TRT
536642d1e0 Logic fix 2022-02-17 16:02:20 +01:00
TRT
98b6f33d18 Excess damage fix 2022-02-17 14:16:36 +01:00
Anthony Calosa
9a7349f045 Merge branch 'kevlahnota-master-patch-80486' into 'master' 
prevent NPE ControlGainAi.java

See merge request core-developers/forge!6244
 2022-02-17 01:12:46 +00:00
Anthony Calosa
7983ca7cf0 Fix NPE ControlGainAi.java 2022-02-17 01:11:55 +00:00
Paul Hammerton
3487f72581 Merge branch 'precipitous_drop' into 'master' 
a-precipitous_drop.txt fix

See merge request core-developers/forge!6242
 2022-02-16 22:21:33 +00:00
paul_snoops
63400ada2c a-precipitous_drop.txt drop fix 2022-02-16 22:18:04 +00:00
Michael Kamensky
29032b9c2c Merge branch 'neo_14' into 'master' 
NEO – 15 Feb

See merge request core-developers/forge!6238
 2022-02-16 18:38:28 +00:00
Tim Mocny
1526e9da1f NEO – 15 Feb 2022-02-16 18:38:26 +00:00
Michael Kamensky
a0240ffd98 Merge branch 'draft_update' into 'master' 
Implement DBL draft and NEO rankings

See merge request core-developers/forge!6222
 2022-02-16 14:35:54 +00:00
Michael Kamensky
99d8476020 Merge branch 'vivien' into 'master' 
Fix Vivien, Monsters' Advocate counters for all tokens

See merge request core-developers/forge!6239
 2022-02-16 14:34:57 +00:00
Hans Mackowiak
fab0fc08da Merge branch 'arlinnLayerFix' into 'master' 
CardFactoryUtil: use new Transform layer for Daybound

Closes #2087

See merge request core-developers/forge!6224
 2022-02-16 12:10:18 +00:00
Hans Mackowiak
21e403e2e4 Merge branch 'TRT-master-patch-97239' into 'master' 
Update forge-gui/res/cardsfolder/upcoming/the_kami_war_o_kagachi_made_manifest.txt

See merge request core-developers/forge!6241
 2022-02-16 12:06:11 +00:00
Hans Mackowiak
44984951d1 Merge branch 'DFCcopy' into 'master' 
Fix DFC copy having both faces

See merge request core-developers/forge!6236
 2022-02-16 12:04:50 +00:00
Bug Hunter
cbf1bdd3a5 Fix DFC copy having both faces 2022-02-16 12:04:44 +00:00
Bug Hunter
7237f07b34 Update forge-gui/res/cardsfolder/upcoming/the_kami_war_o_kagachi_made_manifest.txt 2022-02-16 07:21:42 +00:00