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
maustin
cd0cf2106a
Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements
2018-03-02 20:09:24 +00:00
austinio7116
edc921bf98
Fixed bug with not counting keycards as lands in the land count causing various issues. Fixed final keyword issue causing build warnings.
2018-03-02 20:09:06 +00:00
austinio7116
b67c060211
Fixed bug with not counting keycards as lands in the land count causing various issues. Fixed final keyword issue causing build warnings.
2018-03-02 19:49:42 +00:00
maustin
cb5791276a
Fixed AI commander and tiny leader decks not being passed correct forAI boolean so including non AI playable cards. Also allowed more lands in generated decks if required.
2018-03-02 19:28:05 +00:00
Michael Kamensky
d20317dd62
Merge branch 'patch-1' into 'master'
...
Oracle updates
See merge request core-developers/forge!261
2018-03-01 17:00:13 +00:00
austinio7116
9cfc42156d
Remove dual lands from mono coloured generated decks
2018-03-01 16:07:09 +00:00
austinio7116
52d8e3d54f
Fixed issue where generic mana cost creatures with colour identities were getting into decks that could not activate their abilities
2018-03-01 15:37:24 +00:00
austinio7116
ad693eb71f
Switched off deck builder logging
2018-03-01 07:09:28 +00:00
maustin
02eb8f632f
Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements
...
# Conflicts:
# forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
# forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
2018-03-01 06:55:16 +00:00
austinio7116
352236c390
Moved magic number to static variable
2018-03-01 06:54:04 +00:00
austinio7116
cb5f5938f7
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-03-01 06:14:38 +00:00
austinio7116
ed4583ee7a
Fixed adding wastes in colourless decks
2018-03-01 06:14:38 +00:00
austinio7116
d4b09f39ad
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-03-01 06:14:38 +00:00
austinio7116
25ab2ca2dc
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-03-01 06:13:25 +00:00
Sol
0f558f0479
Merge branch 'fix-zealous-inquisitor' into 'master'
...
Fix Zealous Inquisitor spell description
See merge request core-developers/forge!264
2018-03-01 03:29:34 +00:00
Chris H
4ca87ab84e
Fix Zealous Inquisitor spell description
2018-02-28 22:28:14 -05:00
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
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
austinio7116
f8f3f640e3
Fixed adding wastes in colourless decks
2018-02-28 18:05:58 +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
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
