Commit Graph

36379 Commits

Author SHA1 Message Date
Jamin W. Collins
420d31f825 replicate PlayerView(s) from incoming to existing
With standard network play games, we got lucky.  With variants the
existing approach was not accurately reflecting state changes.  This
appears to be resolved by replicating incoming PlayerView objects onto
their existing versions inside the Tracker object.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-28 18:09:49 -07:00
Jamin W. Collins
72ca147b73 ensure that selected variant is applied to GameRules
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-28 17:59:38 -07:00
Jamin W. Collins
f1a001a834 retrieve GameType from the Lobby
The existing GameView does not accurately reflect the GameType when
variants are selected.  The Lobby does have the correct GameType.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-28 17:55:32 -07:00
Jamin W. Collins
2b704e16c7 disable all network play variants
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-28 17:48:45 -07:00
Jamin W. Collins
2c55a9d86c bump commons-lang3 version for Java 9 support
Closes core-developers/forge#157

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-02-28 17:44:30 -07:00
Rob Schnautz
e4d45a1369 Update eladamris_call.txt 2018-03-01 00:41:20 +00:00
Rob Schnautz
eebeb4a213 Update imperial_recruiter.txt 2018-03-01 00:40:46 +00:00
Rob Schnautz
c70791b25c Update ratcatcher.txt 2018-03-01 00:38:18 +00:00
austinio7116
9aa6990823 Fixed issue with using random n-color deck generators for commander and tiny leaders by switching to the same deck generator as the card-based deck generation for consistency and to prevent tiny leader decks being short of cards using the n-color generators. 2018-02-28 22:11:05 +00:00
maustin
67b04aa48b Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements 2018-02-28 18:07:46 +00:00
austinio7116
0dc62d67ef Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements 2018-02-28 18:07:37 +00:00
maustin
f3e91e22d9 Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements 2018-02-28 18:06:14 +00:00
austinio7116
f8f3f640e3 Fixed adding wastes in colourless decks 2018-02-28 18:05:58 +00:00
austinio7116
63a1fe0b9e Fixed adding wastes in colourless decks 2018-02-28 15:14:41 +00:00
maustin
d9dffe0151 Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements 2018-02-28 13:53:53 +00:00
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
maustin
61eef2b86f Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements
# Conflicts:
#	forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
2018-02-28 13:00:50 +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
maustin
86878541f3 Merge remote-tracking branch 'origin/master' 2018-02-28 06:33:59 +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
maustin
92e548462d Merge remote-tracking branch 'origin/master' 2018-02-27 22:14:54 +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
maustin
0e06251424 Merge remote-tracking branch 'origin/commanderDeckGenerator' into commanderDeckGenerator 2018-02-27 14:52:56 +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
e361f09691 Code reformat to improve readability and supportiblity whilst addressing issues raised in friarsol's code review 2018-02-27 08:17:48 +00:00
austinio7116
1b1eb6636d Fixed mobile bug where card-gen decks disabled but still tries to load standard card-based decks 2018-02-27 06:40:59 +00:00
austinio7116
80a2d902c0 Updated card-based deck generation matrix with latest decks 2018-02-27 00:22:35 +00:00
austinio7116
6940eec453 Merge remote-tracking branch 'origin/commanderDeckGenerator' into commanderDeckGenerator 2018-02-26 23:58:22 +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
9cb1f2787c Assigning lstDecks.getGameType().getDeckFormat() to a variable so we don't have to write it out each conditional 2018-02-26 23:49:47 +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
13560e3b53 Error handling and thread timeout added to simulated matches to allow large AI tournaments without infinite length games due to loops. AI tournaments should now always finish - if the matches take too long they are scored as a draw. 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
Hans Mackowiak
6883ef1e9f Merge branch 'cardstatefix' into 'master'
CardState: fixed copy with keywordcache

See merge request core-developers/forge!259
2018-02-26 06:22:35 +00:00
Hanmac
6bb9dd1028 CardState: fixed copy with keywordcache 2018-02-26 07:20:51 +01: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 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