Commit Graph

1281 Commits

Author SHA1 Message Date
Michael Kamensky
83f8acd0c7 Revert "Merge branch 'add-mobile-art-download' into 'master'"
This reverts merge request !1049
2018-11-16 11:30:03 +00:00
Michael Kamensky
9858baf52e Merge branch 'master' into 'master'
Commander quest mode

See merge request core-developers/forge!1053
2018-11-10 16:18:16 +00:00
Blacksmith
66c7f0745d [maven-release-plugin] prepare for next development iteration 2018-11-10 06:06:16 +00:00
Blacksmith
ed1febafe6 [maven-release-plugin] prepare release forge-1.6.18 2018-11-10 06:06:11 +00:00
Jeremy Pelkala
7b6634544a Removed unused imports from CEditorQuest 2018-11-08 12:46:46 -05:00
Jeremy Pelkala
c8c431398e Commander Quest checkstyle and bugfixes
-QuestEventCommanderDuelManager
Removed unused imports

-CEditorQuest
Fixed colorless cards getting filtered out of deck creation.
2018-11-08 12:46:46 -05:00
Jeremy Pelkala
71eaf70df5 Added Commander quest mode and world
-CardPool
 Added getFilteredPool() to easily get a Predicate applied copy of a CardPool.

 -GameRules
 Minor formatting change.

 -worlds.txt
 Added Random Commander to the list.

 -DeckConstructionRules
 New enum for defining the subformat a quest is using.

 -QuestAssets
 getLife() now has a switch for modifying the life for sub-formats.

 -QuestData
 New data save version. Includes a DeckConstructionRules enum.

 -QuestDataIO
 updateSaveFile will update old saves to have a default DeckConstructionRules complying with the new QuestData save version.

 -QuestController
 Updated to include support for DeckConstructionRules and specialized duel managers

 -QuestEvent
 Now have boolean to define if this is a "random" match for the duel list. Currently only QuestEventCommanderDuelManager makes use of this feature for Commander quests.

 -QuestEventCommanderDuel
 New QuestEventDuel used in the QuestEventCommanderDuelManager which contains a DeckProxy for use in generating random commander decks.

 -QuestEventCommanderDuelManager
 New duel manager to generate duels by difficulty for a Commander quest. Currently uses random generation to generate the decks of each opponent.

 -QuestSpellShop
 Sell Extras button now has a switch for taking into account special deck construction rules such as Commander only allowing singletons.

 -QuestUtil
 Starting a game now checks for various sub-format specific changes including a switch case for which variety of registered player to use.

 -QuestUtilCards
 Starting cardpool size is now modified by a switch case for sub-formats such as Commander.

 -QuestWinLoseController
 QuestEvents marked as random matches will now award a "Random Opponent Bonus" equal to the credit base. Currently only QuestEventCommanderDuelManager creates QuestEvents marked as such.

 -QuestWorld
 Added support for the Commander quest format and world.

 -CEditorQuest
 Many changes to add support for Commander in a style that, hopefully, also paths the way for future format support.

 -CSubmenuQuestData
 Support for Commander quests.

 -VSubmenuQuestData
 Support for Commander quests.
