Commit Graph

41274 Commits

Author SHA1 Message Date
Agetian
deae353e59 - Added puzzle PS_WAR0a. 2019-04-30 08:37:25 +03:00
Chris H
1f752ff210 Add Different colors to combo mana 2019-04-29 20:41:36 -04:00
swordshine
bb64aa8d25 Merge branch 'feather' into 'master'
Feather the Redeemed

See merge request core-developers/forge!1598
2019-04-29 12:41:02 +00:00
Hans Mackowiak
3f3b8bc41b Feather the Redeemed 2019-04-29 12:41:01 +00:00
Michael Kamensky
5ae6c9da0d Merge branch 'master' into 'master'
Minor code cleanup, minor counter visualization fix.

See merge request core-developers/forge!1599
2019-04-29 10:06:57 +00:00
Agetian
c609f199e4 - Minor code cleanup.
- Fix visualization of the Slumber counter.
2019-04-29 13:06:19 +03:00
Michael Kamensky
c38f1bf214 Merge branch 'sparkDouble' into 'master'
ReplacementEffect: rewrite for Riot and Spark Double

See merge request core-developers/forge!1592
2019-04-29 10:03:06 +00:00
Hans Mackowiak
1b47a81b8c ReplacementEffect: rewrite for Riot and Spark Double 2019-04-29 10:03:06 +00:00
Michael Kamensky
ca87a5d857 Merge branch 'fix_controlgain' into 'master'
Fix ControlGain effect to properly parse Defined (e.g. Humble Defector).

Closes #951

See merge request core-developers/forge!1597
2019-04-29 10:02:38 +00:00
Agetian
72101790ec - Fix ControlGain effect to properly parse Defined (e.g. Humble Defector). 2019-04-29 05:58:05 +03:00
swordshine
028afcb1be Merge branch 'patch' into 'master'
Add a token script

See merge request core-developers/forge!1595
2019-04-28 14:20:46 +00:00
swordshine
bdcf756eca Add a token script 2019-04-28 22:20:20 +08:00
swordshine
3e60e547e7 Merge branch 'morewarsparkcards' into 'master'
Another batch of forgescribe scriptable cards

See merge request core-developers/forge!1594
2019-04-28 14:19:26 +00:00
austinio7116
4f23fee435 Removed Serra for now 2019-04-28 07:22:55 +01:00
austinio7116
202667b708 Another batch of forgescriptable cards 2019-04-28 07:13:04 +01:00
Michael Kamensky
c4457110bc Merge branch 'patch-2' into 'master'
Emblems are not part of the token list

See merge request core-developers/forge!1593
2019-04-28 03:27:47 +00:00
Sol
074f180bbd Emblems are not part of the token list 2019-04-28 03:13:50 +00:00
swordshine
abfee4544d Merge branch 'nahari-storm-of-stone-x-damage' into 'master'
Fix the X-damage ability of Nahiri, Storm of Stone

See merge request core-developers/forge!1591
2019-04-28 01:26:57 +00:00
swordshine
e19980b16a Merge branch 'bleeding-edge-amass-fix' into 'master'
Fix the amass on Bleeding Edge

See merge request core-developers/forge!1590
2019-04-28 01:26:40 +00:00
Brock Fanning
39b16fd885 Fix the X-damage ability of Nahiri 2019-04-27 14:41:12 -04:00
Brock Fanning
29ed87af3a Fix the amass on Bleeding Edge 2019-04-27 14:40:16 -04:00
austinio7116
829aacf13b two cards taken from Nikita's MR to separate them from the Krenko clash 2019-04-27 08:47:49 +01:00
austinio7116
add3cf762a Merge branch 'war-cards' into 'master'
Enter the God-Eternals, Sarkhan

See merge request core-developers/forge!1588
2019-04-27 07:33:15 +00:00
Michael Kamensky
b8f7b3d4e7 Merge branch 'fix_charging_cinderhorn' into 'master'
Fix Charging Cinderhorn not working for anyone except the first player + fix Make Yourself Useful

Closes #952 and #954

