Commit Graph

1059 Commits

Author SHA1 Message Date
Blacksmith
c3346c737e [maven-release-plugin] prepare for next development iteration 2019-03-10 13:57:44 +00:00
Blacksmith
db3c4d2d2f [maven-release-plugin] prepare release forge-1.6.22 2019-03-10 13:57:39 +00:00
Sol
8a9c27f9ae Revert "Merge branch 'fix-bad-art-deck-art-corruption' into 'master'"
This reverts merge request !1440
2019-03-04 15:58:06 +00:00
Chris H
888f5953b1 If a DeckList references a bogus card set/art combo ignore parts of it until it works 2019-03-03 21:47:28 -05:00
Rob Schnautz
ed2afd9460 Unused import 2019-02-28 01:04:40 +00:00
schnautzr
59214fe332 Code cleanup - deprecations 2019-02-23 20:59:19 -06:00
Krazy
893cc3b08f Merge branch 'eclipse-cleanup' into 'master'
Eclipse cleanup

Closes #844

See merge request core-developers/forge!1399
2019-02-22 02:09:05 +00:00
Blacksmith
4ed17e1e16 [maven-release-plugin] prepare for next development iteration 2019-02-17 19:51:17 +00:00
Blacksmith
a70136c98c [maven-release-plugin] prepare release forge-1.6.21 2019-02-17 19:51:13 +00:00
Sol
557be177d8 Fix token images 2019-02-16 14:04:45 +00:00
Tim Scott
7f16a3dce2 Remove Eclipse-specific files and directories. Maven-based build configurations can be easily imported by (at least) Eclipse 2018-12. Hint: File > Import > Maven > Existing Maven Projects > Navigate to root forge folder.
Tweak base pom.xml to allow for error-free Eclipse compilation.
2019-02-14 21:26:23 -06:00
Michael Kamensky
d491972995 Merge branch 'master' into 'master'
Translating hard-coded text to res en-US.properties

See merge request core-developers/forge!1283
2019-02-07 05:54:47 +00:00
Blacksmith
17dedb4bf4 [maven-release-plugin] prepare for next development iteration 2019-02-02 02:00:32 +00:00
Blacksmith
eb3fb9e1ce [maven-release-plugin] prepare release forge-1.6.20 2019-02-02 02:00:28 +00:00
Evan Murawski
4661a19982 DeckRecognizer: Recognize split card names with single slash 2019-01-25 04:53:36 +00:00
churrufli
07c2065917 Translating hard-coded text to res en-US.properties 2019-01-18 08:20:02 +01:00
Chris H
3b38547fc9 Replace asterisks with x's for token filenames 2019-01-12 22:55:23 -05:00
Hans Mackowiak
0606a00942 DeckFormat: A deck can have any number of cards named CARDNAME. 2019-01-12 16:13:00 +00: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
Hanmac
e85f9e08be Keyword: add Afterlife 2018-12-23 18:47:37 +01:00
Blacksmith
e8c581b402 [maven-release-plugin] prepare for next development iteration 2018-12-09 06:52:11 +00:00
Blacksmith
a990b9ff69 [maven-release-plugin] prepare release forge-1.6.19 2018-12-09 06:52:07 +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
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
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
pfirpfel
6b96129c25 Chaos draft 2018-10-13 05:04:50 +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
Jamin W. Collins
28665bacdf log why deck was rejected
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
2018-10-08 18:33:19 -06:00
Hanmac
a298dcf3bc TokenScript: make CardTextChange working again
SpellAbility: changeTextIntrinsic to sub abilities
2018-09-30 15:10:12 +02: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
Agetian
0e398d2589 - Removing SVar:Rarity:Rare 2018-09-26 13:21:46 +03:00
tehdiplomat
744c766852 Convert tokens to script 2018-09-21 22:49:39 -04: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
Blacksmith
e7d09e8918 [maven-release-plugin] prepare for next development iteration 2018-09-08 00:24:29 +00:00
Blacksmith
c2f62998fc [maven-release-plugin] prepare release forge-1.6.15 2018-09-08 00:24:26 +00:00
Jamin Collins
925ae63071 Merge branch 'token_phase_two' into 'master'
Add more support for migrating Editions to TokenScripts

See merge request core-developers/forge!885
2018-09-06 01:16:27 +00:00
tehdiplomat
e4e33ebac0 Fix conflicts that got missed previously 2018-09-03 11:45:23 -04:00
tehdiplomat
67edb87ccd Allow Edition files to accept token names 2018-09-03 11:37:12 -04:00