Tim Mocny
9852e9b43b
CLB – 24 Mar
2022-03-27 04:44:30 +00:00
Magpie
d5fff27401
Try to load custom card scripts in workshop.
...
It's a very loose assumption, (that the cards are either in the same format as res/cardfolder in the custom/cards directory or just in the root of custom/cards.
It's not a perfect solution, which would be storing the file path with the card scripts so they can be recalled with precision, but this does the job temporarily.
Since it's a fairly naive approach and has limited utility, feel free to not merge if unnecessary.
2022-03-26 09:08:01 +01:00
Anthony Calosa
02d0b4ca66
Merge branch 'master' into 'master'
...
Fixed crash caused by checking for ??? edition (CardEdition.UNKNOWN)
See merge request core-developers/forge!6446
2022-03-26 00:37:33 +00:00
Anthony Calosa
012d6061dc
Merge branch 'announce' into 'master'
...
Fix Announce menu titles for more complex cards
See merge request core-developers/forge!6445
2022-03-26 00:36:51 +00:00
Tim Mocny
4cbdd8fb9b
Fix Announce menu titles for more complex cards
2022-03-26 00:36:50 +00:00
Anthony Calosa
39b70ee773
Merge branch 'attackfix' into 'master'
...
declareAttackers fixes
See merge request core-developers/forge!6443
2022-03-26 00:36:21 +00:00
Bug Hunter
c0ede21c31
declareAttackers fixes
2022-03-26 00:36:17 +00:00
Magpie
6cb86e3b6b
Fixed crash caused by checking for ??? edition (CardEdition.UNKNOWN)
...
Since it's separate from everything else, some checks will fail unless accounted for.
2022-03-26 01:16:33 +01:00
Anthony Calosa
bd4e3b56ac
Merge branch 'NewMaster' into 'master'
...
fix NPE
See merge request core-developers/forge!6444
2022-03-25 11:41:12 +00:00
Anthony Calosa
1a793e2ef5
fix NPE
2022-03-25 19:40:14 +08:00
Michael Kamensky
933b147eb4
Merge branch 'clb_abd' into 'master'
...
CLB: Ancient Brass Dragon & support
See merge request core-developers/forge!6440
2022-03-25 10:40:04 +00:00
Tim Mocny
ae8d4c38c4
CLB: Ancient Brass Dragon & support
2022-03-25 10:40:04 +00:00
Bug Hunter
0a4094bc03
Merge branch 'fix' into 'master'
...
Fix bad refactor
See merge request core-developers/forge!6442
2022-03-25 07:18:13 +00:00
TRT
f7d38a7f75
Fix bad refactor
2022-03-25 08:16:28 +01:00
Anthony Calosa
d366845ff7
Merge branch 'NewMaster' into 'master'
...
unused import
See merge request core-developers/forge!6441
2022-03-25 05:06:38 +00:00
Anthony Calosa
d132b329dc
unused import
2022-03-25 13:05:48 +08:00
Anthony Calosa
47fe7d4df1
Merge branch 'combatfix' into 'master'
...
AttackRequirement: don't filter out attackers with costs too early
Closes #2118
See merge request core-developers/forge!6434
2022-03-25 04:42:22 +00:00
Anthony Calosa
eaa6ad3880
Merge branch 'AIcombat' into 'master'
...
Improve Attack/Block costs decisions
See merge request core-developers/forge!6435
2022-03-25 04:41:28 +00:00
Anthony Calosa
b35ab2a666
Merge branch 'outmaneuver' into 'master'
...
assignAttackersDamage fixes
See merge request core-developers/forge!6436
2022-03-25 04:40:17 +00:00
Bug Hunter
0a2982ad26
assignAttackersDamage fixes
2022-03-25 04:40:17 +00:00
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
