Commit Graph

39018 Commits

Author SHA1 Message Date
Michael Kamensky
76874d7a84 Merge branch 'master' into 'master'
- Minor mistype fix in SurveilEffect.

See merge request core-developers/forge!1008
2018-10-13 16:48:31 +00:00
Agetian
2a1a753182 - Minor mistype fix in SurveilEffect. 2018-10-13 19:48:05 +03:00
Michael Kamensky
4df6c9f701 Merge branch 'master' into 'master'
- Updating CHANGES.txt.

See merge request core-developers/forge!1007
2018-10-13 15:55:02 +00:00
Agetian
d404979d59 - Updating CHANGES.txt. 2018-10-13 18:49:58 +03:00
Michael Kamensky
1af92c92d8 Merge branch 'master' into 'master'
Fixed Drowned Secrets oracle text and description.

See merge request core-developers/forge!1006
2018-10-13 15:41:18 +00:00
Agetian
95e59f6d83 - Fixed Drowned Secrets oracle text and description. 2018-10-13 18:40:48 +03:00
Blacksmith
512565a36f Update README.txt for release 2018-10-13 15:40:09 +00:00
Sol
adb2b50814 Merge branch 'release-updates' into 'master'
Release updates

See merge request core-developers/forge!1005
2018-10-13 15:38:54 +00:00
tehdiplomat
c5fb6c5fd1 Update GRN rankings 2018-10-13 11:36:40 -04:00
tehdiplomat
6019d486d2 Updating release files 2018-10-13 11:34:05 -04:00
Jamin Collins
e5773693aa Merge branch 'mobile-release' into 'master'
Increasing the default memory size values for Android Maven project to allow it to compile with the growing code base.

See merge request core-developers/forge!1004
2018-10-13 05:14:19 +00:00
Agetian
cd5b95ca0e - Increase the default memory size values for Android Maven project to allow it to compile with the growing code base. 2018-10-13 08:10:06 +03:00
Michael Kamensky
ee31ff2378 Merge branch 'chaos-draft' into 'master'
Chaos draft

See merge request core-developers/forge!999
2018-10-13 05:04:50 +00:00
pfirpfel
6b96129c25 Chaos draft 2018-10-13 05:04:50 +00:00
Michael Kamensky
0605b169da Merge branch 'grn-deckhints' into 'master'
Adding AI draft deck hints for Guilds of Ravnica.

See merge request core-developers/forge!1003
2018-10-13 03:41:39 +00:00
Jamin Collins
51bc066238 Merge branch 'fix+gonti' into 'master'
Fixing Mana types being inappropriately referenced in relation to Matrices

See merge request core-developers/forge!883
2018-10-12 23:13:33 +00:00
Agetian
9f640b90ba - Added Ability$LifeGain hint to several cards. 2018-10-12 12:32:40 +03:00
Agetian
0cb3dfe9cb - Ability$Instant... -> Type$Instant 2018-10-12 11:03:25 +03:00
Agetian
30ea787f18 - Removed a duplicate DeckHas in Assure // Assemble. 2018-10-12 09:01:55 +03:00
Agetian
6924e8073b - Added AI draft deck hints for Guilds of Ravnica. 2018-10-12 08:50:41 +03:00
Michael Kamensky
bfa43bf157 Merge branch 'patch' into 'master'
Remaining C18 cards

See merge request core-developers/forge!1001
2018-10-11 11:12:20 +00:00
Michael Kamensky
18a0db1612 Merge branch 'cloneNameThis' into 'master'
Clone New Name and GainThisAbility

See merge request core-developers/forge!1002
2018-10-11 11:12:09 +00:00
swordshine
e78028a254 - Updated Genesis Storm 2018-10-11 16:41:41 +08:00
Hanmac
6b2a56534c cards: update Cards with GainThisAbility 2018-10-11 08:11:26 +02:00
Hanmac
b519896855 CloneEffect: now with NewName and GainThisAbility 2018-10-11 08:09:48 +02:00
swordshine
6c9ba7694d - Added some cards 2018-10-11 08:54:09 +08:00
swordshine
374d5b55cc Added Geode Golem 2018-10-10 12:27:08 +08:00
swordshine
7b6943bad5 Added Isolated Watchtower 2018-10-10 12:21:12 +08:00
swordshine
830e0be853 - Fixed Enchanter's Bane 2018-10-10 10:08:59 +08:00
Chris H
8ac960168d Cross my fingers 2018-10-09 21:43:48 -04:00
swordshine
01ab4d7467 Merge branch 'bug-fixes' into 'master'
fix Creeping Chill stack description

See merge request core-developers/forge!1000
2018-10-10 00:35:22 +00:00
Jamin W. Collins
241ce00823 fix Creeping Chill stack description
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-10-09 17:36:10 -06:00
Michael Kamensky
d378a32249 Merge branch 'patch' into 'master'
Fix more cards

See merge request core-developers/forge!998
2018-10-09 19:05:18 +00:00
swordshine
a2761c868c - Updated more scripts 2018-10-09 23:14:28 +08:00
swordshine
68de368c46 - Commander Storm cards 2018-10-09 20:51:00 +08:00
swordshine
747aca4342 - Fixed more cards 2018-10-09 19:07:11 +08:00
swordshine
fe8034ba79 - Fixed Darkblade Agent's description 2018-10-09 16:58:57 +08:00
swordshine
4089aefcde - migrate Aminatou, the Fateshifter 2018-10-09 15:55:06 +08:00
swordshine
4b60b224c3 - Fixed more cards 2018-10-09 14:56:37 +08:00
Michael Kamensky
85ad28c7a2 Merge branch 'puzzle-engine' into 'master'
- Added puzzle PS_GRN1.

See merge request core-developers/forge!997
2018-10-09 05:39:54 +00:00
Agetian
b5f7525f9f - Added a basic AI logic for Najeela, the Blade Blossom. 2018-10-09 08:34:50 +03:00
Michael Kamensky
1048e8c84a Merge branch 'master' into 'master'
- Added Aminatou, the Fateshifter

See merge request core-developers/forge!996
2018-10-09 05:19:05 +00:00
swordshine
375c1e0da7 - Added Aminatou, the Fateshifter 2018-10-09 12:03:29 +08:00
Sol
a43ef9944f Merge branch 'bug-fixes' into 'master'
a few fixups

See merge request core-developers/forge!995
2018-10-09 01:11:33 +00:00
Jamin W. Collins
d840cde96a fix Risk Factor's stack description
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-10-08 19:05:06 -06:00
Jamin W. Collins
252955920d catch and log CME in checkArgs
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-10-08 18:51:44 -06:00
Jamin W. Collins
28665bacdf log why deck was rejected
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-10-08 18:33:19 -06:00
swordshine
95346e186a - Fixed some cards 2018-10-08 22:10:14 +08:00
Michael Kamensky
6d3c53c5dc Merge branch 'master' into 'master'
Fixed some cards

See merge request core-developers/forge!993
2018-10-08 06:42:48 +00:00
swordshine
f18df3a223 - Updated Coveted Jewel 2018-10-08 14:10:44 +08:00