Michael Kamensky
|
0cceaf0485
|
Merge branch '1286' into 'master'
Challenger 2020 Precon Decks (Quest Mode)
Closes #1286
See merge request core-developers/forge!2531
|
2020-02-20 08:40:55 +00:00 |
|
Tim Mocny
|
23d0d70478
|
Challenger 2020 Precon Decks (Quest Mode)
|
2020-02-20 08:40:55 +00:00 |
|
Hans Mackowiak
|
2eea49a8e4
|
Spell: add getAlternateHost for spells that would change the CardState
|
2020-02-20 07:03:24 +01:00 |
|
CCTV-1
|
c96ded2508
|
update translations
|
2020-02-20 10:15:23 +08:00 |
|
CCTV-1
|
f0a6760312
|
translate quest starting pool type
|
2020-02-20 10:15:08 +08:00 |
|
CCTV-1
|
55db217c74
|
update translations
|
2020-02-19 21:19:14 +08:00 |
|
CCTV-1
|
11c5283014
|
translate some desktop quest text
|
2020-02-19 21:18:58 +08:00 |
|
CCTV-1
|
bad3227e4f
|
update translation
|
2020-02-19 11:37:49 +08:00 |
|
CCTV-1
|
7ea0a5268c
|
translate deck viewer
|
2020-02-19 11:37:26 +08:00 |
|
CCTV-1
|
456083d2b0
|
translate tip text
|
2020-02-19 11:36:52 +08:00 |
|
CCTV-1
|
ad0766d9a6
|
Merge remote-tracking branch 'upstream/master'
|
2020-02-19 11:35:53 +08:00 |
|
CCTV-1
|
e1dbdcc051
|
update translations
|
2020-02-19 08:34:13 +08:00 |
|
Michael Kamensky
|
a7d8a62a69
|
Merge branch '1288-unstable-shapeshifter-not-unstable' into 'master'
Resolve "Unstable Shapeshifter not unstable"
Closes #1288
See merge request core-developers/forge!2530
|
2020-02-18 17:03:10 +00:00 |
|
Hans Mackowiak
|
c8fdc6f272
|
Resolve "Unstable Shapeshifter not unstable"
|
2020-02-18 17:03:10 +00:00 |
|
Sol
|
9990062ec1
|
Merge branch '1281-general-ui-display-commander-tax' into 'master'
Resolve "[General / UI] Display Commander Tax"
Closes #1281
See merge request core-developers/forge!2528
|
2020-02-18 14:23:48 +00:00 |
|
Hans Mackowiak
|
6817b4af66
|
Resolve "[General / UI] Display Commander Tax"
|
2020-02-18 14:23:48 +00:00 |
|
Hans Mackowiak
|
c42202a140
|
Merge branch 'Hanmac-master-patch-75614' into 'master'
Anax, Hardened in the Forge: updated triggers, need two for itself and other
See merge request core-developers/forge!2496
|
2020-02-16 15:36:07 +00:00 |
|
Hans Mackowiak
|
d6c0cf6ef8
|
Anax, Hardened in the Forge: updated triggers, need two for itself and other
|
2020-02-16 15:36:07 +00:00 |
|
MS
|
72ad7804ca
|
Update CountersPutEffect.java
|
2020-02-16 07:41:06 +00:00 |
|
CCTV-1
|
11e33bfaa0
|
update translation
|
2020-02-16 13:28:35 +08:00 |
|
CCTV-1
|
b1ad316134
|
translate some tab/menu text
|
2020-02-16 13:28:16 +08:00 |
|
CCTV-1
|
f2dc8e3e80
|
update translation
|
2020-02-16 12:02:10 +08:00 |
|
CCTV-1
|
3ff20effc8
|
translate floating zone title
|
2020-02-16 12:01:20 +08:00 |
|
CCTV-1
|
eb4ae865d4
|
Merge remote-tracking branch 'upstream/master'
|
2020-02-16 12:00:01 +08: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 |
|