external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,487 Commits 32 Branches 187 Tags
db209a24e9f8b22a8b462c22be7ad62b36b9b83e
Commit Graph

39487 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
03571f3466 - A little bit more work on combat tricks. 2018-11-11 17:47:47 +03:00
Michael Kamensky
3306ac9327 Merge branch 'master' into 'master' 
Fixed logic in reserving mana for combat tricks.

See merge request core-developers/forge!1092
 2018-11-11 14:40:15 +00:00
Agetian
fcc3a28b86 - Fixed logic in reserving mana for combat tricks. 2018-11-11 17:38:32 +03:00
Michael Kamensky
8a05a5a9fe Merge branch 'master' into 'master' 
Fixed a logic error in Surveil AI.

See merge request core-developers/forge!1091
 2018-11-11 11:19:17 +00:00
Agetian
829a82b98f - Fixed a logic error in Surveil AI. 
- Added a couple card hints.
 2018-11-11 14:18:34 +03:00
Michael Kamensky
8c0caecd3e Merge branch 'patch-1' into 'master' 
Update godsend.txt from Eehoe

See merge request core-developers/forge!1089
 2018-11-11 04:02:51 +00:00
Michael Kamensky
fe290f795e Merge branch 'patch-2' into 'master' 
Removed counter restriction for generous_patron.txt

See merge request core-developers/forge!1090
 2018-11-11 03:55:34 +00:00
Sol
c7ad075bb3 Removed counter restriction for generous_patron.txt 2018-11-11 01:31:59 +00:00
Sol
a2dd5c7180 Update godsend.txt from Eehoe 2018-11-11 01:29:31 +00:00
Hans Mackowiak
ae5c60d816 Merge branch 'ai-setstate' into 'master' 
Attempt to fix the AI transforming Azcanta if a copy of the transformed land already exists.

See merge request core-developers/forge!1088
 2018-11-10 19:08:55 +00:00
Agetian
1a73c6bea5 - Attempt to fix the AI transforming Azcanta if a copy of the transformed legendary land already exists on the battlefield. 2018-11-10 20:41:52 +03:00
Michael Kamensky
6522070c3f Merge branch 'master' into 'master' 
Updating CHANGES.txt.

See merge request core-developers/forge!1087
 2018-11-10 16:28:32 +00:00
Agetian
858ade9341 - Updating CHANGES.txt. 2018-11-10 19:28:02 +03: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
Michael Kamensky
7f58e5cea6 Merge branch 'quest-decks' into 'master' 
Quest precon decks submitted by nayozzz

See merge request core-developers/forge!1086
 2018-11-10 15:31:46 +00:00
Agetian
9835e4c277 - Fixed set ID in Dimir Intrigues. 2018-11-10 18:30:47 +03:00
Agetian
0389f8bcb5 - Added 5 quest precon decks submitted by nayozzz. 2018-11-10 18:29:46 +03:00
Michael Kamensky
aaf47468eb Merge branch 'mobile-release' into 'master' 
Preparing Forge for Android publish 1.6.18.001 [incremental].

See merge request core-developers/forge!1085
 2018-11-10 06:16:36 +00:00
Agetian
3f31bc9df0 - Preparing Forge for Android publish 1.6.18.001 [incremental]. 2018-11-10 09:16:03 +03:00
Blacksmith
3d706d83d5 Clear out release files in preparation for next release 2018-11-10 06:11:02 +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 forge-1.6.18 2018-11-10 06:06:11 +00:00
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