Commit Graph

37131 Commits

Author SHA1 Message Date
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
Misha Colbourne
303e7c74c3 DOM: Added some cards 2018-03-21 23:14:19 +00:00
Misha Colbourne
27a6313ce1 DOM: Added some cards 2018-03-21 18:47:03 +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
Misha Colbourne
afd1c6513f DOM: Added some cards 2018-03-21 17:03:27 +00:00
Misha Colbourne
ec86ca0fdd DOM: Added some cards 2018-03-21 16:56:43 +00:00
Misha Colbourne
4e0d799d98 DOM: Added some cards 2018-03-21 16:51:21 +00:00
Misha Colbourne
fed16e5be9 DOM: Added some cards 2018-03-21 04:39:46 +00:00
Misha Colbourne
5a50cd3c16 DOM: Added some cards 2018-03-21 04:20:59 +00:00
Alexei Svitkine
f436fa895b Support playing against Net Decks through the Test Deck function
on mobile Forge.
2018-03-21 00:04:14 -04: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
Misha Colbourne
d117e34a79 DOM: Added some cards 2018-03-21 01:52:13 +00:00
Misha Colbourne
52e103d9b3 DOM: Added some cards 2018-03-21 01:40:08 +00:00
Misha Colbourne
0bedf7a901 DOM: Added some cards 2018-03-21 01:13:34 +00:00
Misha Colbourne
04ec7965c1 DOM: Added some cards 2018-03-21 01:04:37 +00:00
Misha Colbourne
789ed72689 DOM: Added some cards 2018-03-21 00:44:18 +00:00
Misha Colbourne
eebb1adbd8 DOM: Added some cards 2018-03-20 23:30:04 +00:00
Misha Colbourne
d4d75684b4 DOM: Added some cards 2018-03-20 23:03:14 +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
Misha Colbourne
e7dca7ff6f Update whisper_blood_liturgist.txt 2018-03-18 00:30:22 +00:00
Misha Colbourne
93b552b33c DOM: Yet more new cards 2018-03-18 00:09:28 +00:00
Misha Colbourne
59a36015b6 DOM: Yet more new cards 2018-03-17 23:56:42 +00:00
Misha Colbourne
1ccf93b64b DOM: Yet more new cards 2018-03-17 23:37:39 +00:00
Misha Colbourne
b702effb60 DOM: Yet more new cards 2018-03-17 23:14:46 +00:00
Misha Colbourne
882218b493 DOM: Yet more new cards 2018-03-17 23:09:07 +00:00