Commit Graph

7999 Commits

Author SHA1 Message Date
swordshine
2e45c1ace2 - Added 5 cards 2018-03-13 23:36:09 +08:00
swordshine
ebf9d99127 - DOM: Added 3 cards 2018-03-13 23:09:29 +08:00
swordshine
773c95af58 - DOM: Added six cards 2018-03-13 20:48:41 +08:00
swordshine
1990a54d5d - DOM: Added three cards 2018-03-13 20:02:49 +08:00
swordshine
d66e041db3 - DOM: Added a few cards 2018-03-13 12:26:47 +08:00
swordshine
4968d3efa6 Merge branch 'patch' into 'master'
Added a few Dominaria cards

See merge request core-developers/forge!283
2018-03-13 00:55:05 +00:00
swordshine
88f8840ef5 Merge branch 'deckgenimprovements' into 'master'
Deckgenimprovements

See merge request core-developers/forge!281
2018-03-13 00:51:21 +00:00
swordshine
2120d4493e - DOM: Added Tiana, Ship's Caretaker 2018-03-12 09:51:14 +08:00
swordshine
0251d5776e - DOM: Fixed Firesong and Sunspeaker so cycling Renewed Faith wouldn't trigger it 2018-03-12 09:10:18 +08:00
swordshine
7b837b4468 - DOM: Added a few cards 2018-03-11 23:23:29 +08:00
swordshine
67064b3275 - DOM: Added Oath of Teferi 2018-03-11 20:16:13 +08:00
swordshine
6f60bb264a - DOM: Added 3 cards 2018-03-11 19:28:34 +08:00
swordshine
b560df49a3 - DOM: Added Firesong and Sunspeaker 2018-03-11 18:23:47 +08:00
swordshine
d8b31ec4bc - DOM: Added a few cards 2018-03-11 17:09:04 +08:00
austinio7116
4dd52e6f82 Fixes to ensure deckchooser AI status is set correctly before decks are generated and that the list of card-based decks is updated to show only AI playable cards as required. 2018-03-11 07:20:03 +00:00
swordshine
23fcaaf5d0 - DOM: Added Darigaaz Reincarnated 2018-03-11 13:19:46 +08:00
swordshine
cd9702fd03 - DOM: Added Karn, Scion of Urza, Jhoira's Familiar, Jodah, Archmage Eternal, Mishra's Self-Replicator, and Mox Amber 2018-03-11 11:59:27 +08:00
swordshine
082cfc164d - DOM: Added Primevals' Glorious Rebirth 2018-03-11 10:04:54 +08:00
swordshine
ac75e554a9 - Added Karn's Temporal Sundering 2018-03-10 22:39:41 +08:00
swordshine
c249ed5f9f - DOM: Added "Legendary Sorcery" Urza's Ruinous Blast 2018-03-10 22:29:26 +08:00
swordshine
795c071e64 - DOM: Added Evra, Halcyon Witness 2018-03-10 18:05:40 +08:00
swordshine
fc130ebfb5 - DOM: Added Baird, Steward of Argive, Benalish Marshal, and Charge 2018-03-10 15:46:54 +08:00
swordshine
2f57a39fcc - DOM: added "Historic" and Jhoira, Weatherlight Captain 2018-03-10 15:04:31 +08:00
Jamin W. Collins
7615f333e1 disclose and enforce DEV_MODE state in network play
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-07 17:25:15 -07:00
Jamin W. Collins
d9913ffb1e broadcast message on player leaving, like joins
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-07 17:25:15 -07:00
Hans Mackowiak
83b1965733 Merge branch 'master' into 'fixes' 2018-03-07 13:59:49 +00:00
Sol
97e17a7754 Merge branch 'a25draftingfixes' into 'master'
A25draftingfixes

See merge request core-developers/forge!275
2018-03-07 03:58:41 +00:00
Sol
a5db48c719 Merge branch 'deckgenimprovements' into 'master'
Card-based deck generation improvements and refactoring

See merge request core-developers/forge!260
2018-03-07 03:52:05 +00:00
Hanmac
65d65c9e5f Treasure map: update code using Branch to remove trigger 2018-03-06 22:18:23 +01:00
Hanmac
f76c60e867 CommanderDeckGenerator: fixed getCommanderDecks 2018-03-06 22:10:20 +01:00
austinio7116
fcd392eec1 Added Masters 25 to draft blockdata for drafting and corrected Konming Sleeping Dragon quotes and rarity of Akroma 2018-03-06 19:50:36 +00:00
austinio7116
ca099e077b Ensuring that non-AI cards are excluded from the list of card-based decks that can be selected for an AI player 2018-03-05 12:43:05 +00:00
Seravy
3ea30a4461 Basic lands from drafts, except foils, do not get added to the player's inventory, to avoid generating an infinite lands through "add basic land". This both removes potential abuse by selling them, and eliminates the annoyance of having these lands wasting space in your inventory. 2018-03-04 23:53:27 +01:00
Seravy
83bae5ad74 Sold basic lands that could have been added through "Add basic land" will not be removed from decks. 2018-03-04 23:36:48 +01:00
Rob Schnautz
4027e14266 Masters 25 2018-03-04 20:47:02 +00:00
maustin
a84da053a6 Updated card-based deck generation data 2018-03-04 13:58:53 +00:00
austinio7116
1b0955b959 Removed commented out code and moved comment to correct location 2018-03-04 06:35:39 +00:00
Sol
594ce263b6 Merge branch 'multiplayer' into 'master'
Multiplayer

Closes #161 and #151

See merge request core-developers/forge!268
2018-03-03 14:27:12 +00:00
austinio7116
73a623cc1b Fixed card-based deck generation where extra colours were kept despite no cards of that colour being included. 2018-03-03 10:53:57 +00:00
austinio7116
e0882ab6b5 Switched off logging in deckbuilder 2018-03-03 10:23:31 +00:00
maustin
c93d9d909d Merge branch 'master' into deckgenimprovements 2018-03-03 07:19:44 +00:00
Michael Kamensky
dd38c0d581 Merge branch 'oracle-updates' into 'master'
Oracle updates

See merge request core-developers/forge!266
2018-03-03 04:28:57 +00:00
Jamin W. Collins
f01df7bdd2 display broadcast messages on server too
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-02 18:58:34 -07:00
Jamin W. Collins
ed16e6f4e9 option to fully reset the OnlineLobby
Closes core-developers/forge#161

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-02 18:58:34 -07:00
Jamin W. Collins
e9217f3261 fix server startup indentation for readability
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-02 18:58:34 -07:00
Jamin W. Collins
d2e4c53c20 Improve TargetSelection#chooseCardFromList
Closes core-developers/forge#151

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-03-02 18:58:34 -07:00
Jamin Collins
c402ae645e Merge branch 'masters25' into 'master'
Adding Masters25 cards and perliminary rankings

See merge request core-developers/forge!267
2018-03-03 00:25:54 +00:00
Chris H
9c69a33734 Adding Masters25 cards and perliminary rankings 2018-03-02 19:12:13 -05:00
Rob Schnautz
47eb18142d Update summoners_pact.txt 2018-03-02 22:25:11 +00:00
Rob Schnautz
0ca97727ad Update ash_barrens.txt 2018-03-02 22:24:14 +00:00