Anthony Calosa
16b30dd3ab
Merge branch 'master' into 'master'
...
Custom content fixes
See merge request core-developers/forge!6437
2022-03-25 04:39:36 +00:00
Paul Hammerton
6852389265
Merge branch 'clb_update' into 'master'
...
CLB edition couple more cards
See merge request core-developers/forge!6439
2022-03-24 22:25:29 +00:00
paul_snoops
0250276e25
CLB edition couple more cards
2022-03-24 22:24:41 +00:00
Paul Hammerton
0e4dc45046
Merge branch 'clb_edition' into 'master'
...
CLB edition file
See merge request core-developers/forge!6438
2022-03-24 22:10:21 +00:00
paul_snoops
61fbb01547
CLB edition file
2022-03-24 22:08:52 +00:00
Magpie
351604a7ec
Custom content fixes
...
Method to get token data was not good, it failed with tokens with image keys different to the script name. Current method just checks for the token's edition instead.
Removed a few now unused bits of code.
2022-03-24 22:39:54 +01:00
tool4EvEr
c56b4ef322
add removeUnpayableBlocks
2022-03-24 22:38:08 +01:00
TRT
ba66273688
Improve Attack/Block costs decisions
2022-03-24 17:40:00 +01:00
Michael Kamensky
8a5a39e6c1
Merge branch 'yneo_inch' into 'master'
...
YNEO: Inchblade Companion and support
See merge request core-developers/forge!6423
2022-03-24 13:38:42 +00:00
Tim Mocny
e3a14343f8
YNEO: Inchblade Companion and support
2022-03-24 13:38:42 +00:00
TRT
6029d1b505
AttackRequirement: don't filter out attackers with costs too early
...
They will be checked with collectLegalAttackers before payment would
happen anyway
2022-03-24 13:48:39 +01:00
Anthony Calosa
058f3d4e7f
Merge branch 'NewMaster' into 'master'
...
[Mobile] Help Button
See merge request core-developers/forge!6433
2022-03-24 12:21:32 +00:00
Anthony Calosa
acedcc72aa
[Mobile] Help Button
...
- Help Button for Join Discord | Forge Support options
2022-03-24 20:19:39 +08:00
Anthony Calosa
9a3c1014db
Merge branch 'master' into 'master'
...
Custom content tweaks
See merge request core-developers/forge!6432
2022-03-24 00:37:10 +00:00
Anthony Calosa
871530f647
Merge branch 'mustblock' into 'master'
...
MustBlockEffect: fix missing duration
Closes #2068
See merge request core-developers/forge!6431
2022-03-24 00:36:04 +00:00
Magpie
dec9476dc6
Custom content tweaks
...
Missed one check and that caused some decks to be identified as custom, incorrectly.
This makes a proper check and eliminates a few now unneeded calls and a variable I left unused.
2022-03-24 01:05:01 +01:00
tool4EvEr
5ae86d51f0
Use timestamps
2022-03-23 23:00:45 +01:00
tool4EvEr
4a37f78c82
logic fix
2022-03-23 22:06:58 +01:00
tool4EvEr
6b257fb9fb
MustBlockEffect: fix missing duration
2022-03-23 21:57:27 +01:00
Anthony Calosa
e4b4521c90
Merge branch 'NewMaster' into 'master'
...
[Mobile] Open draft screen after saving draft deck
See merge request core-developers/forge!6430
2022-03-23 08:13:31 +00:00
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
