Commit Graph

55695 Commits

Author SHA1 Message Date
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
Renato Santos
dce447eeb8 Update forge-gui/res/cardsfolder/upcoming/kumano_faces_kakkazan_etching_of_kumano.txt 2022-02-18 09:11:13 +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
Renato Santos
721e247239 Corrections requested or implied so far 2022-02-18 00:06:16 +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
Renato Santos
23de92a6a4 Update forge-gui/res/cardsfolder/upcoming/bearer_of_memory.txt 2022-02-17 00:32:18 +00:00
Renato Santos
90ab91bc08 Tested card scripts for NEO (2022-02-16) 2022-02-17 00:30:08 +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
tool4EvEr
443b55f4a9 Fix Vivien, Monsters' Advocate counters for all tokens 2022-02-15 21:19:47 +01:00
Northmoc
6b273a0d74 BoosterGenerator support sheetReplaceCardFromSheet 2022-02-15 19:55:25 +00:00
Northmoc
a718d0039f CardEdition implement sheetReplaceCardFromSheet 2022-02-15 19:55:25 +00:00
Northmoc
1940b484af DBL edition tweak syntax for dfc replacements 2022-02-15 19:55:25 +00:00
paul_snoops
1c2335883b Implement DBL and NEO drafts 2022-02-15 19:55:25 +00:00
Michael Kamensky
39c49b2315 Merge branch 'ninjutsu_sd' into 'master'
ChangeZoneEffect - improve changeHiddenOriginStackDescription (focus on Ninjutsu)

See merge request core-developers/forge!6237
2022-02-15 18:54:55 +00:00
Northmoc
1bca6d158e ChangeZoneEffect - improve changeHiddenOriginStackDescription (focus on Ninjutsu) 2022-02-15 13:24:02 -05:00
Michael Kamensky
123c111914 Merge branch 'johnwilliams7-master-patch-78046' into 'master'
Update Secret Lair Drop Series.txt

See merge request core-developers/forge!6235
2022-02-15 16:20:46 +00:00
John Williams
4c59819dff Update Secret Lair Drop Series.txt 2022-02-15 12:28:49 +00:00
Michael Kamensky
1b5de6c2b3 Merge branch 'freshmaster' into 'master'
Tested card scripts for NEO (2022-02-13)

See merge request core-developers/forge!6227
2022-02-15 04:17:37 +00:00
Michael Kamensky
d690e3d28b Merge branch 'neo_kotose' into 'master'
NEO: Kotose, the Silent Spider and support

See merge request core-developers/forge!6232
2022-02-15 04:17:27 +00:00
Tim Mocny
618efd594b NEO: Kotose, the Silent Spider and support 2022-02-15 04:17:27 +00:00
Michael Kamensky
1c6a860194 Merge branch 'master' into 'master'
[Mobile] Add CloseScreen

See merge request core-developers/forge!6233
2022-02-15 04:16:24 +00:00
Anthony Calosa
d9ce7949ca Merge remote-tracking branch 'core/master'
# Conflicts:
#	forge-gui-mobile/src/forge/Forge.java
2022-02-15 11:45:41 +08:00
Anthony Calosa
4b5584dca9 #CloseScreen 2022-02-15 11:30:36 +08:00