Commit Graph

36379 Commits

Author SHA1 Message Date
Rob Schnautz
14f3d77e7e Update swiftwater_cliffs.txt 2018-03-22 01:00:54 +00:00
Rob Schnautz
f5668478d5 Update shivan_reef.txt 2018-03-22 01:00:08 +00:00
Rob Schnautz
17896501cf Update seat_of_the_synod.txt 2018-03-22 00:58:57 +00:00
Rob Schnautz
21835f574d Update phyrexias_core.txt 2018-03-22 00:58:04 +00:00
Rob Schnautz
9b029280fd Update great_furnace.txt 2018-03-22 00:56:54 +00:00
Rob Schnautz
4e1ff6af7d Update foundry_of_the_consul.txt and fix filename 2018-03-22 00:55:30 +00:00
Rob Schnautz
e339c9b0a9 Update darksteel_citadel.txt 2018-03-22 00:50:00 +00:00
Rob Schnautz
38dc30f9b9 Update plains.txt 2018-03-22 00:48:25 +00:00
Rob Schnautz
d291965a58 Update island.txt 2018-03-22 00:48:03 +00:00
Rob Schnautz
edb1d697fe Update swamp.txt 2018-03-22 00:47:40 +00:00
Rob Schnautz
8b2fbc409c Update mountain.txt 2018-03-22 00:47:15 +00:00
Rob Schnautz
4025c31570 Update forest.txt 2018-03-22 00:46:44 +00:00
Rob Schnautz
7518fa2bf3 Update treetop_village.txt 2018-03-22 00:44:17 +00:00
Rob Schnautz
aa830919db Update tranquil_thicket.txt 2018-03-22 00:41:34 +00:00
Rob Schnautz
2a91d26728 Update oran_rief_the_vastwood.txt 2018-03-22 00:40:39 +00:00
Rob Schnautz
0bd06961d9 Update talaras_battalion.txt 2018-03-22 00:17:59 +00:00
Rob Schnautz
bc40d17e5a Update leaf_gilder.txt 2018-03-22 00:14:54 +00:00
Rob Schnautz
becdb36e84 Update krosan_tusker.txt 2018-03-22 00:13:10 +00:00
Rob Schnautz
1e7cd00e2d Update elvish_mystic.txt 2018-03-22 00:10:14 +00:00
Rob Schnautz
7e44663112 Update elvish_archdruid.txt 2018-03-22 00:09:15 +00:00
Rob Schnautz
3053186479 Update elvish_aberration.txt 2018-03-22 00:08:17 +00:00
Rob Schnautz
851c86d032 Update trinket_mage.txt 2018-03-21 23:53:20 +00:00
Rob Schnautz
10ff95fa6b Update treasure_mage.txt 2018-03-21 23:52:08 +00:00
Rob Schnautz
f1b2c78695 Update Duel Decks Elves vs. Inventors.txt 2018-03-21 23:42:44 +00:00
Michael Kamensky
7d39889cef Merge branch 'androidmultiaiplayers' into 'master'
3/4 player matches on Android

See merge request core-developers/forge!295
2018-03-21 18:20:22 +00:00
swordshine
fa66720fc7 Merge branch 'jace' into 'master'
Signature Spellbook: Jace

See merge request core-developers/forge!306
2018-03-21 03:51:25 +00:00
Rob Schnautz
a7bb112c70 SS1 edition file 2018-03-21 01:52:51 +00:00
austinio7116
951a5dc978 Enabled team combo box on android now that multiplayer is possible, also attempted to prevent hanging on conceding in multiplayer games - only working on android so far 2018-03-20 21:53:06 +00:00
Michael Kamensky
7fab48ba9b Merge branch 'mobile-release' into 'master'
Preparing Forge for Android publish 1.6.8.001 [incremental].

See merge request core-developers/forge!304
2018-03-20 06:12:06 +00:00
Agetian
b2088e7cd2 - Preparing Forge for Android publish 1.6.8.001 [incremental]. 2018-03-20 09:10:54 +03:00
Blacksmith
04a39c34c6 Clear out release files in preparation for next release 2018-03-20 01:19:56 +00:00
Blacksmith
9e786bbdff [maven-release-plugin] prepare for next development iteration 2018-03-20 01:14:26 +00:00
Blacksmith
6e6af1c6c4 [maven-release-plugin] prepare release forge-1.6.8 forge-1.6.8 2018-03-20 01:14:23 +00:00
Blacksmith
394c048b21 Update README.txt for release 2018-03-20 01:12:53 +00:00
austinio7116
94e255b198 Fix for broken variants with new android multiplayer code 2018-03-19 12:52:49 +00:00
Michael Kamensky
8a41f8f476 Merge branch 'generated-stack-text' into 'master'
improve the generated stack text for Brainstorm

Closes #350

See merge request core-developers/forge!303
2018-03-19 06:04:58 +00:00
Sol
c680df8738 Merge branch 'multiplayer-platinum-angel' into 'master'
Improve can't win/lose effects for multiplayer

Closes #170

See merge request core-developers/forge!302
2018-03-18 21:26:19 +00:00
Jamin W. Collins
49f050655c improve the generated stack text for Brainstorm
Fixes: core-developers/forge#350

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-18 15:21:15 -06:00
Jamin W. Collins
f270213bb7 Improve can't win/lose effects for multiplayer
Fixes: core-developers/forge#170

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-18 13:38:49 -06:00
Michael Kamensky
6ed064eca6 Merge branch 'assorted-fixes' into 'master'
Ethereal Armor: added a missing SVar reference.

See merge request core-developers/forge!301
2018-03-18 17:18:17 +00:00
Agetian
d37f9a6ea1 - Ethereal Armor: added a missing SVar reference. 2018-03-18 20:16:28 +03:00
Michael Kamensky
ea7121f9d9 Merge branch 'newHexproof' into 'master'
Hexproof: is now done as CantTarget

See merge request core-developers/forge!300
2018-03-18 17:05:44 +00:00
Hanmac
9af8fddaf3 Hexproof: is now done as CantTarget with special shared handling 2018-03-18 15:31:19 +01:00
swordshine
b81fba82a5 Merge branch 'SellingLandsReplacement' into 'master'
Selling lands fixes

See merge request core-developers/forge!273
2018-03-18 09:17:52 +00:00
swordshine
fc220206d7 Merge branch 'patch' into 'master'
DOM: Fixed some scripts

See merge request core-developers/forge!299
2018-03-18 09:10:02 +00:00
swordshine
2686318c11 - DOM: Fixed some scripts 2018-03-18 17:08:47 +08:00
swordshine
869d32785d Merge branch 'cleanup-game-state' into 'master'
Clean up GameState code

See merge request core-developers/forge!297
2018-03-18 09:01:21 +00:00
swordshine
1e14373438 Merge branch 'patch' into 'master'
DOM: Yet more new cards

See merge request core-developers/forge!298
2018-03-18 08:55:03 +00:00
swordshine
e637874b85 Merge branch 'assorted-fixes' into 'master'
Fixed Doomsday (the search effect was optional/arbitrary) and Stangg (the twin token was not exiled).

Closes #356 and #359

See merge request core-developers/forge!296
2018-03-18 08:54:46 +00:00
Misha Colbourne
0a1efba7d9 DOM: Yet more new cards 2018-03-18 00:32:07 +00:00