Commit Graph

8224 Commits

Author SHA1 Message Date
austinio7116
6f28d0721e Refactoring of card-based deck generation to share the same generation code so that the Modern/Standard deck generation gets the benefit of improvements made in the Commander deck generation code - also fixed a few bugs with land counts, generic mana cards with a colour identity. Reduced the minimum number of connections in the matrix required to include cards in the card-based deckgen list to get more cards included in the model. 2018-02-28 13:53:43 +00:00
austinio7116
74d0e4c4dc Refactoring of card-based deck generation to share the same generation code so that the Modern/Standard deck generation gets the benefit of improvements made in the Commander deck generation code - also fixed a few bugs with land counts, generic mana cards with a colour identity. Reduced the minimum number of connections in the matrix required to include cards in the card-based deckgen list to get more cards included in the model. 2018-02-28 13:00:10 +00:00
austinio7116
2b40b6e560 Refactoring of card-based deck generation to share the same generation code so that the Modern/Standard deck generation gets the benefit of improvements made in the Commander deck generation code - also fixed a few bugs with land counts, generic mana cards with a colour identity. Reduced the minimum number of connections in the matrix required to include cards in the card-based deckgen list to get more cards included in the model. 2018-02-28 12:10:53 +00:00
Sol
b0a786970f Merge branch 'commanderDeckGenerator' into 'master'
Commander deck generator

See merge request core-developers/forge!249
2018-02-28 02:55:11 +00:00
austinio7116
d05e1e59dc Merge branch 'token_scripts' into 'master'
Allow scripts to be written for Tokens

See merge request core-developers/forge!236
2018-02-27 22:14:13 +00:00
austinio7116
9638153581 Attempting to revert accidental README change 2018-02-27 14:58:47 +00:00
austinio7116
c5c04e762f Code reformat to improve readability and supportiblity whilst addressing issues raised in friarsol's code review 2018-02-27 14:52:41 +00:00
austinio7116
80a2d902c0 Updated card-based deck generation matrix with latest decks 2018-02-27 00:22:35 +00:00
austinio7116
aaf27f2d60 Added options to disable card based deck generation and to ensure it fails gracefully if .dat data and/or decks folder is missing 2018-02-26 23:54:27 +00:00
austinio7116
c047ec8588 Update to card view of decks so long-press opens deck viewer to be consistent with list view 2018-02-26 23:49:47 +00:00
austinio7116
2b54468923 Increased basic land count in random commander decks.
Fixed lobby update on variant change
2018-02-26 23:49:47 +00:00
austinio7116
e8f257d2cf Completed random commander deck generation refactoring to work on Desktop, to support partner commanders and corrected a number of bugs found during testing. Full support on android and desktop for saving of selected deck states for the new features added. 2018-02-26 23:49:47 +00:00
austinio7116
66763e537d Addition of new new random commander deck generation - both fully random decks based on a selected commander and matrix-based synergistic deck generation using a model learned from thousands of commander decks. This also includes support for commander net-decks on desktop. 2018-02-26 23:49:47 +00:00
austinio7116
0eee296664 Added model file for new commander deck generation and updated modern and standard models too 2018-02-26 23:49:47 +00:00
austinio7116
2891133c5c Update to card view of decks so long-press opens deck viewer to be consistent with list view 2018-02-26 23:49:47 +00:00
austinio7116
6231775997 Increased basic land count in random commander decks.
Fixed lobby update on variant change
2018-02-26 23:49:47 +00:00
austinio7116
61ff4d50fd Completed random commander deck generation refactoring to work on Desktop, to support partner commanders and corrected a number of bugs found during testing. Full support on android and desktop for saving of selected deck states for the new features added. 2018-02-26 23:49:47 +00:00
austinio7116
52ae852953 Addition of new new random commander deck generation - both fully random decks based on a selected commander and matrix-based synergistic deck generation using a model learned from thousands of commander decks. This also includes support for commander net-decks on desktop. 2018-02-26 23:49:47 +00:00
austinio7116
7761706fb5 Added model file for new commander deck generation and updated modern and standard models too 2018-02-26 23:49:47 +00:00
maustin
d25437c8e0 Merge remote-tracking branch 'origin/master' 2018-02-26 23:45:17 +00:00
Blacksmith
d6278541dd Clear out release files in preparation for next release 2018-02-25 22:55:10 +00:00
Blacksmith
5977598c71 [maven-release-plugin] prepare for next development iteration 2018-02-25 22:49:44 +00:00
Blacksmith
35706d71f7 [maven-release-plugin] prepare release forge-1.6.7 2018-02-25 22:49:41 +00:00
Blacksmith
c38f0900d1 Update README.txt for release 2018-02-25 22:48:23 +00:00
Blacksmith
23ed82c0ba Update README.txt for release 2018-02-25 21:56:40 +00:00
tehdiplomat
56250bea63 Added token scripts to be used with Wurmcoil Engine and Tolsimir Wolfblood
The actual changes to use them currently not committed.
2018-02-25 15:36:16 -05:00
Sol
d4d376c8c6 Merge branch 'PlaneshiftPromos' into 'master'
Fixing Planeshift set alter foils in boosters

