Anthony Calosa
218caf8b33
Update check
2022-04-01 07:08:36 +08:00
tool4EvEr
5d682e9616
Script fix
2022-03-31 22:15:36 +02:00
tool4EvEr
88c7e87095
Use getOverridingAbility
2022-03-31 19:53:32 +02:00
Michael Kamensky
c9b1a8d904
Merge branch 'demonstrate' into 'master'
...
Demonstrate: fix copy order
Closes #1957
See merge request core-developers/forge!6463
2022-03-31 15:02:29 +00:00
Michael Kamensky
273609600c
Merge branch 'scriptfix' into 'master'
...
Fix missing zone
Closes #2128
See merge request core-developers/forge!6466
2022-03-31 15:02:06 +00:00
TRT
e3596b279e
Clean up
2022-03-31 14:28:57 +02:00
Anthony Calosa
9e2d469263
NPE prevention
2022-03-31 20:18:57 +08:00
TRT
0d5d31625b
Gisa fix
2022-03-31 14:12:00 +02:00
Anthony Calosa
c5143c7f34
remove unused variable
2022-03-31 20:07:19 +08:00
Anthony Calosa
438b2f83b2
[Mobile] Fix Mobile GUI getAbilityToPlay
...
closes #2127
2022-03-31 20:04:28 +08:00
TRT
bbacc197ff
Fix missing zone
2022-03-31 13:29:47 +02:00
TRT
3d8a008378
fix hasManaAbility
2022-03-31 10:31:37 +02:00
TRT
ef00f41bcc
Demonstrate: fix copy order
2022-03-31 09:40:17 +02:00
Michael Kamensky
7ed5ad40c1
Merge branch 'johnwilliams7-master-patch-77036' into 'master'
...
Update Judge Gift Cards 2022.txt
See merge request core-developers/forge!6461
2022-03-31 07:04:39 +00:00
John Williams
435ef36de8
Update Judge Gift Cards 2022.txt
2022-03-30 21:41:01 +00:00
Michael Kamensky
226c91636e
Merge branch 'netplayFIX' into 'master'
...
Fix hidden cards when tutoring on client side
See merge request core-developers/forge!6455
2022-03-30 12:22:49 +00:00
Bug Hunter
b98812bb1c
Merge branch 'blocking' into 'master'
...
Slight improvement to mustBlockAnAttacker
See merge request core-developers/forge!6460
2022-03-29 17:40:37 +00:00
tool4EvEr
30113522e0
Slight improvement to mustBlockAnAttacker
2022-03-29 19:39:59 +02:00
Anthony Calosa
0b05a7809b
Merge branch 'NewMaster' into 'master'
...
[Mobile] When exiting the game, fades out the volume
See merge request core-developers/forge!6459
2022-03-29 11:48:55 +00:00
Anthony Calosa
bdd69aac28
When exiting the game, fades out the volume
2022-03-29 19:45:25 +08:00
Michael Kamensky
cb28cfec90
Merge branch 'master' into 'master'
...
Net Decks Archive Updates
See merge request core-developers/forge!6457
2022-03-29 10:28:36 +00:00
Michael Kamensky
00ac2db986
Merge branch 'snc_maestros_charm' into 'master'
...
SNC Maestros Charm
See merge request core-developers/forge!6458
2022-03-29 10:28:23 +00:00
paul_snoops
2d109d164b
SNC Maestros Charm
2022-03-29 10:02:15 +01:00
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
Churrufli
fb958b073c
Update net-decks-archive-pauper.txt
2022-03-29 03:52:37 +00:00
Churrufli
1cd0ca716b
Net Decks Archive Updates
2022-03-29 05:51:06 +02:00
tool4EvEr
1ae39dd270
Fix hidden cards when tutoring on client side
2022-03-28 23:46:06 +02: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
