Commit Graph

56218 Commits

Author SHA1 Message Date
tool4EvEr
684175aa96 Clean up 2022-03-21 20:12:39 +01:00
tool4EvEr
4e8effe8d5 creatureAttackedThisTurn: switch to LKI 2022-03-21 20:08:14 +01:00
Michael Kamensky
0586fa6842 Merge branch 'impact' into 'master'
YNEO: Molten Impact and support

See merge request core-developers/forge!6416
2022-03-21 17:36:34 +00:00
Tim Mocny
eaaea4a2b3 YNEO: Molten Impact and support 2022-03-21 17:36:33 +00:00
Hans Mackowiak
16281b0e2a Merge branch 'hanmac-qual-nullable' into 'master'
removes compatqual.NullableDecl

See merge request core-developers/forge!6421
2022-03-21 12:34:20 +00:00
Hans Mackowiak
2a7db08900 removes compatqual.NullableDecl 2022-03-21 12:34:20 +00:00
Hans Mackowiak
583718c2eb Merge branch 'sentryUpgrade' into 'master'
Sentry upgrade

See merge request core-developers/forge!5944
2022-03-21 05:11:36 +00:00
Hans Mackowiak
c8e5a02487 Sentry upgrade 2022-03-21 05:11:36 +00:00
Michael Kamensky
77d9a54b3a Merge branch 'yneo_20' into 'master'
YNEO – 20 Mar

See merge request core-developers/forge!6419
2022-03-21 03:50:02 +00:00
Tim Mocny
d95a041263 YNEO – 20 Mar 2022-03-21 03:50:01 +00:00
Michael Kamensky
968ab925e7 Merge branch 'simfix' into 'master'
Simulation: fix wrong ActivatingPlayer

See merge request core-developers/forge!6420
2022-03-21 03:49:17 +00:00
tool4EvEr
d3cf93fe23 RE are not affected by noCreatureETBTriggers and should still be checked 2022-03-20 22:14:32 +01:00
tool4EvEr
b544ae0c9f Simulation: fix wrong ActivatingPlayer 2022-03-20 20:25:58 +01:00
Michael Kamensky
678d0a0f85 Merge branch 'y22_kamigawa_18_march' into 'master'
Alchemy: Kamigawa - 19 March

See merge request core-developers/forge!6418
2022-03-20 07:38:39 +00:00
paul_snoops
15fae9232c DefinedName fix 2022-03-19 18:17:57 +00:00
paul_snoops
38b99375d0 WIP: Alchemy: Kamigawa - 19 March 2022-03-19 16:22:53 +00:00
Anthony Calosa
7090381b88 Merge branch 'NewMaster' into 'master'
[Mobile] fix default theme check

See merge request core-developers/forge!6417
2022-03-19 11:21:10 +00:00
Anthony Calosa
93f55c58d4 [Mobile] fix default theme check 2022-03-19 19:11:24 +08:00
Michael Kamensky
40bbdab3fe Merge branch '2117-skipphase-needs-better-duration-for-their-next-turn' into 'master'
Resolve "SkipPhase needs better Duration$ for "their next turn""

Closes #2117

See merge request core-developers/forge!6414
2022-03-19 08:51:34 +00:00
Bug Hunter
ceff5b3e06 Resolve "SkipPhase needs better Duration$ for "their next turn"" 2022-03-19 08:51:33 +00:00
Michael Kamensky
3551d27a86 Merge branch 'addturn' into 'master'
AddTurnAi: wouldExtraTurnBeSkipped

See merge request core-developers/forge!6415
2022-03-19 08:51:19 +00:00
Michael Kamensky
83ee33f935 Merge branch 'restrictvalid' into 'master'
Finish RestrictValid check early if cost is for effect

Closes #2116

See merge request core-developers/forge!6413
2022-03-19 08:51:14 +00:00
tool4EvEr
0ea211567f AddTurnAi: wouldExtraTurnBeSkipped 2022-03-18 20:49:00 +01:00
tool4EvEr
92b6574e8f Update cards 2022-03-18 19:01:54 +01:00
TRT
443fa2e761 Fix CostContainsC 2022-03-18 19:01:53 +01:00
TRT
faefab9395 Finish RestrictValid check early if cost is for effect 2022-03-18 19:01:52 +01:00
Michael Kamensky
b317e46353 Merge branch 'NPEfix' into 'master'
Fix some payment NPE