See merge request core-developers/forge!202
2018-02-25 20:19:19 +00:00
Sol
fdf2b26fdf Merge branch 'multiplayer' into 'master'
Multiplayer

See merge request core-developers/forge!257
2018-02-25 04:45:31 +00:00
Jamin W. Collins
eff0012ea1 add warning to server connect dialog
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-24 15:32:30 -07:00
Jamin W. Collins
d74186e93c update release notes
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-24 14:12:29 -07:00
Jamin W. Collins
fd35c8d862 add option to be alerted on receipt of priority
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-24 10:51:43 -07:00
austinio7116
1e3b4e34e5 Added metadata to new challenger decks to fix NPE 2018-02-24 17:24:53 +00:00
Michael Kamensky
4d41ed60c9 Merge branch 'challengerdecks2' into 'master'
Added first batch of preconstructed challenger decks

See merge request core-developers/forge!253
2018-02-24 06:48:26 +00:00
austinio7116
5a784e6c9b Added first batch of preconstructed challenger decks 2018-02-23 19:37:31 +00:00
Jamin W. Collins
06bc5e074a ensure that View(s) are used for ManaAbility choice(s)
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-22 20:06:23 -07:00
Jamin W. Collins
21d6b02410 submit previous deck if sideboarding timeout occurs
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-21 17:27:03 -07:00
Jamin W. Collins
5b0b719ce9 use SpellAbilityView for generic effect choice(s)
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-21 17:13:33 -07:00
Jamin W. Collins
9ce0315c3e give remote players 5 minutes per question
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-21 17:10:51 -07:00
Jamin W. Collins
0a034f9acb ensure Stack targeting uses views
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-20 20:47:21 -07:00
Jamin W. Collins
98774c408c ensure that TargetSelection presents CardView(s)
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-20 20:20:41 -07:00
Jamin W. Collins
802036f693 print a message when unable to send event
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-20 15:27:18 -07:00
Jamin W. Collins
487fec0258 multiplayer fix for 2nd and 3rd games of match
The server was not updating the lobby player's game reference.  So, the
remote client's response was being processed for the wrong game
instance.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-19 16:03:48 -07:00
Jamin W. Collins
d086e4d692 cleanup remote client game state creation
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-19 13:23:07 -07:00
Jamin W. Collins
8d2d66abb9 move external address out to a class attribute
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-19 13:23:07 -07:00
tehdiplomat
6ca1269261 Add ability to load tokens via scripts before 2018-02-19 13:15:12 -05:00
Michael Kamensky
74d9791f03 Merge branch 'ScorchedEarth' into 'master'
Scorched earth

See merge request core-developers/forge!234
2018-02-19 16:52:41 +00:00
Michael Kamensky
a6cb96c758 Merge branch 'BattleCry' into 'master'
Gerrard's Battle Cry : play before combat

See merge request core-developers/forge!235
2018-02-19 16:51:59 +00:00
Seravy
1d470f87d4 Gerrard's Battle Cry : play before combat 2018-02-19 12:55:59 +01:00
Michael Kamensky
8c680da98c Merge branch 'PriceOfProgress' into 'master'
Price of progress

See merge request core-developers/forge!210
2018-02-19 04:37:54 +00:00
Seravy
70593c2b6a Try to play Scorching Earth before playing a land for higher X. 2018-02-18 23:35:44 +01:00