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,131 Commits 31 Branches 187 Tags
c66a8c20d25b5e3934d3a4cbdcd8095e533bff7f
Commit Graph

37131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Agetian
c66a8c20d2 - Integrating a reformatted fix by Seravy which makes Mox Amber AI playable (as well as Reflecting Pool) and fixes auto mana payment for these and other cards that use ManaReflected. 2018-05-02 06:55:59 +03:00
Agetian
d664f8abcd - Integrating a reformatted fix by Seravy which makes Mox Amber AI playable (as well as Reflecting Pool) and fixes auto mana payment for these and other cards that use ManaReflected. 2018-05-02 06:55:45 +03:00
Agetian
71a2e68551 - Dominaria: adding AI deckbuilding and gameplay hints. 2018-05-01 21:10:33 +03:00
Michael Kamensky
df30218f55 Merge branch 'assorted-fixes' into 'master' 
- Added AI NeedsToPlay hint to Triumph of Gerrard.

See merge request core-developers/forge!508
 2018-05-01 16:11:27 +00:00
Agetian
e8a84ad571 - Added AI NeedsToPlay hint to Triumph of Gerrard. 2018-05-01 19:10:46 +03:00
Michael Kamensky
8b8605b773 Merge branch 'assorted-fixes' into 'master' 
Added AI NeedsToPlay hint to Song of Freyalise.

See merge request core-developers/forge!507
 2018-05-01 15:23:31 +00:00
Agetian
9ef27b2699 - Added AI NeedsToPlay hint to Song of Freyalise. 2018-05-01 18:21:44 +03:00
Michael Kamensky
faad9e0d2c Merge branch 'assorted-fixes' into 'master' 
- Added AI logic to Shalai, Voice of Plenty.

See merge request core-developers/forge!506
 2018-05-01 07:33:46 +00:00
Agetian
6a9ba00aca - Added AI logic to Shalai, Voice of Plenty. 2018-05-01 10:32:53 +03:00
Sol
92556d5cb2 Merge branch 'revert-64e8dd35' into 'master' 
Revert "Merge branch 'temp_dev6' into 'master'"

See merge request core-developers/forge!505
 2018-05-01 01:11:41 +00:00
Sol
1a3308017a Revert "Merge branch 'temp_dev6' into 'master'" 
This reverts merge request !499
 2018-05-01 01:11:29 +00:00
Sol
64e8dd35c2 Merge branch 'temp_dev6' into 'master' 
Allow for Seeded RNG in simulation games!

See merge request core-developers/forge!499
 2018-05-01 01:01:30 +00:00
Michael Kamensky
bf5d8b5472 Merge branch 'assorted-fixes' into 'master' 
Style fix related to the previous merge.

See merge request core-developers/forge!504
 2018-04-30 17:00:21 +00:00
Agetian
f8beba2815 - Style fix related to the previous merge. 2018-04-30 19:59:36 +03:00
Michael Kamensky
3eead9da4e Merge branch 'saga2' into 'master' 
Saga: use better state based action

See merge request core-developers/forge!502
 2018-04-30 06:24:17 +00:00
Michael Kamensky
d7a55e4c7d Merge branch 'ProtectionSelf' into 'master' 
AI will use non-targeted Protection abilities.

See merge request core-developers/forge!245
 2018-04-30 05:32:22 +00:00
Hanmac
cc654b56a1 GameAction: add canBeSacrificed check, no need to do the other checks later 2018-04-30 07:17:11 +02:00
Hanmac
66ac3ee63c WA: fixed Saga abilities 2018-04-30 06:51:01 +02:00
Meerkov
e421a32475 Style fixes for discussion. 
(cherry picked from commit 3ae95447a2a91a36bd1772649592ef72ffb344f8)
 2018-04-30 02:07:25 +00:00
Sol
1acb0e9e95 Merge branch 'dev-mode' into 'master' 
Dev Mode: added a way to remove counters from permanent.

See merge request core-developers/forge!501
 2018-04-30 00:17:43 +00:00
Sol
ab2d284dee Merge branch 'temp_dev5' into 'master' 
Remove unusual "reproducable" attack declaration from AI

See merge request core-developers/forge!498
 2018-04-30 00:16:30 +00:00
Michael Kamensky
f72c5aa59c Merge branch 'temp_dev4' into 'master' 
Android updates

See merge request core-developers/forge!491
 2018-04-29 20:16:28 +00:00
Hanmac
910dc4fb26 Saga: use better state based action: it only cares about chapter abilities, and get the final chapter nr from the triggers 2018-04-29 20:59:16 +02:00
Agetian
4bf54c721d - Comment fix. 2018-04-29 20:55:00 +03:00
Agetian
b482964373 - Sub counter: only list counters that are present on the card. 2018-04-29 20:19:11 +03:00
Agetian
01017efab6 - Dev Mode: added a way to remove counters from permanent. 2018-04-29 18:51:46 +03:00
Michael Kamensky
49558ca39d Merge branch 'outcomes-show-names-in-1v1' into 'master' 
When playing non-team matches, display Player name as winner in Game Recap screen

See merge request core-developers/forge!500
 2018-04-29 04:52:46 +00:00
