external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,527 Commits 33 Branches 187 Tags
00360e55d2ad5660e37e86d331f9c6c3f40a796c
Commit Graph

37527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
a6e81e5d09 Merge branch 'dominaria-guaranteed' into 'master' 
Some refactoring in BoosterGenerator related to guaranteed cards.

See merge request core-developers/forge!453
 2018-04-21 12:24:45 +00:00
Agetian
b7e48ac2cc - Some refactoring in BoosterGenerator related to guaranteed cards. 2018-04-21 15:23:46 +03:00
swordshine
35dc1bf028 Merge branch 'traxisfix' into 'master' 
Deck Generator Improvements

See merge request core-developers/forge!452
 2018-04-21 10:17:53 +00:00
swordshine
816ff7a8eb Merge branch 'dominaria-guaranteed' into 'master' 
Dominaria: booster packs must have a guaranteed Legendary Creature

See merge request core-developers/forge!451
 2018-04-21 10:17:33 +00:00
Agetian
2b41c97355 - Dominaria: booster packs must have a guaranteed Legendary Creature 2018-04-21 08:34:25 +03:00
austinio7116
131def83b9 removed commented out old code 2018-04-21 06:29:43 +01:00
Michael Kamensky
e40211ad49 Merge branch 'master' into 'master' 
- Preparing Forge for Android publish 1.6.9.001 [incremental].

See merge request core-developers/forge!450
 2018-04-21 03:37:40 +00:00
Agetian
30f8e8b16c - Preparing Forge for Android publish 1.6.9.001 [incremental]. 2018-04-21 06:36:46 +03:00
Blacksmith
5a9547e79b Clear out release files in preparation for next release 2018-04-21 01:23:46 +00:00
Blacksmith
0d375ecd93 [maven-release-plugin] prepare for next development iteration 2018-04-21 01:18:35 +00:00
Blacksmith
970f684345 [maven-release-plugin] prepare release forge-1.6.9 forge-1.6.9 2018-04-21 01:18:32 +00:00
Blacksmith
992372913e Update README.txt for release 2018-04-21 01:16:51 +00:00
Sol
28f328b0bc Merge branch 'fix_editions_tracking' into 'master' 
Simple fix for EditionTracking with new format style

See merge request core-developers/forge!449
 2018-04-21 01:16:11 +00:00
Chris H
2196551126 Simple fix for EditionTracking with new format style 2018-04-20 21:10:21 -04:00
austinio7116
84653d7aae Deactivated deck generation logs 2018-04-21 00:00:40 +01:00
austinio7116
7cb11e5191 Deck generation card quality and mana curve improvements 2018-04-20 23:59:19 +01:00
Sol
916b026b12 Merge branch 'release_files_update' into 'master' 
Updating release files for release

See merge request core-developers/forge!448
 2018-04-20 22:21:51 +00:00
Chris H
c6406e9f16 Updating release files for release 2018-04-20 18:18:35 -04:00
Michael Kamensky
2b14e25935 Merge branch 'master' into 'master' 
Revert a change in GameSimulator to make it work and prevent tests from failing

See merge request core-developers/forge!447
 2018-04-20 20:03:10 +00:00
Agetian
2f8fd5c359 - Revert a change in GameSimulator to make it work and prevent tests from failing (may require further attention later). 2018-04-20 23:02:38 +03:00
Michael Kamensky
f342fe3351 Merge branch 'traxisfix' into 'master' 
Deck generation fix and performance issue

See merge request core-developers/forge!446
 2018-04-20 18:52:07 +00:00
austinio7116
a60f5d1660 Fixed deck generation performance issue 2018-04-20 19:13:35 +01:00
austinio7116
e6c4f6c703 Generic mana fix for deck generation 2018-04-20 19:11:52 +01:00
austinio7116
51bf8a5286 Fixed deck generation performance issue 2018-04-20 18:23:59 +01:00
austinio7116
7df721a863 Fix for colourless brawl commanders 2018-04-20 18:04:54 +01:00
swordshine
ee7a3e934e Merge branch 'fixes-hanmac' into 'master' 
Fixes

Closes #430

See merge request core-developers/forge!445
 2018-04-20 12:04:53 +00:00
