Commit Graph

39874 Commits

Author SHA1 Message Date
Blacksmith
4bb6ffec50 Update README.txt for release 2018-11-10 06:03:58 +00:00
Michael Kamensky
2c0189fddd Merge branch 'master' into 'master'
Finish promoting the life in danger AI profile options from experimental to general use.

See merge request core-developers/forge!1084
2018-11-10 04:31:29 +00:00
Agetian
02cca3b8c8 - Finish promoting the life in danger AI profile options from experimental to general use. 2018-11-10 07:30:30 +03:00
Michael Kamensky
ddd7651ba0 Merge branch 'master' into 'master'
Updating CHANGES.txt.

See merge request core-developers/forge!1083
2018-11-10 04:23:44 +00:00
Agetian
72e010ef66 - Updating CHANGES.txt. 2018-11-10 07:23:21 +03:00
Michael Kamensky
df145a8b1a Merge branch 'copyFixState' into 'master'
CopyPermanent: the final card need to have the State updated

See merge request core-developers/forge!1082
2018-11-10 03:56:14 +00:00
Hanmac
396bb2c5b4 CopyPermanent: the final card need to have the State updated 2018-11-09 23:25:52 +01:00
Michael Kamensky
dfdbd923d5 Merge branch 'master' into 'master'
Updating CHANGES.txt.

See merge request core-developers/forge!1081
2018-11-09 19:25:10 +00:00
Agetian
ee0e2d1941 - Updating CHANGES.txt. 2018-11-09 22:24:43 +03:00
Michael Kamensky
a0c1f0ee30 Merge branch 'master' into 'master'
Fixed a logic error in the recent Momir strategy commit.

See merge request core-developers/forge!1080
2018-11-09 19:20:06 +00:00
Agetian
530f5c2e35 - Fixed a logic error in the recent Momir strategy commit. 2018-11-09 22:19:02 +03:00
Hans Mackowiak
8be1e67eb3 Merge branch 'patch-1' into 'master'
CardFactoryUtil: fixed Nexus

See merge request core-developers/forge!1079
2018-11-09 14:05:44 +00:00
Hans Mackowiak
36d6465e49 CardFactoryUtil: fixed Nexus 2018-11-09 14:05:33 +00:00
Michael Kamensky
a12c315d59 Merge branch 'patch-3' into 'master'
CardFactoryUtil: update the Nexus of Fate RE

See merge request core-developers/forge!1078
2018-11-09 13:46:39 +00:00
Hans Mackowiak
1c39671c27 CardFactoryUtil: update the Nexus of Fate RE 2018-11-09 13:40:01 +00:00
Michael Kamensky
0edef339ac Merge branch 'ai-improvements' into 'master'
AI improvements: Momir/MoJhoSto basic land strategy, fixed Vivien's Invocation AI spec.

Closes #759

See merge request core-developers/forge!1077
2018-11-09 12:54:08 +00:00
Agetian
8ae5a4613a - Fixed Vivien's Invocation AI. 2018-11-09 15:52:31 +03:00
Agetian
c1260dd4e1 - Some improvements to Momir/MoJhoSto basic land strategy. 2018-11-09 15:42:40 +03:00
swordshine
676b8ca2e9 Merge branch 'patch' into 'master'
- Fix Chance for Glory

See merge request core-developers/forge!1076
2018-11-09 09:00:56 +00:00
swordshine
218d0f30ec - Fix Chance for Glory 2018-11-09 17:00:16 +08:00
swordshine
bb4e5eeda8 Merge branch 'patch-2' into 'master'
Update hornswoggle.txt

See merge request core-developers/forge!1075
2018-11-09 02:30:41 +00:00
Sol
49f8c6a067 Update hornswoggle.txt 2018-11-09 02:00:48 +00:00
Jeremy Pelkala
3d597860b3 Merge remote-tracking branch 'origin/master' 2018-11-08 13:06:19 -05:00
Jeremy Pelkala
c8f54a686d Fixed mobile compilation error
-NewQuestScreen
Updated to include DeckConstructionRules set to Default
2018-11-08 13:05:52 -05: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
Jeremy Pelkala
c5a5ce25e5 Removed unused imports from CEditorQuest 2018-11-08 12:42:15 -05:00
Jeremy Pelkala
f17cc4a620 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
#	forge-gui/src/main/java/forge/quest/QuestEventCommanderDuelManager.java
2018-11-08 12:08:01 -05:00
Jeremy Pelkala
ffcc38d8c4 Commander Quest checkstyle and bugfixes
-QuestEventCommanderDuelManager
Removed unused imports

-CEditorQuest
Fixed colorless cards getting filtered out of deck creation.
2018-11-08 11:54:06 -05:00
Jeremy Pelkala
3dfcf64d30 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 11:54:06 -05:00
imakunee
08bc6604a9 Revert "-CardPool"
This reverts commit 37d9dc753f
2018-11-08 11:54:06 -05:00
Jeremy Pelkala
d1ca6265ef -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 11:54:06 -05:00
Hans Mackowiak
bf2ccd74ea Merge branch 'extraTurnPlayer' into 'master'
ExtraTurn in PlayerView

See merge request core-developers/forge!1073
2018-11-08 07:47:38 +00: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
Michael Kamensky
e7ec230b9f Merge branch 'master' into 'master'
Fixed the Once logic check in SurveilAi.

See merge request core-developers/forge!1074
2018-11-08 06:35:01 +00:00
Agetian
098569064f - Fixed the Once logic check in SurveilAi. 2018-11-08 09:34:35 +03:00
Hanmac
ebdfd94f85 ExtraTurn in PlayerView 2018-11-08 07:27:34 +01:00
Michael Kamensky
25fc7b7757 Merge branch 'master' into 'master'
Minor improvements in Surveil logic.

See merge request core-developers/forge!1072
2018-11-08 05:50:21 +00:00
Agetian
e4bf96d5e4 - Remove an accidental commit of debug test in mobile-dev. 2018-11-08 08:49:49 +03:00
Agetian
44de14d070 - Minor improvements in Surveil logic. 2018-11-08 08:47:19 +03:00
Michael Kamensky
09b3119254 Merge branch 'master' into 'master'
Fixed emblem image name for Vivien Reid.

See merge request core-developers/forge!1071
2018-11-08 04:57:05 +00:00
Agetian
ebbde37929 - Fixed emblem image name for Vivien Reid. 2018-11-08 07:56:39 +03:00
Michael Kamensky
40ff0503d0 Merge branch 'puzzle-engine' into 'master'
Added puzzle PS_GRN5 (Possibility Storm - Guilds of Ravnica 05).

See merge request core-developers/forge!1070
2018-11-07 06:28:24 +00:00
Agetian
c6b6a0b4d2 - Added puzzle PS_GRN5. 2018-11-07 09:27:14 +03:00