Michael Kamensky
75b4ef9df8
Merge branch 'master' into 'master'
...
Match version number across pom.xml files
See merge request core-developers/forge!6456
2022-03-29 04:50:56 +00:00
Michael Kamensky
d84b218df1
- Match version tag in pom.xml
2022-03-29 07:49:59 +03:00
Michael Kamensky
d0d08573f5
[maven-release-plugin] prepare for next development iteration
2022-03-28 17:48:30 +03:00
Michael Kamensky
31144ad505
[maven-release-plugin] prepare release forge-1.6.49
2022-03-28 17:48:16 +03:00
Michael Kamensky
54b37549fb
Merge branch 'master' into 'master'
...
Added puzzles PS_NEO3, PS_NEO4.
See merge request core-developers/forge!6454
2022-03-28 14:33:25 +00:00
Michael Kamensky
354e9d5897
- Added puzzles PS_NEO3, PS_NEO4.
2022-03-28 17:32:23 +03:00
Hans Mackowiak
9532b33d86
Merge branch 'durationfix' into 'master'
...
Fix UntilEndOfCombat
See merge request core-developers/forge!6452
2022-03-28 14:18:55 +00:00
Bug Hunter
e9c2f49a2d
Fix UntilEndOfCombat
2022-03-28 14:18:54 +00:00
Michael Kamensky
4a59794771
Merge branch 'master' into 'master'
...
- Fix compile.
See merge request core-developers/forge!6453
2022-03-28 14:11:39 +00:00
Michael Kamensky
3ad2c64da0
- Fix compile.
2022-03-28 17:10:23 +03:00
Anthony Calosa
5fd2befab3
Merge branch 'NewMaster' into 'master'
...
[Mobile] Class level marker
See merge request core-developers/forge!6451
2022-03-28 06:33:25 +00:00
Anthony Calosa
76e04d1905
Class level marker
2022-03-28 14:28:26 +08:00
Michael Kamensky
4e340ac286
Merge branch 'sac_sd' into 'master'
...
SacrificeEffect stackDesc - uncap if valid is a CoreType
See merge request core-developers/forge!6449
2022-03-28 04:22:47 +00:00
Michael Kamensky
a0acd7d748
Merge branch 'no_amp' into 'master'
...
remove & from filename
See merge request core-developers/forge!6450
2022-03-28 04:22:14 +00:00
Northmoc
0149d793b8
remove & from filename
2022-03-27 14:51:17 -04:00
Northmoc
f863f6e534
SacrificeEffect stackDesc - uncap if valid is a CoreType
2022-03-27 14:38:29 -04:00
Michael Kamensky
56a4a36c2b
Merge branch 'master' into 'master'
...
Try to load custom card scripts in workshop.
See merge request core-developers/forge!6448
2022-03-27 04:45:06 +00:00
Michael Kamensky
7ab73151be
Merge branch 'clb_24' into 'master'
...
CLB – 24 Mar
See merge request core-developers/forge!6447
2022-03-27 04:44:34 +00:00
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
