external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48: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
5e8d761a41 Merge branch 'patch-2' into 'master' 
Update dark_supplicant.txt

See merge request core-developers/forge!513
 2018-05-02 03:34:11 +00:00
Michael Kamensky
b4fd663329 Merge branch 'patch-1' into 'master' 
Update marsh_flitter.txt

See merge request core-developers/forge!512
 2018-05-02 03:33:59 +00:00
Meerkov
124c1632af Update demigod_of_revenge.txt 2018-05-02 03:20:12 +00:00
Meerkov
3867287c0f Update dark_supplicant.txt 2018-05-02 03:19:03 +00:00
Meerkov
c1c0424af9 Update marsh_flitter.txt 2018-05-02 03:13:43 +00:00
Michael Kamensky
cd9d70baee Merge branch 'master' into 'master' 
Fixed Elfhame Druid Oracle text.

See merge request core-developers/forge!511
 2018-05-01 20:26:12 +00:00
Agetian
13aec8f621 - Fixed Elfhame Druid Oracle text. 2018-05-01 23:25:21 +03:00
Agetian
7b5e7afd6d - Added quest opponent deck Princess Zelda 1. 
- Minor stylistic tweaks to Princess Zelda 2, Starswirl the Bearded 2.
 2018-05-01 22:51:06 +03:00
Agetian
a586be2c41 - Minor style fix. 2018-05-01 22:26:19 +03:00
Agetian
4630623d35 - Added the quest opponent deck Starswirl the Bearded 2. 
- Minor fix in Princess Zelda 2.
 2018-05-01 22:25:25 +03:00
Agetian
71a2e68551 - Dominaria: adding AI deckbuilding and gameplay hints. 2018-05-01 21:10:33 +03:00
Agetian
ef71e037f2 - Added quest opponent deck Princess Zelda 2. 2018-05-01 20:10:47 +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
Agetian
43dfbed157 - Updating Morkus Rex 2 and 3 quest opponent decks with RIX cards. 2018-05-01 18:30:16 +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
Agetian
5329138d0f - Further tweaks to Guybrush Threepwood 2 quest deck. 2018-05-01 08:46:33 +03:00
Agetian
ed0109af94 - Updating Guybrush Threepwood decks with several RIX cards. 2018-05-01 08:27:14 +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
Agetian
8c325d8264 - Style update. 2018-04-30 09:40:53 +03:00
Agetian
9aec30e0dc - FogAi update from Seravy (updated for style consistency). 2018-04-30 09:36:31 +03:00
Agetian
5049b7885a - FogAi update from Seravy (updated for style consistency). 2018-04-30 09:32:24 +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
Agetian
9a206ff338 - Some style and logic fixes. 2018-04-30 08:49:20 +03:00
Agetian
4f487f3009 Merge branch 'FlickeringWard' of git.cardforge.org:Seravy/forge into seravy-ai-fixes 2018-04-30 08:36:46 +03: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