See merge request core-developers/forge!1586
2019-04-27 05:07:44 +00:00
Agetian
8674487c4a - Fix Make Yourself Useful. 2019-04-27 07:52:31 +03:00
Adam Pantel
4930bc1fd1 Enter the God-Eternals, Sarkhan 2019-04-27 00:50:19 -04:00
Hans Mackowiak
2e6249cb71 Merge branch 'spark-harvest-fix' into 'master'
Fix alt costs of Spark Harvest

See merge request core-developers/forge!1585
2019-04-27 04:21:51 +00:00
Brock Fanning
5eceadb33a Fix alt costs of Spark Harvest 2019-04-27 04:21:51 +00:00
swordshine
8db8715222 Merge branch 'domris-ambush-fix' into 'master'
Domri's Ambush fix to deal damage according to correct target

See merge request core-developers/forge!1584
2019-04-27 01:09:40 +00:00
Agetian
538acaf45e - Account for all players when counting PlayerCountPlayers$Whatever 2019-04-26 20:32:54 +03:00
Brock Fanning
2d38b14a4e Domri's Ambush fix to deal damage according to correct target 2019-04-25 23:44:27 -04:00
Hans Mackowiak
db7d750fde Merge branch 'smotheringtithe' into 'master'
Smothering tithe spell description correction

See merge request core-developers/forge!1583
2019-04-25 08:32:18 +00:00
swordshine
c6bbc7bd2d Merge branch 'bio_hydra' into 'master'
Bioessence Hydra: add new Trigger for counters on many game entities at once

See merge request core-developers/forge!1574
2019-04-25 01:48:30 +00:00
Hans Mackowiak
f408950aad Bioessence Hydra: add new Trigger for counters on many game entities at once 2019-04-25 01:48:29 +00:00
swordshine
f7546eca32 Merge branch 'tomik-advokist-fix' into 'master'
Limit Tomik's ability to cards originating in graveyards

See merge request core-developers/forge!1582
2019-04-25 01:47:09 +00:00
austinio7116
ac66311b94 Smothering tithe spell description correction 2019-04-24 22:11:10 +01:00
Brock Fanning
02d355fd6d Limit Tomik's ability to cards originating in graveyards 2019-04-24 17:10:08 -04:00
swordshine
7a69f89aac Merge branch 'war_planeswalker_decks' into 'master'
First step towards WAR Planeswalker decks: adding the remaining PW exclusive card scripts

See merge request core-developers/forge!1581
2019-04-24 03:56:33 +00:00
Agetian
0196ada5bc - Adding the remaining cards for Planeswalker exclusive decks [WAR]. 2019-04-24 06:37:43 +03:00
Michael Kamensky
8253dd96e7 Merge branch 'cloneRewrite' into 'master'
Clone rewrite

See merge request core-developers/forge!1294
2019-04-24 03:01:13 +00:00
swordshine
0cdf2232b7 Merge branch 'jaya-venerated-firemage-fix' into 'master'
Limit Jaya, Venerated Firemage to once-per-turn

See merge request core-developers/forge!1580
2019-04-24 00:41:25 +00:00
Brock Fanning
7269882c52 Limit Jaya to once-per-turn 2019-04-23 14:38:07 -04:00
Hanmac
b72f965725 Make LKI have Original State even in Facedown 2019-04-23 20:00:35 +02:00
Hanmac
4ab65f6471 CloneAi: use checkPhaseRestrictions for refactor later 2019-04-23 20:00:35 +02:00
Hanmac
0b1add8098 GameSimulator: fix Clone needing gameLastState 2019-04-23 20:00:35 +02:00
Hanmac
545b085cb6 CloneEffect: only cards that where on the battlefield before the clone can be cloned 2019-04-23 20:00:35 +02:00
Hanmac
f3222e4723 some fixes 2019-04-23 20:00:35 +02:00
Hanmac
e84bbaffc3 updates for clone states 2019-04-23 20:00:35 +02:00
Hanmac
97e9e6d822 more to debug GameSimTest 2019-04-23 20:00:35 +02:00
Agetian
982e919c94 - Fix a compile error. 2019-04-23 20:00:35 +02:00