See merge request core-developers/forge!6412
2022-03-18 17:53:53 +00:00
tool4EvEr
0d009ad982 Fix NPE if PW gets removed 2022-03-18 18:34:08 +01:00
TRT
469ada0e4c Fix some payment NPE 2022-03-18 11:55:21 +01:00
Michael Kamensky
e1bec2013d Merge branch 'y22_kamigawa_edition' into 'master'
Alchemy: Kamigawa Edition file and "Y22" set code fix

See merge request core-developers/forge!6411
2022-03-18 10:44:40 +00:00
Michael Kamensky
e0e625ae3e Merge branch 'a22_17' into 'master'
A22 digital-only cards: 17 Mar

See merge request core-developers/forge!6410
2022-03-18 10:44:07 +00:00
Tim Mocny
927b38907e A22 digital-only cards: 17 Mar 2022-03-18 10:44:06 +00:00
Michael Kamensky
cea6d9fbe8 Merge branch 'intense' into 'master'
Y22/J21: Implement Intensity mechanic

See merge request core-developers/forge!6408
2022-03-18 10:43:15 +00:00
Tim Mocny
a280a46ffd Y22/J21: Implement Intensity mechanic 2022-03-18 10:43:06 +00:00
paul_snoops
f1e8197c6b Alchemy: Kamigawa Edition file and "Y22" set code fix 2022-03-18 08:10:38 +00:00
Michael Kamensky
352649b0a8 Merge branch 'y22_kamigawa_16_march' into 'master'
Alchemy: Kamigawa - 16 March

See merge request core-developers/forge!6405
2022-03-17 17:10:19 +00:00
Michael Kamensky
f7e17d5a0e Merge branch 'BrazilianPortugueseTranslate' into 'master'
Add Brazilian Portuguese Language

See merge request core-developers/forge!6404
2022-03-17 17:09:27 +00:00
Bug Hunter
11bb906932 Merge branch 'fixes' into 'master'
RestartGame tweak + AI NPE from card changes

See merge request core-developers/forge!6409
2022-03-17 13:14:59 +00:00
TRT
8937d5a97d fix RestartGame corner case + AI NPE from card changes 2022-03-17 14:13:11 +01:00
Paul Hammerton
f5fbdfafd6 Update artillery_enthusiast.txt 2022-03-17 11:43:21 +00:00
Paul Hammerton
f1bdebbc33 Update artillery_enthusiast.txt 2022-03-17 11:41:50 +00:00
Michael Kamensky
86c19ec592 Merge branch 'neostandardmeta' into 'master'
archetype NEO

See merge request core-developers/forge!6406
2022-03-17 08:21:05 +00:00
Michael Kamensky
6027d060ea Merge branch 'chosd' into 'master'
More changeHiddenOriginStackDescription tweaks

See merge request core-developers/forge!6407
2022-03-17 08:20:25 +00:00
Tim Mocny
661a1ff43a More changeHiddenOriginStackDescription tweaks 2022-03-17 08:20:24 +00:00
Michael Kamensky
ddc00f68fe Merge branch 'combatAI' into 'master'
Improve notNeededAsBlockers

See merge request core-developers/forge!6398
2022-03-17 08:18:58 +00:00
Bug Hunter
b668e1e618 Improve notNeededAsBlockers 2022-03-17 08:18:51 +00:00
austinio7116
0d375e24d8 archetype NEO 2022-03-16 23:08:31 +00:00
paul_snoops
a6d8b3eb5d Alchemy: Kamigawa - 16 March 2022-03-16 21:41:18 +00:00
Victor Gonçalves
45901071f1 Merge remote-tracking branch 'upstream/master' into BrazilianPortugueseTranslate 2022-03-16 17:59:02 -03:00
Victor Gonçalves
2f2ffe739c Add Brazilian Portuguese Language
pt-BR.properties file created using crowdin: https://crowdin.com/project/forge-pt-br
cardnames-pt-BR.txt file created using cardnamesTranslations.py
2022-03-16 17:52:44 -03:00