MS
|
72ad7804ca
|
Update CountersPutEffect.java
|
2020-02-16 07:41:06 +00:00 |
|
Michael Kamensky
|
6bf1af44d8
|
Merge branch 'master' into 'master'
Added puzzle PS_THB3 - Possibility Storm - Theros Beyond Death 03
See merge request core-developers/forge!2529
|
2020-02-15 19:13:40 +00:00 |
|
Agetian
|
a74f1a1427
|
- Added puzzle PS_THB3.
|
2020-02-15 16:28:36 +03:00 |
|
Michael Kamensky
|
df88cb970f
|
Merge branch '13Feb2020' into 'master'
Quest Shop Precons - Commander 2018
Closes #205
See merge request core-developers/forge!2525
|
2020-02-15 03:51:04 +00:00 |
|
Tim Mocny
|
452dee7e11
|
Quest Shop Precons - Commander 2018
|
2020-02-15 03:51:04 +00:00 |
|
Michael Kamensky
|
f6a6c33193
|
Merge branch '14Feb2020SLD' into 'master'
SLD - Theros Stargazing
See merge request core-developers/forge!2526
|
2020-02-15 03:50:36 +00:00 |
|
Tim Mocny
|
6a98c8f371
|
SLD - Theros Stargazing
|
2020-02-15 03:50:35 +00:00 |
|
Michael Kamensky
|
9546594e8d
|
Merge branch 'target-other-zones' into 'master'
Show ZoneAreas when targeting non-Stack zones
See merge request core-developers/forge!2492
|
2020-02-14 15:01:02 +00:00 |
|
Michael Kamensky
|
23f5b7696a
|
Merge branch 'kessCancelFix' into 'master'
HumanPlaySpellAbility: fix CastSA and CastFrom reset when ability is canceld
Closes #1282
See merge request core-developers/forge!2523
|
2020-02-14 14:01:16 +00:00 |
|
Hans Mackowiak
|
93ae66ad39
|
HumanPlaySpellAbility: fix CastSA and CastFrom reset when ability is canceld
|
2020-02-14 14:01:16 +00:00 |
|
ESE_Manuel
|
4d3ce706a5
|
workaround for divideMap not cleared after canceling ability
|
2020-02-14 12:50:52 +01:00 |
|
ESE_Manuel
|
5b57ef3531
|
Revert "fixed bug, dividedMap clear"
This reverts commit eadc0afe1a.
|
2020-02-14 12:06:02 +01:00 |
|
ESE_Manuel
|
eadc0afe1a
|
fixed bug, dividedMap clear
needs to be cleared when SA was not put on the stack or wrong stack description
|
2020-02-14 11:38:09 +01:00 |
|
ESE_Manuel
|
687b5f18ef
|
made stack description more clear for DamageDealEffect
changed stack description for distribute parameter (x counter)
|
2020-02-14 10:54:58 +01:00 |
|
ESE_Manuel
|
25178869ae
|
fallback if there is no targetrestriction on divide damage effects
|
2020-02-14 10:09:52 +01:00 |
|
ESE_Manuel
|
eedcad8280
|
removed unused import
|
2020-02-14 08:32:24 +01:00 |
|
ESE_Manuel
|
50c94755fb
|
Display Divided Values in stack description
|
2020-02-14 07:58:19 +01:00 |
|
friarsol
|
ec79434759
|
Improve Android zone restoration
|
2020-02-13 23:17:26 -05:00 |
|
Michael Kamensky
|
4192d56909
|
Merge branch 'mana_symbols_vanish' into 'master'
changed hardcoded symbol WIDTH and HEIGHT to constants
See merge request core-developers/forge!2520
|
2020-02-14 03:26:08 +00:00 |
|
Michael Kamensky
|
2c82aedb74
|
Merge branch 'bling' into 'master'
Secret Lair Drop Series and Promos
See merge request core-developers/forge!2522
|
2020-02-13 18:15:02 +00:00 |
|
Tim Mocny
|
049ed5f9c4
|
Secret Lair Drop Series and Promos
|
2020-02-13 18:15:02 +00:00 |
|
Michael Kamensky
|
b183862e8d
|
Merge branch 'triggerDamageAll' into 'master'
TriggerDamageAll: add new Trigger for Mindblade Render
See merge request core-developers/forge!2519
|
2020-02-13 15:12:52 +00:00 |
|
Hans Mackowiak
|
57bc3f930a
|
TriggerDamageAll: add new Trigger for Mindblade Render
|
2020-02-13 15:12:52 +00:00 |
|
Michael Kamensky
|
48a3b4d652
|
Merge branch '1272-battle-lands-etb-tap-untap-issue' into 'master'
Resolve "Battle Lands ETB tap/untap issue"
Closes #1272
See merge request core-developers/forge!2521
|
2020-02-13 15:12:03 +00:00 |
|
Hans Mackowiak
|
bee93cbab3
|
Player: update LastState when Land is played
|
2020-02-13 10:29:00 +00:00 |
|
Michael Kamensky
|
9d0a683db8
|
Merge branch 'release-updates' into 'master'
Update some release files
See merge request core-developers/forge!2516
|
2020-02-13 05:55:16 +00:00 |
|
Michael Kamensky
|
e163132a1e
|
Merge branch 'bling' into 'master'
Bling cards
See merge request core-developers/forge!2517
|
2020-02-13 05:54:32 +00:00 |
|
Tim Mocny
|
d35cb8de32
|
Bling cards
|
2020-02-13 05:54:31 +00:00 |
|
Michael Kamensky
|
162a27f5a1
|
Merge branch '12Feb2020' into 'master'
Today's tweaks
See merge request core-developers/forge!2514
|
2020-02-13 05:53:48 +00:00 |
|
Tim Mocny
|
d1c2096024
|
Today's tweaks
|
2020-02-13 05:53:48 +00:00 |
|
Zimtente
|
50c8e129d0
|
changed hardcoded symbol WIDTH and HEIGHT to constants
|
2020-02-12 19:07:45 +01:00 |
|
Sol
|
01bd5e5d54
|
Update CONTRIBUTORS.txt
|
2020-02-12 18:05:09 +00:00 |
|
Sol
|
562a9e1f8d
|
Update ANNOUNCEMENTS.txt
|
2020-02-12 18:04:34 +00:00 |
|
Sol
|
548811b370
|
Merge branch 'mana_symbols_vanish' into 'master'
fixed mana symbols vanishing/not being in the right place in card descriptions
See merge request core-developers/forge!2515
|
2020-02-12 17:59:25 +00:00 |
|
Zimtente
|
6ae29a311a
|
fixed mana symbols vanishing/not being in the right place in card descriptions
|
2020-02-12 17:40:50 +01:00 |
|
Sol
|
9934e20f8b
|
Merge branch 'promoarts' into 'master'
Promo arts – correcting a few errors
See merge request core-developers/forge!2513
|
2020-02-12 14:43:40 +00:00 |
|
Tim Mocny
|
e7a5ee57f1
|
Promo arts – correcting a few errors
|
2020-02-12 14:43:40 +00:00 |
|
Michael Kamensky
|
06f2f416e0
|
Merge branch 'brawl_update' into 'master'
Brawl format update
Closes #1277
See merge request core-developers/forge!2511
|
2020-02-12 04:24:38 +00:00 |
|
Tim Mocny
|
8bda30179e
|
Brawl format update
|
2020-02-12 04:24:38 +00:00 |
|
Michael Kamensky
|
9806c2c63c
|
Merge branch 'promoarts' into 'master'
Promo arts update (THB, ELD)
See merge request core-developers/forge!2512
|
2020-02-12 04:24:23 +00:00 |
|
Tim Mocny
|
9d5d6dd6d2
|
Promo arts update (THB, ELD)
|
2020-02-12 04:24:23 +00:00 |
|
Michael Kamensky
|
8fecf07c47
|
Merge branch '7Feb2020' into 'master'
2/10/2020 tweaks
See merge request core-developers/forge!2508
|
2020-02-11 03:12:46 +00:00 |
|
Tim Mocny
|
a539d9bf5a
|
2/10/2020 tweaks
|
2020-02-11 03:12:46 +00:00 |
|
friarsol
|
ddc531c5f2
|
Updates for Android
|
2020-02-10 21:30:19 -05:00 |
|
friarsol
|
ef0a1a843d
|
Pop up other zones during targeting
|
2020-02-09 21:32:24 -05:00 |
|
Michael Kamensky
|
bf200de73b
|
Merge branch 'triggerFixChangedCopy' into 'master'
Trigger: fix copy need new Map for params
See merge request core-developers/forge!2507
|
2020-02-09 19:34:03 +00:00 |
|
Hans Mackowiak
|
9a56fb8998
|
Trigger: fix copy need new Map for params
|
2020-02-09 19:34:03 +00:00 |
|
Michael Kamensky
|
4a3740dac7
|
Merge branch 'staticAbilitySuspendedFix' into 'master'
StaticAbility: fix ability is removed by other ability
See merge request core-developers/forge!2505
|
2020-02-08 17:33:05 +00:00 |
|
Hans Mackowiak
|
31145ef2eb
|
StaticAbility: fix ability is removed by other ability
|
2020-02-08 17:33:04 +00:00 |
|
Michael Kamensky
|
23ab256f7d
|
Merge branch 'gameActionCloneFix' into 'master'
GameAction: fix Clone working again
See merge request core-developers/forge!2506
|
2020-02-08 17:33:00 +00:00 |
|