Chris H
758dbb689a When playing non-team matches, display Player name as winner in Game Recap screen 2018-04-28 23:22:23 -04:00
Meerkov
536f9f4409 Proposal to fix Android warnings. 
(cherry picked from commit eb65bd4a17d7c750cc2eb1a44cbbc309a7ada068)
 2018-04-28 17:28:16 +00:00
Meerkov
c6cab341ed Organize some imports. 
(cherry picked from commit 70cf1ad3d0a6449d67b8ed84c9ebf0da4fd13547)
 2018-04-28 17:01:54 +00:00
Meerkov
792fdad4be Tiny Update: Removes dead code. 
Just removes some code that does nothing.


(cherry picked from commit b462c41dff99f0173b7e228f826ca0bf0d8103cb)
 2018-04-28 17:01:42 +00:00
Meerkov
bd097888a3 Allows running tests using a seeded RNG. 
Running the same game twice now works! There may be issues I haven't found with certain AI behaviors around mechanics I didn't use in my tests.


(cherry picked from commit 194b47c1ad61c8f1efb6bce8af2bb10d1fa8f6c3)
 2018-04-28 17:00:54 +00:00
Meerkov
eae90194cb AiAttackController no longer has reproducable attack thoughts. 
I don't see why we would want this to be seeded with the same number. I think it's incorrect thinking so I'm removing it.


(cherry picked from commit 2881effd577abe9500b8fa3a5699067b0c3541f3)
 2018-04-28 16:55:05 +00:00
Meerkov
0a717bb9be Fix more RNG. 
(cherry picked from commit 61dd5661a728e08ae14911a3518cd1e10d574037)
 2018-04-28 16:54:53 +00:00
Michael Kamensky
dc71046018 Merge branch 'assorted-fixes' into 'master' 
AI: Only consider the "prevent all combat damage" pump KW useful in combat

See merge request core-developers/forge!497
 2018-04-28 12:58:18 +00:00
Agetian
881572cba5 - AI: Only consider the "prevent all combat damage" pump KW useful when inside combat and blocking/blocked (e.g. Blinding Powder). 2018-04-28 15:57:47 +03:00
Hans Mackowiak
4a41c57e93 Merge branch 'assorted-fixes' into 'master' 
(Experimental) Attempting to fix the interaction of text-changing abilities and keyworded effects

See merge request core-developers/forge!496
 2018-04-28 12:43:04 +00:00
Agetian
084f45393e - Code tweak suggested by Hanmac. 2018-04-28 15:08:53 +03:00
Agetian
90a1a5f058 - (Experimental) Attempting to fix the interaction of text-changing abilities with keyworded effects that use overriding abilities (e.g. Fabricate and Artificial Evolution). 2018-04-28 13:56:53 +03:00
Michael Kamensky
e0486aff29 Merge branch 'assorted-fixes' into 'master' 
Updating DrainMana ability description (mana pool reference removed).

See merge request core-developers/forge!494
 2018-04-28 10:44:05 +00:00
Agetian
ce165f4234 - Updating DrainMana ability description. 2018-04-28 13:42:51 +03:00
Hans Mackowiak
4d73f954f8 Merge branch 'assorted-fixes' into 'master' 
Removing references to mana pool in code (and updating the relevant code parts).

See merge request core-developers/forge!493
 2018-04-28 10:40:03 +00:00
Agetian
445625ba1e - Removing references to mana pool in other parts of the code. 2018-04-28 13:34:16 +03:00
Michael Kamensky
e76e610b97 Merge branch 'assorted-fixes' into 'master' 
Fixing a test with the new mana ability text in mind.

See merge request core-developers/forge!492
 2018-04-28 10:22:50 +00:00
Agetian
8c50ddef2f - Fixing a test with the new mana ability text in mind. 2018-04-28 13:21:42 +03:00
Hans Mackowiak
d11c608bd0 Merge branch 'dom-oracle-mana-pool' into 'master' 
Oracle non-functional update: removing "mana pool" from card texts.

See merge request core-developers/forge!487
 2018-04-28 09:08:31 +00:00
Meerkov
9aac61e350 Undo XStream update, to support Android. 
It's not clear why 1.4.10 was not working for Android, but it wasn't my goal to update specifically so rolling back that change.


(cherry picked from commit 43642e85a8d05d02d4c65c87eed8e51d5c1a3a56)
 2018-04-28 08:42:48 +00:00
Meerkov
6436d6fa2a Delete silly android code. 
I don't think this is necessary, it seems silly to me. I'm just deleting it.


(cherry picked from commit bf2c4b8cc6a9b2db84b81bc650140e9a29ae22b4)
 2018-04-28 08:42:37 +00:00
Meerkov
8f68266585 Update Guava to 24.1 
This updates Guava 16 to 24.1. Currently 16 is a 4 year old version, so there are a lot of bug fixes. The Android .pom has 24.1-android instead of 24.1-jre, for compatability reasons.

I did not test the android build, however the desktop build works.

Also resovles two warnings and drops a "TODO" on a comment that was highlighting a possible bug but wasn't easily marked to discover later.


(cherry picked from commit be578af80467c1850d9dcec0af6fe18840fff7e9)
 2018-04-28 08:42:22 +00:00
Michael Kamensky
38376b3978 Merge branch 'assorted-fixes' into 'master' 
Making transform cards work as plane/region art in Planar Conquest

See merge request core-developers/forge!488
 2018-04-27 19:17:01 +00:00