2018-11-08 12:46:46 -05:00
imakunee
3b6bbbac10 Revert "-CardPool"
This reverts commit 37d9dc753f
2018-11-08 12:46:46 -05:00
Jeremy Pelkala
cccaf1760d Added Commander quest mode and world
-CardPool
 Added getFilteredPool() to easily get a Predicate applied copy of a CardPool.

 -GameRules
 Minor formatting change.

 -worlds.txt
 Added Random Commander to the list.

 -DeckConstructionRules
 New enum for defining the subformat a quest is using.

 -QuestAssets
 getLife() now has a switch for modifying the life for sub-formats.

 -QuestData
 New data save version. Includes a DeckConstructionRules enum.

 -QuestDataIO
 updateSaveFile will update old saves to have a default DeckConstructionRules complying with the new QuestData save version.

 -QuestController
 Updated to include support for DeckConstructionRules and specialized duel managers

 -QuestEvent
 Now have boolean to define if this is a "random" match for the duel list. Currently only QuestEventCommanderDuelManager makes use of this feature for Commander quests.

 -QuestEventCommanderDuel
 New QuestEventDuel used in the QuestEventCommanderDuelManager which contains a DeckProxy for use in generating random commander decks.

 -QuestEventCommanderDuelManager
 New duel manager to generate duels by difficulty for a Commander quest. Currently uses random generation to generate the decks of each opponent.

 -QuestSpellShop
 Sell Extras button now has a switch for taking into account special deck construction rules such as Commander only allowing singletons.

 -QuestUtil
 Starting a game now checks for various sub-format specific changes including a switch case for which variety of registered player to use.

 -QuestUtilCards
 Starting cardpool size is now modified by a switch case for sub-formats such as Commander.

 -QuestWinLoseController
 QuestEvents marked as random matches will now award a "Random Opponent Bonus" equal to the credit base. Currently only QuestEventCommanderDuelManager creates QuestEvents marked as such.

 -QuestWorld
 Added support for the Commander quest format and world.

 -CEditorQuest
 Many changes to add support for Commander in a style that, hopefully, also paths the way for future format support.

 -CSubmenuQuestData
 Support for Commander quests.

 -VSubmenuQuestData
 Support for Commander quests.
2018-11-08 12:46:43 -05:00
imakunee
03cd56d2a9 Revert "-CardPool"
This reverts commit 37d9dc753f
2018-11-08 12:46:43 -05:00
Jeremy Pelkala
6857eadd11 -CardPool
Added getFilteredPool() to easily get a Predicate applied copy of a CardPool.

 -GameRules
 Minor formatting change.

 -worlds.txt
 Added Random Commander to the list.

 -DeckConstructionRules
 New enum for defining the subformat a quest is using.

 -QuestAssets
 getLife() now has a switch for modifying the life for sub-formats.

 -QuestData
 New data save version. Includes a DeckConstructionRules enum.

 -QuestDataIO
 updateSaveFile will update old saves to have a default DeckConstructionRules complying with the new QuestData save version.

 -QuestController
 Updated to include support for DeckConstructionRules and specialized duel managers

 -QuestEvent
 Now have boolean to define if this is a "random" match for the duel list. Currently only QuestEventCommanderDuelManager makes use of this feature for Commander quests.

 -QuestEventCommanderDuel
 New QuestEventDuel used in the QuestEventCommanderDuelManager which contains a DeckProxy for use in generating random commander decks.

 -QuestEventCommanderDuelManager
 New duel manager to generate duels by difficulty for a Commander quest. Currently uses random generation to generate the decks of each opponent.

 -QuestSpellShop
 Sell Extras button now has a switch for taking into account special deck construction rules such as Commander only allowing singletons.

 -QuestUtil
 Starting a game now checks for various sub-format specific changes including a switch case for which variety of registered player to use.

 -QuestUtilCards
 Starting cardpool size is now modified by a switch case for sub-formats such as Commander.

 -QuestWinLoseController
 QuestEvents marked as random matches will now award a "Random Opponent Bonus" equal to the credit base. Currently only QuestEventCommanderDuelManager creates QuestEvents marked as such.

 -QuestWorld
 Added support for the Commander quest format and world.

 -CEditorQuest
 Many changes to add support for Commander in a style that, hopefully, also paths the way for future format support.

 -CSubmenuQuestData
 Support for Commander quests.

 -VSubmenuQuestData
 Support for Commander quests.
2018-11-08 12:46:43 -05:00
Hans Mackowiak
da7659d8fd Update CMatchUI.java 2018-11-08 07:38:44 +00:00
Hanmac
2d4174c6d8 Update ExtraTurn in PlayerView 2018-11-08 08:28:32 +01:00
Pedro Ferreira
7765ff8b33 Add option to download missing card art on the fly 2018-11-03 00:05:24 +01:00
Chris H
6b6f85c289 Move RemoveDeck parsing to new form 2018-10-16 23:04:21 -04:00
Blacksmith
b11830a12a [maven-release-plugin] prepare for next development iteration 2018-10-15 15:42:16 +00:00
Blacksmith
a8fbfce51f [maven-release-plugin] prepare release forge-1.6.17 2018-10-15 15:42:12 +00:00
Jamin Collins
51bc066238 Merge branch 'fix+gonti' into 'master'
Fixing Mana types being inappropriately referenced in relation to Matrices

