Anthony Calosa
|
8417badc5f
|
[Mobile] Open draft screen after saving draft deck
|
2022-03-23 14:52:00 +08:00 |
|
Anthony Calosa
|
b238401b3f
|
Merge branch 'master' into 'master'
Custom content fixes
See merge request core-developers/forge!6429
|
2022-03-23 06:08:37 +00:00 |
|
Magpie
|
4e49db1d56
|
Custom content fixes
Allows loading of custom tokens and unifies the databases so it doesn't require workarounds to find everything.
|
2022-03-23 05:54:36 +01:00 |
|
Michael Kamensky
|
84a1181867
|
Merge branch 'yneo22' into 'master'
YNEO: 22 Mar (last card!)
See merge request core-developers/forge!6427
|
2022-03-23 03:36:20 +00:00 |
|
Tim Mocny
|
239ae1435d
|
YNEO: 22 Mar (last card!)
|
2022-03-23 03:36:19 +00:00 |
|
Michael Kamensky
|
e174973c99
|
Merge branch 'yneo_jl' into 'master'
YNEO: Jukai Liberator and support
See merge request core-developers/forge!6428
|
2022-03-23 03:36:10 +00:00 |
|
Tim Mocny
|
9c57904223
|
YNEO: Jukai Liberator and support
|
2022-03-23 03:36:09 +00:00 |
|
Michael Kamensky
|
ab0bd241f3
|
Merge branch 'yneo_fs' into 'master'
YNEO: Futurist Spellthief and support
See merge request core-developers/forge!6424
|
2022-03-23 03:36:06 +00:00 |
|
Tim Mocny
|
787dd561e9
|
YNEO: Futurist Spellthief and support
|
2022-03-23 03:36:05 +00:00 |
|
Michael Kamensky
|
ba46976e7d
|
Merge branch 'twosat-master-patch-28458' into 'master'
Update de-DE.properties
See merge request core-developers/forge!6426
|
2022-03-22 13:35:10 +00:00 |
|
Michael Kamensky
|
53ba65d882
|
Merge branch 'lkiFIX2' into 'master'
creatureAttackedThisTurn: switch to List
See merge request core-developers/forge!6425
|
2022-03-22 13:34:49 +00:00 |
|
TRT
|
dba5f33ef2
|
Don't count same creature twice
|
2022-03-22 12:38:37 +01:00 |
|
Andreas Bendel
|
15b725d03f
|
Update de-DE.properties
typo in lblNCommanderDamageFromPlayerCommander
|
2022-03-22 11:05:33 +00:00 |
|
TRT
|
2870055f35
|
Clean up
|
2022-03-22 11:13:06 +01:00 |
|
TRT
|
575918aed2
|
reatureAttackedThisTurn: switch to List
|
2022-03-22 09:44:10 +01:00 |
|
Michael Kamensky
|
6cd8b614a9
|
Merge branch 'LKIfix' into 'master'
creatureAttackedThisTurn: switch to LKI
See merge request core-developers/forge!6422
|
2022-03-22 05:43:54 +00:00 |
|
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 |
|