Commit Graph

46850 Commits

Author SHA1 Message Date
Anthony Calosa
30edd6c9ff fix save Quest Commander 2020-12-03 05:48:47 +08:00
Northmoc
2228da9406 Effects/Emblems with set code/rarity to match host 2020-12-02 14:50:26 -05:00
Hans Mackowiak
f8996d8853 AiController: only temporally set LastState for checking, and reset later 2020-12-02 18:26:50 +01:00
Northmoc
4b5027a86e Monarch command zone effect: support multiple arts/sets 2020-12-02 11:02:46 -05:00
Hans Mackowiak
ee27081a09 Merge branch 'master' into 'master'
CMR: Wrong Turn

See merge request core-developers/forge!3475
2020-12-02 15:58:45 +00:00
Hythonia
6ae1545a2f CMR: Wrong Turn 2020-12-02 15:58:44 +00:00
Hans Mackowiak
cd69b2da2a SpellAbility: set LastStateBattlefield only into CastSA lki copy 2020-12-02 16:51:04 +01:00
Northmoc
b03f8b637a WAR token refactor 2020-12-02 09:54:25 -05:00
Anthony Calosa
8c530ba384 WIP: Quest Mode with Commander 2020-12-02 22:04:03 +08:00
Hans Mackowiak
9e53fdbad1 Merge branch 'master' into 'master'
Rot Wolf fix

See merge request core-developers/forge!3473
2020-12-02 12:02:52 +00:00
Hans Mackowiak
b284aea6fa Merge branch '1643-thousand-year-storm' into 'master'
Resolve "Thousand Year Storm"

Closes #1643

See merge request core-developers/forge!3474
2020-12-02 12:01:59 +00:00
Hans Mackowiak
ea48f28882 CurrentCastSpells: dont use CardCollection on them 2020-12-02 13:00:56 +01:00
Hans Mackowiak
b74bbf1801 SpellAbility: remove the need to store mayPlayOriginal 2020-12-02 11:17:22 +01:00
Hythonia
d47510367a Update rot_wolf.txt 2020-12-02 08:54:04 +00:00
Michael Kamensky
4193858ad4 Merge branch 'cleanup' into 'master'
Tidying a few old cards

See merge request core-developers/forge!3471
2020-12-02 04:52:20 +00:00
Sol
19a14e4745 Fix Tuya Bearclaw 2020-12-02 04:05:37 +00:00
Anthony Calosa
dc10e3b678 Merge branch 'master' into 'master'
remove unused import

See merge request core-developers/forge!3472
2020-12-02 02:16:08 +00:00
Anthony Calosa
f132b894ff remove unused import 2020-12-02 10:15:19 +08:00
Northmoc
e003c0a141 cleanup magus_of_the_abyss.txt 2020-12-01 20:35:03 -05:00
Northmoc
275c0cd681 remove useless Mandatory param from Destroy abilities 2020-12-01 20:33:40 -05:00
Anthony Calosa
bca6cbc1e8 Merge branch 'master' into 'master'
[Android] Manual update instruction.

See merge request core-developers/forge!3470
2020-12-01 22:36:27 +00:00
Anthony Calosa
0f05620dc9 [Android] Manual update instruction. 2020-12-02 06:33:52 +08:00
Hans Mackowiak
b765f7bb20 PlayerCollection: min and max can return null
Conflicts:
	forge-game/src/main/java/forge/game/ability/AbilityUtils.java
	forge-game/src/main/java/forge/game/player/PlayerCollection.java
2020-12-01 11:52:36 +01:00
Hans Mackowiak
a3f757f26a CardView: fix facedown view on mindSlave=Controller 2020-12-01 11:14:22 +01:00
Hans Mackowiak
7734cec951 Achievement: use Match instead of Game info to get the GameRules 2020-12-01 11:10:23 +01:00
Anthony Calosa
532e86dace Merge branch 'master' into 'master'
workaroundfix FileUriExposed

See merge request core-developers/forge!3469
2020-12-01 06:23:53 +00:00
Anthony Calosa
e614ed03ed workaroundfix FileUriExposed 2020-12-01 14:22:04 +08:00
Michael Kamensky
664db6e3bd Merge branch 'master' into 'master'
Rename PS_ZNR03 to PS_ZNR3.

See merge request core-developers/forge!3468
2020-12-01 05:03:16 +00:00
Michael Kamensky
0a134aa9c0 - Rename PS_ZNR03 to PS_ZNR3. 2020-12-01 07:56:26 +03:00
Anthony Calosa
3c679acd25 Merge branch 'master' into 'master'
prevent NoSuchElementException on PlayerCollection.java

See merge request core-developers/forge!3467
2020-12-01 03:46:58 +00:00
Anthony Calosa
fa09ce09b8 prevent NoSuchElementException on PlayerCollection.java 2020-12-01 11:45:54 +08:00
Sol
6c9f9a4d6c Merge branch 'playerControllerGameMemory' into 'master'
GameView: do not store Game anymore, get it from Match

Closes #1650

See merge request core-developers/forge!3457
2020-12-01 01:40:04 +00:00
Hans Mackowiak
8db2e01ec8 Player: fix hasProtection from Creature Types 2020-11-30 23:32:19 +01:00
Hans Mackowiak
ef830e200c ~ fix lastState update for Counters and Undying 2020-11-30 23:17:14 +01:00
Hans Mackowiak
a4be088724 GameAction: only update LastState for changed cards on the battlefield 2020-11-30 22:04:23 +01:00
Michael Kamensky
0d16ced6d2 Merge branch 'printsheet-cleanup' into 'master'
Printsheet cleanup - first batch

See merge request core-developers/forge!3464
2020-11-30 19:59:37 +00:00
pfirpfel
547a6301c2 KLD, AER cleanup 2020-11-30 17:16:34 +01:00
pfirpfel
325d9d26f6 XLN, RIX cleanup 2020-11-30 17:07:56 +01:00
pfirpfel
73c16bdf83 DGM, FRF cleanup 2020-11-30 16:57:33 +01:00
pfirpfel
cb0a88349e ME4 cleanup 2020-11-30 16:54:50 +01:00
pfirpfel
b38ca8e4ed THB cleanup 2020-11-30 16:32:04 +01:00
pfirpfel
49242e2fa9 Remove excess new lines at the end 2020-11-30 15:15:14 +01:00
pfirpfel
a301ac0d9e cleanup MB1 (Mystery Booster) 2020-11-30 15:13:54 +01:00
pfirpfel
a63e774afa Fix 2XM double first pick 2020-11-30 14:58:43 +01:00
pfirpfel
e01cb9d466 cleanup 2XM, fix foil collation 2020-11-30 14:58:18 +01:00
pfirpfel
5ecad7091c AKR cleanup 2020-11-30 14:07:48 +01:00
pfirpfel
1d4ab145b9 ZNR cleanup 2020-11-30 14:03:03 +01:00
pfirpfel
a52ab815a3 Adding alternate art as section 2020-11-30 13:51:45 +01:00
pfirpfel
b19a9aed66 IKO cleanup 2020-11-30 13:51:45 +01:00
pfirpfel
2cd50eb08a M21 cleanup 2020-11-30 13:51:45 +01:00