Commit Graph

56884 Commits

Author SHA1 Message Date
Michael Kamensky
4cab7e12d7 Merge branch 'johnwilliams7-master-patch-48044' into 'master'
Update Pro Tour Promos.txt

See merge request core-developers/forge!6468
2022-04-01 11:09:51 +00:00
Anthony Calosa
cf9fbcac9d remove duplicate 2022-04-01 19:06:15 +08:00
John Williams
fcd0a6e65e Update Pro Tour Promos.txt 2022-04-01 10:52:55 +00:00
Anthony Calosa
edc4fa78fb remove extras 2022-04-01 18:51:33 +08:00
Anthony Calosa
b7977c628c remove check, add note here since it occurs only on mobile GUI 2022-04-01 18:48:28 +08:00
Anthony Calosa
d0624068f5 update check for mobile 2022-04-01 17:12:37 +08:00
Hans Mackowiak
a9e4e38c9a Merge branch 'ghastNPE' into 'master'
Fix Shambling Ghast NPE

See merge request core-developers/forge!6469
2022-04-01 08:49:00 +00:00
Anthony Calosa
746a2ce568 remove unnecessary methods 2022-04-01 16:43:05 +08:00
TRT
69f3859c45 Fix Shambling Ghast NPE 2022-04-01 10:19:29 +02:00
Anthony Calosa
fbc5ea4193 update ProtocolMethod 2022-04-01 12:20:57 +08:00
Anthony Calosa
2516fa6f94 Merge remote-tracking branch 'core/master' 2022-04-01 11:16:25 +08:00
John Williams
ce85b4043a Update Secret Lair Drop Series.txt 2022-04-01 03:12:32 +00:00
John Williams
6881782198 Update Pro Tour Promos.txt 2022-04-01 03:11:02 +00:00
Michael Kamensky
f2a51a98b6 Merge branch 'hasManaAbility' into 'master'
fix hasManaAbility

Closes #2130

See merge request core-developers/forge!6465
2022-04-01 03:04:38 +00:00
Anthony Calosa
fa05ab7373 Merge remote-tracking branch 'core/master' 2022-04-01 10:50:24 +08:00
Anthony Calosa
4b20a6cdc7 Update check again 2022-04-01 10:41:02 +08:00
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