Commit Graph

36509 Commits

Author SHA1 Message Date
Agetian
81366a1e14 Merge remote-tracking branch 'origin/assorted-fixes' into assorted-fixes 2018-01-26 13:46:23 +03:00
Agetian
21c4e2eeda - Fixed Nissa, Steward of Elements references and AI logic. 2018-01-26 13:36:48 +03:00
Agetian
b866338197 - Only copy the intrinsic abilities in CardState#copyFrom, fixes clone abilities copying too much (e.g. copied tokens from Splinter Twin gaining the copy ability). 2018-01-26 09:16:13 +03:00
Agetian
98e19db3fc Merge branch 'master' of git.cardforge.org:core-developers/forge into assorted-fixes 2018-01-26 09:08:14 +03:00
Agetian
5221d871a0 - Only copy the intrinsic abilities in CardState#copyFrom, fixes clone abilities copying too much (e.g. copied tokens from Splinter Twin gaining the copy ability). 2018-01-26 09:07:50 +03:00
Sol
d48c93938f Merge branch 'patch-2' into 'master'
Simplify string generation in a few files

See merge request core-developers/forge!128
2018-01-26 01:51:30 +00:00
Michael Kamensky
0aa3583412 Merge branch 'assorted-fixes' into 'master'
- A couple AI tweaks and fixes, several card fixes

See merge request core-developers/forge!144
2018-01-25 15:42:32 +00:00
Michael Kamensky
38adbb7386 Merge branch 'patch-3' into 'master'
Fix spelling error in Might Makes Right quest opponent decks

See merge request core-developers/forge!147
2018-01-25 04:48:29 +00:00
Rob Schnautz
0ecdb07a0a description 2018-01-25 02:54:04 +00:00
Rob Schnautz
5191777fca description 2018-01-25 02:48:46 +00:00
Rob Schnautz
e1feff66b4 description 2018-01-25 02:42:42 +00:00
Rob Schnautz
e96f0e24b3 description, premium Nefarox, Overlord of Grixis 2018-01-25 02:26:19 +00:00
Rob Schnautz
891b2580c0 description 2018-01-25 02:23:12 +00:00
Rob Schnautz
8fa477a3f2 description 2018-01-25 02:22:16 +00:00
Rob Schnautz
48079df235 description 2018-01-25 02:21:38 +00:00
Rob Schnautz
4bd796c84b description 2018-01-25 02:21:00 +00:00
Rob Schnautz
efa38ea80a description, premium Lone Revenant 2018-01-25 02:20:21 +00:00
Rob Schnautz
b0be025f93 description 2018-01-25 02:18:14 +00:00
Rob Schnautz
08bc3170ad description 2018-01-25 02:17:12 +00:00
Rob Schnautz
b126a97e23 description, premium Angel of Flight Alabaster 2018-01-25 02:15:59 +00:00
Rob Schnautz
505940d9b4 description, premium Overwhelming Stampede 2018-01-25 02:12:21 +00:00
Rob Schnautz
41fbedbdb9 description, premium Flamerush Rider 2018-01-25 02:07:09 +00:00
Rob Schnautz
00379f8cd0 description, premium Rakshasa Vizier 2018-01-25 00:36:59 +00:00
Rob Schnautz
52e9772ef9 description 2018-01-25 00:32:48 +00:00
Rob Schnautz
634a9e7a6c description 2018-01-25 00:27:35 +00:00
Rob Schnautz
8383aeeddd Description + premium Tyrant of Valakut 2018-01-25 00:26:49 +00:00
Rob Schnautz
308c07c2b3 description 2018-01-25 00:25:31 +00:00
Rob Schnautz
ad352beb24 typo 2018-01-25 00:20:25 +00:00
Agetian
1e59b75d08 - Don't order cards from Discard<0/Hand> if there's only one card going to graveyard.
- Allow to order the cards going to graveyard from Discard<X/Random>.
2018-01-24 16:53:30 +03:00
Agetian
bfef8b125c - Fixed the cost "discard your hand" not allowing to order the cards going to graveyard when and if needed. 2018-01-24 16:41:12 +03:00
Agetian
b3f1bad6b7 - Fixed Jungle Creeper. 2018-01-24 16:02:11 +03:00
Agetian
8e3e38b72f Merge branch 'master' of git.cardforge.org:core-developers/forge into assorted-fixes 2018-01-24 09:15:49 +03:00
Agetian
714f21913b - Method name unification. 2018-01-24 09:14:08 +03:00
Agetian
6e1733821c - Somewhat better logic for Glimmer of Genius, part 2. 2018-01-24 09:07:00 +03:00
Hans Mackowiak
d5c285bb63 Merge branch 'bestowfix' into 'master'
Spell: Bestow now works with StaticAbilities again

See merge request core-developers/forge!145
2018-01-24 05:41:04 +00:00
Agetian
2be734f137 - Somewhat better logic for Glimmer of Genius. 2018-01-24 08:23:28 +03:00
Agetian
67ab92359f Merge branch 'master' of git.cardforge.org:core-developers/forge into assorted-fixes 2018-01-24 08:11:59 +03:00
Agetian
89184b97dd - ScryAi: Glimmer of Genius -> at opp EOT 2018-01-23 23:50:48 +03:00
Hanmac
466eac71a1 Spell: Bestow now works with StaticAbilities again 2018-01-23 21:32:45 +01:00
Agetian
ce35c6232e - Simple AI logic for Explore with a target (e.g. Enter the Unknown), fixes the AI wasting its activation. 2018-01-23 18:17:36 +03:00
Agetian
2e51375c0f - Somewhat less risky logic for the AI Glimmer of Genius (otherwise it manalocks itself too much) 2018-01-23 18:03:31 +03:00
Michael Kamensky
e38b34e391 Merge branch 'master' into 'master'
- Preparing Forge for Android publish 1.6.6.002 [hotfix].

See merge request core-developers/forge!143
2018-01-23 08:06:39 +00:00
Agetian
2e0af3c3fe - Preparing Forge for Android publish 1.6.6.002 [hotfix]. 2018-01-23 11:05:17 +03:00
Michael Kamensky
ab1550e24b Merge branch 'master' into 'master'
- FIXME: Temporarily disabling preList in a checkStaticAbilities call for Bestow to avoid P/T corruption and flickering

See merge request core-developers/forge!142
2018-01-23 08:03:15 +00:00
Agetian
7d57af98fd - FIXME: Temporarily disabling preList in a checkStaticAbilities call for Bestow (causes P/T flickering on cards and related game state corruption, resulting in unwanted P/T changes between game phases). 2018-01-23 10:57:48 +03:00
Michael Kamensky
f1cb6b7b8e Merge branch 'patch' into 'master'
- Fixed two more cards with delayed triggers

See merge request core-developers/forge!141
2018-01-23 07:03:38 +00:00
swordshine
2cb03f1671 - Fixed two more cards with delayed triggers 2018-01-23 14:56:55 +08:00
Michael Kamensky
da68b22601 Merge branch 'master' into 'master'
Fixed Oracle text for Hanweir Battlements

See merge request core-developers/forge!140
2018-01-22 19:39:18 +00:00
Agetian
c68f1b8a03 - Fixed Oracle text for Hanweir Battlements. 2018-01-22 22:23:49 +03:00
Michael Kamensky
02ae5e301d Merge branch 'patch' into 'master'
- Fixed a few cards

See merge request core-developers/forge!138
2018-01-22 14:02:23 +00:00