Commit Graph

37905 Commits

Author SHA1 Message Date
Michael Kamensky
4dc13f9417 Merge branch 'patch-5' into 'master'
Update time_vault.txt

See merge request core-developers/forge!523
2018-05-02 08:15:11 +00:00
Meerkov
d71da723a0 Update time_vault.txt 2018-05-02 06:48:57 +00:00
Meerkov
c5ce102f4d Update forerunner_of_slaughter.txt 2018-05-02 06:47:54 +00:00
Meerkov
3d291444bc Update olivias_bloodsworn.txt 2018-05-02 06:47:22 +00:00
Agetian
270e25083a - Trigger an unexpected behavior warning instead of crashing the game. 2018-05-02 08:35:09 +03:00
Agetian
b6f55309ae - Some formatting. 2018-05-02 08:19:01 +03:00
Agetian
4afeaeb170 - Updating AiAttackController to use an AI hint SVar for Awakening and Prophet of Kruphix. 2018-05-02 08:04:31 +03:00
Michael Kamensky
932dde8177 Merge branch 'patch-1' into 'master'
Update leaf_arrow.txt

See merge request core-developers/forge!519
2018-05-02 04:44:20 +00:00
Meerkov
41b4ae9aae Update leaf_arrow.txt 2018-05-02 04:21:35 +00:00
Agetian
9d66d36a78 - Clarification in ManaReflectedEffect. 2018-05-02 07:15:26 +03:00
Agetian
a4133a07a8 - Cleanup and var rename in ManaReflectedEffect. 2018-05-02 07:14:57 +03:00
Michael Kamensky
f73d139aa7 Merge branch 'quest-decks' into 'master'
Quest Mode decks: updating Ixalan decks with RIX cards, adding two quest opponents focused on Dominaria cards.

See merge request core-developers/forge!510
2018-05-02 04:11:42 +00:00
Michael Kamensky
d6ca320c61 Merge branch 'patch-6' into 'master'
Update banefire.txt

See merge request core-developers/forge!518
2018-05-02 04:06:48 +00:00
Agetian
bbf645bc6b - Removed an empty line. 2018-05-02 07:05:07 +03:00
Agetian
ea547dfd4d - Removed an empty line. 2018-05-02 07:04:33 +03:00
Meerkov
d990f245d5 Update banefire.txt 2018-05-02 04:03:33 +00:00
Agetian
bd0bad4254 - Revert changes by Seravy to PlayerControllerHuman: a matter of opinion, wasn't discussed. 2018-05-02 07:02:38 +03:00
Michael Kamensky
a0c2c41203 Merge branch 'patch-4' into 'master'
Update chandras_defeat.txt

See merge request core-developers/forge!515
2018-05-02 03:59:26 +00:00
Michael Kamensky
74606f6b04 Merge branch 'patch-5' into 'master'
Update crumble_to_dust.txt

See merge request core-developers/forge!516
2018-05-02 03:59:16 +00:00
Michael Kamensky
cca8f84f61 Merge branch 'patch-6' into 'master'
Update living_lore.txt

See merge request core-developers/forge!517
2018-05-02 03:59:06 +00:00
Agetian
b3aaf2e0e4 - Style fix. 2018-05-02 06:57:52 +03:00
Agetian
5bf954c503 - Grow from the Ashes: added a missing reference. 2018-05-02 06:56:15 +03:00
Agetian
c66a8c20d2 - Integrating a reformatted fix by Seravy which makes Mox Amber AI playable (as well as Reflecting Pool) and fixes auto mana payment for these and other cards that use ManaReflected. 2018-05-02 06:55:59 +03:00
Agetian
d664f8abcd - Integrating a reformatted fix by Seravy which makes Mox Amber AI playable (as well as Reflecting Pool) and fixes auto mana payment for these and other cards that use ManaReflected. 2018-05-02 06:55:45 +03:00
Meerkov
403b1f3c39 Update living_lore.txt 2018-05-02 03:49:11 +00:00
Meerkov
38697f0835 Update crumble_to_dust.txt 2018-05-02 03:46:25 +00:00
Meerkov
0b5beddd51 Update chandras_defeat.txt 2018-05-02 03:40:45 +00:00
Michael Kamensky
a6c3a642f8 Merge branch 'patch-3' into 'master'
Update demigod_of_revenge.txt

