external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,013 Commits 31 Branches 187 Tags
e60d5173f4335afb7d0809b9aa79d63c9fbd9a4d
Commit Graph

37013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Agetian
da9543e426 - 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-19 23:06:05 +03:00
Michael Kamensky
13b058ed1b Merge branch 'brawlfixes' into 'master' 
Brawl and Tiny Leader Android fixes

See merge request core-developers/forge!437
 2018-04-19 18:01:38 +00:00
maustin
fc62a790cd Merge remote-tracking branch 'Core/master' into coremaster 2018-04-19 18:50:23 +01:00
maustin
0168a20e7e Use later reprints in card-themed generated decks 2018-04-19 18:21:00 +01:00
austinio7116
d0b4fa9328 Use later reprints in card-themed generated decks 2018-04-19 17:11:35 +01:00
Michael Kamensky
3b50fde76e Merge branch 'master' into 'master' 
Brawl deck generation fixes

See merge request core-developers/forge!436
 2018-04-19 14:45:29 +00:00
maustin
a2aa269851 Merge branch 'brawlfixes' 2018-04-19 12:59:51 +01:00
maustin
d31e1a65a8 Merge branch 'brawlfixes' into coremaster 2018-04-19 12:58:49 +01:00
austinio7116
76cad4ae7e Fixed repeated cards in brawl and improved quality of randomly added cards 2018-04-19 12:58:15 +01:00
swordshine
cda39c2a05 Merge branch 'update-formats' into 'master' 
Adding Dominaria to Standard and Modern format definitions.

See merge request core-developers/forge!434
 2018-04-19 10:58:51 +00:00
Michael Kamensky
6cc4276288 Merge branch 'master' into 'master' 
- Fixed some cards

See merge request core-developers/forge!435
 2018-04-19 10:31:17 +00:00
swordshine
c829915948 - Update more scripts 2018-04-19 18:25:18 +08:00
swordshine
1dcb56d223 - Fixed Gift of Growth 2018-04-19 18:11:25 +08:00
swordshine
90a2e0a9e1 - Fixed some cards 2018-04-19 18:03:47 +08:00
Agetian
65aad0b09a - Adding Dominaria to Standard and Modern format definitions. 2018-04-19 11:21:06 +03:00
swordshine
b5a3ac6163 Merge branch 'ai-torgaar' into 'master' 
Basic AI for Torgaar (currently won't sac anything as a part of cost payment)

See merge request core-developers/forge!425
 2018-04-19 07:06:56 +00:00
swordshine
ed7ed059a2 Merge branch 'dominaria-achievements' into 'master' 
Dominaria achievements suggested by Marek

See merge request core-developers/forge!433
 2018-04-19 07:04:31 +00:00
Agetian
d0a279e04e - Adding Dominaria achievements suggested by Marek (with minor modifications for style consistency and to fit into the relevant boxes). 2018-04-19 09:39:40 +03:00
maustin
ac9b04de67 Merge branch 'coremaster' 2018-04-19 06:52:13 +01:00
swordshine
e79256e836 Merge branch 'master' into 'master' 
Fixed some cards

See merge request core-developers/forge!432
 2018-04-19 02:39:43 +00:00
swordshine
1dcfcc3531 - Healing Grace can target planeswalker 2018-04-19 10:39:13 +08:00
swordshine
11b1d29df6 Merge branch 'master' into 'master' 
Fixed some cards

See merge request core-developers/forge!431
 2018-04-19 00:53:44 +00:00
swordshine
ad30caa7c8 - Fixed some cards by stormcat 2018-04-19 08:52:50 +08:00
austinio7116
77da5c973b Fixed repeated cards in brawl 2018-04-18 22:54:52 +01:00
maustin
622f64ad29 Merge remote-tracking branch 'Core/master' 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/ability/DigAi.java
 2018-04-18 22:42:22 +01:00
Michael Kamensky
0700e7a736 Merge branch 'master' into 'master' 
- Updating CHANGES.txt.

See merge request core-developers/forge!429
 2018-04-18 18:23:51 +00:00
Agetian
4e1e06c8f7 - Updating CHANGES.txt. 2018-04-18 21:23:26 +03:00
Michael Kamensky
3bb69e356c Merge branch 'healinggrace' into 'master' 
ReplaceDamage: new Effect for reducing Damage inside ReplacementEffect

Closes #268

See merge request core-developers/forge!427
 2018-04-18 18:20:17 +00:00
Agetian
9993366ade - Experimental: DigAi prefers to give lands to the opponent instead of functional cards e.g. for Karn, Scion of Urza. 2018-04-18 19:15:45 +01:00
Michael Kamensky
e5d436c295 Merge branch 'master' into 'master' 
Memory Leaks, Unused code, compiler warnings, etc.

See merge request core-developers/forge!423
 2018-04-18 15:40:37 +00:00
Hanmac
211157c0d0 ReplaceDamage: new Effect for reducing Damage inside ReplacementEffect 2018-04-18 17:24:59 +02:00
Agetian
f83e097769 Merge remote-tracking branch 'origin/ai-torgaar' into ai-torgaar 
# Conflicts:
#	forge-ai/src/main/java/forge/ai/ability/LifeSetAi.java
 2018-04-18 17:18:49 +03:00
Agetian
dcacdf65ce - Reduced the life threshold for healing self with Torgaar. 2018-04-18 17:14:55 +03:00
Agetian
4b61620538 - Somewhat better LifeSetAi logic for Torgaar which accounts for possible different starting life. 2018-04-18 17:11:02 +03:00