Hanmac
04254fcb00 GameSimulator: use canPlay & resolve for PlayLandAbility 2018-04-20 13:06:13 +02:00
Hanmac
6911906c4f CardThemedDeckBuilder: some final fixes 2018-04-20 13:04:12 +02:00
Hanmac
47cf2040f6 PlayerControllerHuman: chooseCardName need to respect face name 2018-04-20 13:03:35 +02:00
Hanmac
c47da9acdd PlayEffect: don't cast to CardCollection 2018-04-20 13:01:29 +02:00
Hanmac
a11d5a0fa5 CardDb: fixed other Cardface 2018-04-20 13:00:44 +02:00
Michael Kamensky
3c2bb6dfe2 Merge branch 'mojhosto-ai-choices' into 'master' 
Moved an AI option in Experimental AI profile.

See merge request core-developers/forge!444
 2018-04-20 06:40:23 +00:00
Agetian
d3be1a5bec - Moved an AI option in Experimental AI profile. 2018-04-20 09:39:49 +03:00
Michael Kamensky
61792e7875 Merge branch 'mojhosto-ai-choices' into 'master' 
MoJhoSto: added an option to control the number of lands at which the AI considers Jhoira.

See merge request core-developers/forge!443
 2018-04-20 06:19:17 +00:00
Agetian
c470e0cdcb - MoJhoSto: added an option to control the number of lands at which the AI begins to consider activating Jhoira. 2018-04-20 09:18:03 +03:00
austinio7116
342b84e7ad Merge branch 'deckgendata' into 'master' 
Updated deck generation models

See merge request core-developers/forge!442
 2018-04-20 06:02:45 +00:00
austinio7116
d98a0be80a Removed duplicate format file 2018-04-20 06:48:09 +01:00
austinio7116
a43907fe14 Reversed date ordering when checking deck formats so that when only one of each subtype is shown the earliest valid format is used 2018-04-20 06:46:26 +01:00
Michael Kamensky
98cc18b12f Merge branch 'mojhosto-ai-choices' into 'master' 
MoJhoSto AI: don't activate Jhoira too early since there are generally few good potential targets.

See merge request core-developers/forge!441
 2018-04-20 05:17:11 +00:00
Agetian
226b0bee68 - MoJhoSto: don't activate Jhoira too early since there are generally few good potential targets. 2018-04-20 08:16:07 +03:00
Michael Kamensky
6189e0cb74 Merge branch 'mojhosto-ai-choices' into 'master' 
MoJhoSto: somewhat more varied AI strategy.

See merge request core-developers/forge!438
 2018-04-20 04:43:26 +00:00
Agetian
23470629bd Merge remote-tracking branch 'origin/mojhosto-ai-choices' into mojhosto-ai-choices 2018-04-20 07:35:56 +03:00
Agetian
d073fb9417 - Some improvements to the Jhoira AI algorithm in MoJhoSto: don't rely on an AI logic (since it's mode-specific). 
- Fixed a crash related to the AI playing MoJhoSto.
 2018-04-20 07:35:14 +03:00
Agetian
d623119eac - MoJhoSto: somewhat more varied AI strategy when deciding between Momir and Jhoira. Also, don't spam Jhoira instant copying ability all the time. 2018-04-20 07:35:14 +03:00
Michael Kamensky
5844de9b3c Merge branch 'assorted-fixes' into 'master' 
Fixed the AI hanging the game in AF ChooseSource in corner cases

See merge request core-developers/forge!440
 2018-04-20 04:33:41 +00:00
Agetian
a1a7390d80 - Fixed the AI hanging the game when trying to choose a source in absence of a creature in combat on the opponent's battlefield. 2018-04-20 07:13:25 +03:00
Agetian
dd2bc70f47 - Some improvements to the Jhoira AI algorithm in MoJhoSto: don't rely on an AI logic (since it's mode-specific). 
- Fixed a crash related to the AI playing MoJhoSto.
 2018-04-20 06:46:13 +03:00
maustin
a6acf6527c Merge branch 'master' into historicformats 2018-04-19 22:45:03 +01:00
austinio7116
5310a0d6b7 Deck generation data files updated 2018-04-19 22:37:52 +01:00
maustin
a2b931571e Merge remote-tracking branch 'Core/master' into coremaster 2018-04-19 22:36:04 +01:00