See merge request core-developers/forge!514
2018-05-02 03:34:25 +00:00
Michael Kamensky
5e8d761a41 Merge branch 'patch-2' into 'master'
Update dark_supplicant.txt

See merge request core-developers/forge!513
2018-05-02 03:34:11 +00:00
Michael Kamensky
b4fd663329 Merge branch 'patch-1' into 'master'
Update marsh_flitter.txt

See merge request core-developers/forge!512
2018-05-02 03:33:59 +00:00
Meerkov
124c1632af Update demigod_of_revenge.txt 2018-05-02 03:20:12 +00:00
Meerkov
3867287c0f Update dark_supplicant.txt 2018-05-02 03:19:03 +00:00
Meerkov
c1c0424af9 Update marsh_flitter.txt 2018-05-02 03:13:43 +00:00
Michael Kamensky
cd9d70baee Merge branch 'master' into 'master'
Fixed Elfhame Druid Oracle text.

See merge request core-developers/forge!511
2018-05-01 20:26:12 +00:00
Agetian
13aec8f621 - Fixed Elfhame Druid Oracle text. 2018-05-01 23:25:21 +03:00
Agetian
7b5e7afd6d - Added quest opponent deck Princess Zelda 1.
- Minor stylistic tweaks to Princess Zelda 2, Starswirl the Bearded 2.
2018-05-01 22:51:06 +03:00
Agetian
a586be2c41 - Minor style fix. 2018-05-01 22:26:19 +03:00
Agetian
4630623d35 - Added the quest opponent deck Starswirl the Bearded 2.
- Minor fix in Princess Zelda 2.
2018-05-01 22:25:25 +03:00
Agetian
71a2e68551 - Dominaria: adding AI deckbuilding and gameplay hints. 2018-05-01 21:10:33 +03:00
Agetian
ef71e037f2 - Added quest opponent deck Princess Zelda 2. 2018-05-01 20:10:47 +03:00
Michael Kamensky
df30218f55 Merge branch 'assorted-fixes' into 'master'
- Added AI NeedsToPlay hint to Triumph of Gerrard.

See merge request core-developers/forge!508
2018-05-01 16:11:27 +00:00
Agetian
e8a84ad571 - Added AI NeedsToPlay hint to Triumph of Gerrard. 2018-05-01 19:10:46 +03:00
Agetian
43dfbed157 - Updating Morkus Rex 2 and 3 quest opponent decks with RIX cards. 2018-05-01 18:30:16 +03:00
Michael Kamensky
8b8605b773 Merge branch 'assorted-fixes' into 'master'
Added AI NeedsToPlay hint to Song of Freyalise.

See merge request core-developers/forge!507
2018-05-01 15:23:31 +00:00
Agetian
9ef27b2699 - Added AI NeedsToPlay hint to Song of Freyalise. 2018-05-01 18:21:44 +03:00
Michael Kamensky
faad9e0d2c Merge branch 'assorted-fixes' into 'master'
- Added AI logic to Shalai, Voice of Plenty.

See merge request core-developers/forge!506
2018-05-01 07:33:46 +00:00
Agetian
6a9ba00aca - Added AI logic to Shalai, Voice of Plenty. 2018-05-01 10:32:53 +03:00
Agetian
5329138d0f - Further tweaks to Guybrush Threepwood 2 quest deck. 2018-05-01 08:46:33 +03:00
Agetian
ed0109af94 - Updating Guybrush Threepwood decks with several RIX cards. 2018-05-01 08:27:14 +03:00
Sol
92556d5cb2 Merge branch 'revert-64e8dd35' into 'master'
Revert "Merge branch 'temp_dev6' into 'master'"

See merge request core-developers/forge!505
2018-05-01 01:11:41 +00:00