Commit Graph

1353 Commits

Author SHA1 Message Date
Hanmac
1917871b98 GameSimulatorTest: assert check for DoubleRiot 2019-01-24 07:28:14 +01:00
Hanmac
96e6111400 Riot: Make Riot Enchantment look into the future 2019-01-24 07:27:22 +01:00
Michael Kamensky
8ed1ad4afc Merge branch 'master' into 'master'
remember old location and size of pop-up card list window

See merge request core-developers/forge!1300
2019-01-22 04:18:38 +00:00
churrufli
84ef513489 New 5 Gauntlet Contest - Starting Magic Core Set 2019 Welcome Decks 2019-01-22 00:35:42 +01:00
Peter F. Patel-Schneider
67ca319674 remove debugging print in manipulateCardList 2019-01-21 18:10:30 -05:00
Peter F. Patel-Schneider
1f4142e368 remember old location and size of pop-up card list window 2019-01-21 18:05:19 -05:00
Michael Kamensky
b8147a2e58 Merge branch 'master' into 'master'
use multi-select for dig

Closes #799

See merge request core-developers/forge!1296
2019-01-21 14:47:08 +00:00
Peter F. Patel-Schneider
f0c45cf814 Add visual chooser for two lists and use it for and/or dig 2019-01-20 21:23:16 -05:00
Evan Murawski
6090bc8117 Fix for Invalid Deck or Proxy File Names 2019-01-21 00:55:35 +00:00
churrufli
8bf2bd6ddc Translating hard-coded text to res en-US.properties 2019-01-21 00:43:16 +01:00
churrufli
07c2065917 Translating hard-coded text to res en-US.properties 2019-01-18 08:20:02 +01:00
Peter F. Patel-Schneider
c7d9646f7f adjust highlighting for new manipulation interface 2019-01-16 13:10:56 -05:00
Peter F. Patel-Schneider
2cd86bfe1e put yellow border on selectable cards 2019-01-16 12:09:13 -05:00
Peter F. Patel-Schneider
2f9fb96d29 use Iterators instead of Lists where possible in manipulateCardList 2019-01-16 12:06:21 -05:00
Peter F. Patel-Schneider
aa7ad578d5 change manipulateCardList to CardView 2019-01-15 06:24:11 -05:00
Peter F. Patel-Schneider
fb80dece04 ListCardArea augment clicking 2019-01-15 06:24:11 -05:00
Peter F. Patel-Schneider
482ab4b87c Add left-click to top and right-click to bottom for ListCardArea 2019-01-15 06:24:11 -05:00
Peter F. Patel-Schneider
f3f9a915d5 Base FloatingZone on FloatingCardArea 2019-01-15 06:24:11 -05:00
Peter F. Patel-Schneider
52184e24ce Add intermediate FloatingCardArea to hold commonalities between FloatingZone and ListCardArea 2019-01-15 06:24:11 -05:00
Hanmac
20eba0fbd7 GameAction: add PlayerController:confirmMulliganScry 2019-01-13 22:01:22 +01:00
Hans Mackowiak
0606a00942 DeckFormat: A deck can have any number of cards named CARDNAME. 2019-01-12 16:13:00 +00:00
Michael Kamensky
7d0dbff8bc Merge branch 'master' into 'master'
Select cards from any Zone that can be shown and do arrangeForScry by popping up library and moving cards (in desktop GUI); Pass min/max card selections through to GUI

See merge request core-developers/forge!1260
2019-01-11 17:08:50 +00:00
Peter F. Patel-Schneider
3609ff9eff only use new input methods if in desktop GUI; remove debugging prints 2019-01-11 03:48:42 -05:00
Peter F. Patel-Schneider
09fc3ae60c add new GUI interface allowing cards to be moved around in a list and use for arrangeForScry if preference UI_SELECT_FROM_CARD_DISPLAYS is set 2019-01-09 21:13:09 -05:00
Peter F. Patel-Schneider
69502dd97b Pass min/max through choice code so that user can't choose too many cards 2019-01-06 12:07:19 -05:00
Peter F. Patel-Schneider
234304f9ec Add option to select cards from any Zone that can be shown (implemented in desktop GUI only for now) 2019-01-06 10:47:20 -05:00
Hanmac
61aa144631 fixes for game sim 2019-01-03 21:44:18 +01:00
Tim Scott
5ff8298b62 Fix issue with missing foe blocking arcs for a foe that is targeted by friendly enchantment and arcs are set to "ON" (vs MOUSEOVER). 2018-12-25 10:04:19 -06:00
Tim Scott
44e181981d Update targeting overlay to draw target arrow for stack top when "On" (no initial mouse over required).
Prevent identical target arrows from being added to the arc lists which was causing a minor graphics glitch.
2018-12-24 16:44:01 -06:00
Agetian
c83a364e41 - Fixed a bug which made the Qty and New columns disappear when switching between Main and Sideboard in quest deck editor. 2018-12-20 08:51:17 +03:00
Pedro Ferreira
33268e1b0b Add option to download missing card art on the fly 2018-12-01 18:54:35 +01:00
Jamin W. Collins
74ae604fe7 use nested menus for folder filter
The existing folder filter UI can easily fill a users screen, listing
one full path per line.  With this change, only one level of directories
are shown for each menu level.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-11-28 22:32:09 -07:00
Agetian
3fff9efa39 - Attempting to refactor names to not be ambiguous/confusing. 2018-11-24 11:22:12 +03:00
Agetian
05ac8b0b53 - Attempting to refactor names to not be ambiguous/confusing. 2018-11-24 10:53:06 +03:00
Hanmac
596ad849dc Attach: refactor names 2018-11-23 08:21:38 +01:00
Hanmac
52438170ac Bludgeon Brawl TestCases 2018-11-23 08:21:37 +01:00
Hanmac
8588cf0310 TestCase: test cards get new Timestamp 2018-11-23 08:21:37 +01:00
Agetian
9eaa749ab2 - Phrasing correction in texts (still think we need to update the method names...) 2018-11-23 08:21:36 +01:00
Hanmac
2f913724cb Attached: combine Enchant+Equip+Fortify 2018-11-23 08:21:36 +01:00
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
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