See merge request core-developers/forge!883
2018-10-12 23:13:33 +00:00
Chris H
8ac960168d Cross my fingers 2018-10-09 21:43:48 -04:00
Jamin W. Collins
4c6b59e7ec avoid NPE when right clicking during draft
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-10-01 21:46:19 -06:00
KrazyTheFox
f0c2cf8577 Fix up pom files 2018-09-29 16:41:06 -04:00
Blacksmith
1e46f88ef5 [maven-release-plugin] prepare for next development iteration 2018-09-29 19:53:15 +00:00
Blacksmith
5192fc3f59 [maven-release-plugin] prepare release forge-1.6.16 2018-09-29 19:53:10 +00:00
Jamin W. Collins
848df654fa set relative font sizes in Card Detail Panel
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-26 17:28:08 -06:00
Jamin W. Collins
9ab50c4d9d create and use getRelativeFontSize() method
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-26 17:27:15 -06:00
Jamin W. Collins
970931bcfd create a new user preference for default font size
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-25 07:49:23 -06:00
Jamin W. Collins
7781660c11 make font sizes relative to default (12)
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-25 07:49:23 -06:00
Jamin W. Collins
bbf63d9083 fix Quest Draft Editor
Closes: core-developers/forge#724

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-23 13:33:17 -06:00
Jamin W. Collins
781400c0a3 fix Draft mode editor
The recent changes to bring Commander style editors into the normal Deck
Editor tab appear to have broken the drafting editor.  This change set
appears to resolve that issue.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-23 13:04:19 -06:00
Michael Kamensky
5a500b857b Merge branch 'checkstyle' into 'master'
implement basic checkstyle configuration

See merge request core-developers/forge!911
2018-09-13 12:45:22 +00:00
Jamin W. Collins
fc62a41e46 implement basic checkstyle configuration
Remove all unused or redundant imports

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-11 18:16:43 -06:00
Hanmac
1cac53b4f0 update Project files for newer eclipse 2018-09-11 10:31:33 +02:00
Jamin W. Collins
58a1ad2dd0 create new model before potentially adding cards
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-10 18:19:43 -06:00
Jamin W. Collins
df91964573 add dated serial to layout file
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:27 -06:00
Jamin W. Collins
33d7a0adcc move Brawl next to Commander
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:27 -06:00
Jamin W. Collins
66fa0c5820 ensure deck name references are cleared on New Deck
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:27 -06:00
Jamin W. Collins
749eea6f57 default to creating a new deck of a given gameType
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:27 -06:00
Jamin W. Collins
f0830c8595 reflow a few oneline if statements
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:26 -06:00
Jamin W. Collins
6a4423a476 automatically edit preferred deck on tab load
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:26 -06:00
Jamin W. Collins
3fcb03d3ed support deleting Brawl, Commander, and TL decks
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:26 -06:00
Jamin W. Collins
5ab2efdc05 reflow DeckManager deleteDeck
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:26 -06:00
Jamin W. Collins
c4cf7d3c99 rename All Decks deck listing to Constructed
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:26 -06:00
Jamin W. Collins
5472421765 remove additional tabs when creating special editor
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:26 -06:00
Jamin W. Collins
e5281987a5 catch unlikely null sectionMode
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:26 -06:00
Jamin W. Collins
78b02c08db remove old Commander, Brawl, TL deck editor route
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:26 -06:00
Jamin W. Collins
29263d2e2d Add Commmander, Brawl, and TL to Deck Editor
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:26 -06:00
Jamin W. Collins
3f6a02b4b8 add Commander and Brawl to DeckManager case
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:26 -06:00
Jamin W. Collins
2a48819d2b reflow DeckManager case statement
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:26 -06:00
Jamin W. Collins
c4683677b3 Add commander decks to normal Deck Editor tab
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:26 -06:00
Jamin W. Collins
cad9139e9d deck section dropdown
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-09-09 10:00:26 -06:00