Commit Graph

4900 Commits

Author SHA1 Message Date
Hans Mackowiak
84aaccc3da CountersPutEffect: fixes ChoiceAmount when it can be Zero 2021-03-13 21:39:35 +01:00
Michael Kamensky
c6a0a1a886 Merge branch 'conditions' into 'master'
Fix ConditionLifeTotal

See merge request core-developers/forge!4192
2021-03-13 17:26:53 +00:00
tool4EvEr
e661b9c0b0 Fix ConditionLifeTotal 2021-03-13 11:52:12 +01:00
Hans Mackowiak
174836a57f SacrificeAllEffect: check timestamp for LKI objects 2021-03-13 10:39:59 +01:00
Michael Kamensky
72e0fb9137 Merge branch 'costdreams' into 'master'
Fix Devastating Dreams Cost

See merge request core-developers/forge!4187
2021-03-13 03:39:40 +00:00
tool4EvEr
28be3e3931 Fix Devastating Dreams Cost 2021-03-12 21:12:06 +01:00
Bug Hunter
0b4cc03300 Tahngarth: fix attacking 2021-03-12 18:24:02 +00:00
Alumi
3692c2b391 Add Oracle en-Vec 2021-03-12 10:48:31 +00:00
Michael Kamensky
a36c00e999 Merge branch 'companion' into 'master'
Restrictions for companion

Closes #1767

See merge request core-developers/forge!4171
2021-03-12 07:31:15 +00:00
Michael Kamensky
b20c79acd6 Merge branch 'remove-svars' into 'master'
Remove Svars param from Effect

See merge request core-developers/forge!4152
2021-03-12 05:43:29 +00:00
tool4EvEr
8151297973 PlayerPredicates: full targetable check 2021-03-11 17:56:40 +01:00
Adam Pantel
26eb83bab3 Captains Maneuver start 2021-03-11 11:51:19 -05:00
Adam Pantel
8a603a2ab2 getSVars improvements, snapshot svars on effect 2021-03-11 11:51:19 -05:00
Adam Pantel
0c15649116 Remove effect svars (code) 2021-03-11 10:49:44 -05:00
Alumi
a305dc999e Add Season of the Witch 2021-03-11 14:30:17 +00:00
tool4EvEr
96a449361c Restrictions for companion 2021-03-10 23:45:12 +01:00
Michael Kamensky
7fe38f8dfa Merge branch 'master' into 'master'
Torrent of Lava and other fixes

See merge request core-developers/forge!4136
2021-03-08 14:07:46 +00:00
Adam Pantel
726163dc97 Spelling error 2021-03-07 23:42:13 -05:00
Michael Kamensky
0969645033 Merge branch 'card-fixes' into 'master'
Card fixes

Closes #1763

See merge request core-developers/forge!4142
2021-03-08 04:15:31 +00:00
Adam Pantel
e45ed35a79 Fix cloned Zaxara 2021-03-07 22:56:54 -05:00
Adam Pantel
dcda2ade1d [Un-cards] Minigame cards 2021-03-07 17:26:36 -05:00
Hythonia
ecff4f02a3 Miscellaneous fixes and adjustments 2021-03-07 15:22:09 +01:00
Adam Pantel
fdd5aa936f Remove code for References$ 2021-03-07 00:36:03 -05:00
Michael Kamensky
cbc0051f8a [maven-release-plugin] prepare for next development iteration 2021-03-07 08:00:39 +03:00
Michael Kamensky
0437e9354b [maven-release-plugin] prepare release forge-1.6.39 2021-03-07 08:00:30 +03:00
Adam Pantel
acb21b2a28 [Un-cards] DeckLimit keyword + Cardboard Carapace 2021-03-06 16:16:07 -05:00
Michael Kamensky
5decca1571 Merge branch 'master' into 'master'
[Un-cards] Mine, Mine, Mine!

See merge request core-developers/forge!4122
2021-03-06 11:09:29 +00:00
Hythonia
849c1faaff ULG: Mine, Mine, Mine! 2021-03-06 12:02:38 +01:00
Michael Kamensky
6b24d93d46 Merge branch 'fix_change_zone_all_remember_meld_mutate' into 'master'
Remember meld and merged cards for ChangeZoneAll effect

See merge request core-developers/forge!4115
2021-03-06 04:59:13 +00:00
Lyu Zong-Hong
41da75d346 Don't add SA that are permanent spells to mutated creature 2021-03-06 10:41:19 +09:00
Lyu Zong-Hong
16ed4fa97a Remember meld and merged cards for ChangeZoneAll effect 2021-03-06 10:15:04 +09:00
Michael Kamensky
267403367c Merge branch 'master' into 'master'
Lantern of Undersight

See merge request core-developers/forge!4108
2021-03-05 19:01:40 +00:00
Anthony Calosa
87e36c3f6f Add castable cards available from command
- if somehow you have a lot of cards mixed in graveyard or exile, this will be an easier way to find them
2021-03-05 17:53:04 +00:00
Hythonia
d671eed1bd CMB1: Lantern of Undersight 2021-03-05 18:20:34 +01:00
Anthony Calosa
317a2ed7a4 Merge remote-tracking branch 'core/master' 2021-03-05 01:57:48 +08:00
Anthony Calosa
e030e28d80 [Mobile] Add support for viewing both sides of facedown DFC 2021-03-05 01:53:14 +08:00
Michael Kamensky
22a2263247 Merge branch 'card-fixes' into 'master'
Frankenstein's Monster and Hydradoodle fixes

Closes #1749

See merge request core-developers/forge!4099
2021-03-04 16:53:03 +00:00
Hans Mackowiak
a653085e60 ChangeZoneEffect: add Meld and Mutate for TriggerChangesZoneAll 2021-03-04 15:23:05 +01:00
Adam Pantel
d0fbd04081 Frankenstein's Monster and Hydradoodle fixes 2021-03-04 09:12:06 -05:00
Hans Mackowiak
37a6ed9336 AbilityUtils: add OriginalHost to calculateAmount 2021-03-04 07:48:42 +01:00
Hans Mackowiak
7525a1062e StaticAbilityContinuous: fix OriginalHost for abilities gained by static abilities 2021-03-04 07:23:01 +01:00
tool4EvEr
6aa08b0bc0 Fix Escape not paying additional costs 2021-03-03 20:15:05 +01:00
Michael Kamensky
23121a46af Merge branch 'fixpay' into 'master'
Force player choice for mandatory costs

See merge request core-developers/forge!4074
2021-03-03 18:20:12 +00:00
Anthony Calosa
ff4803c506 prevent NPE
it seems repeated momir ai games and you switch to human player and start any game causes the NPE resulting to crashing the UI
2021-03-03 18:43:25 +08:00
Anthony Calosa
cde2e6a1bd prevent NPE 2021-03-03 17:25:14 +08:00
Michael Kamensky
a2d4fb3e81 Merge branch 'fixAkiri' into 'master'
Fix Akiri multiplayer

See merge request core-developers/forge!4051
2021-03-03 03:50:17 +00:00
Bug Hunter
1a1bd6077b Fix Akiri multiplayer 2021-03-03 03:50:17 +00:00
tool4EvEr
65fc79a746 Force player choice for mandatory costs 2021-03-02 19:33:40 +01:00
Adam Pantel
a161d838ee Add dice rolling 2021-03-02 12:29:11 -05:00
Anthony Calosa
59db0eef2c Add foretell token image as facedown cardback 2021-03-02 21:08:04 +08:00