Michael Kamensky
|
d3f2b07c83
|
Merge branch 'emergencypowers' into 'master'
Emergency Powers Addendum
See merge request core-developers/forge!2544
|
2020-02-23 04:31:04 +00:00 |
|
Tim Mocny
|
57ebad948d
|
Emergency Powers Addendum
|
2020-02-23 04:31:04 +00:00 |
|
Michael Kamensky
|
3f1b9df62a
|
Merge branch '1290-trigger-needs-cleanup-after-cost-is-paid' into 'master'
Resolve "Trigger needs cleanup after cost is paid"
Closes #1290
See merge request core-developers/forge!2543
|
2020-02-22 14:46:44 +00:00 |
|
Hans Mackowiak
|
f990f19795
|
Resolve "Trigger needs cleanup after cost is paid"
|
2020-02-22 14:46:44 +00:00 |
|
Michael Kamensky
|
b2e1855949
|
Merge branch '1295-runtimeexception-abilityfactory-getability-startled-awake-has-no-svar-trigbounce' into 'master'
Resolve "RuntimeException: AbilityFactory : getAbility -- Startled Awake has no SVar: TrigBounce"
Closes #1295
See merge request core-developers/forge!2540
|
2020-02-22 11:10:19 +00:00 |
|
Hans Mackowiak
|
850e54fbbc
|
Resolve "RuntimeException: AbilityFactory : getAbility -- Startled Awake has no SVar: TrigBounce"
|
2020-02-22 11:10:19 +00:00 |
|
Michael Kamensky
|
9931b33be7
|
Merge branch '1294-anax-hardened-in-the-forge-power-abnormal' into 'master'
Resolve "'Anax, Hardened in the Forge' power abnormal"
Closes #1294
See merge request core-developers/forge!2542
|
2020-02-22 10:17:40 +00:00 |
|
Hans Mackowiak
|
040518d094
|
Resolve "'Anax, Hardened in the Forge' power abnormal"
|
2020-02-22 10:17:40 +00:00 |
|
Michael Kamensky
|
823c651532
|
Merge branch 'master' into 'master'
Added puzzle PS_THB4 - Possibility Storm - Theros Beyond Death 04
See merge request core-developers/forge!2541
|
2020-02-22 10:17:32 +00:00 |
|
Agetian
|
b412a361b9
|
- Added puzzle PS_THB4.
|
2020-02-22 11:33:32 +03:00 |
|
Michael Kamensky
|
022ea1bb75
|
Merge branch 'PSLD1292' into 'master'
Secret Lair Promos.txt update
Closes #1292
See merge request core-developers/forge!2538
|
2020-02-22 06:33:58 +00:00 |
|
Tim Mocny
|
f08f7b09d5
|
Secret Lair Promos.txt update
|
2020-02-22 06:33:58 +00:00 |
|
Michael Kamensky
|
16452dd11a
|
Merge branch 'tezzeret21Feb' into 'master'
Forum fixes
See merge request core-developers/forge!2539
|
2020-02-22 06:33:45 +00:00 |
|
Tim Mocny
|
b0791a0c6a
|
Forum fixes
|
2020-02-22 06:33:45 +00:00 |
|
friarsol
|
2b8d826209
|
I think this should be working now!
|
2020-02-21 22:26:33 -05:00 |
|
Michael Kamensky
|
900ba9ec5b
|
Merge branch '1276-display-divided-value' into 'master'
Display Divided Values in stack description
Closes #1276
See merge request core-developers/forge!2524
|
2020-02-21 04:08:16 +00:00 |
|
Michael Kamensky
|
8db0281f91
|
Merge branch '559' into 'master'
Search zones for any number of cards named X and exile (or something else)
Closes #559
See merge request core-developers/forge!2527
|
2020-02-20 08:43:39 +00:00 |
|
Tim Mocny
|
9637091ab5
|
Search zones for any number of cards named X and exile (or something else)
|
2020-02-20 08:43:39 +00:00 |
|
Michael Kamensky
|
45771ec8c0
|
Merge branch 'mausoleum_wanderer' into 'master'
Mausoleum Wanderer proofread
See merge request core-developers/forge!2532
|
2020-02-20 08:42:39 +00:00 |
|
Tim Mocny
|
5c3ff8297e
|
Mausoleum Wanderer proofread
|
2020-02-20 08:42:39 +00:00 |
|
Michael Kamensky
|
722f512e53
|
Merge branch '504-shared-fate-can-not-cast-spell-queller-via-flash' into 'master'
Resolve "Shared Fate -- can not cast Spell Queller via Flash"
Closes #504
See merge request core-developers/forge!2534
|
2020-02-20 08:42:33 +00:00 |
|
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 |
|
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 |
|
friarsol
|
133f1656d8
|
Some more progress with autoupdate button
|
2020-02-17 21:51:18 -05:00 |
|
friarsol
|
599d75351c
|
Hook up AutoUpdater to do its thing
|
2020-02-17 16:51:34 -05: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 |
|
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 |
|