external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,158 Commits 31 Branches 187 Tags
ada5aef26f17b6c11c7f5e667ba5a3d294aed719
Commit Graph

37158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
ada5aef26f Merge branch 'patch-3' into 'master' 
Update olivias_bloodsworn.txt

See merge request core-developers/forge!521
 2018-05-02 08:16:15 +00:00
Michael Kamensky
df1050668f Merge branch 'patch-4' into 'master' 
Update forerunner_of_slaughter.txt

See merge request core-developers/forge!522
 2018-05-02 08:15:39 +00:00
Michael Kamensky
4dc13f9417 Merge branch 'patch-5' into 'master' 
Update time_vault.txt

See merge request core-developers/forge!523
 2018-05-02 08:15:11 +00:00
Meerkov
d71da723a0 Update time_vault.txt 2018-05-02 06:48:57 +00:00
Meerkov
c5ce102f4d Update forerunner_of_slaughter.txt 2018-05-02 06:47:54 +00:00
Meerkov
3d291444bc Update olivias_bloodsworn.txt 2018-05-02 06:47:22 +00:00
Michael Kamensky
932dde8177 Merge branch 'patch-1' into 'master' 
Update leaf_arrow.txt

See merge request core-developers/forge!519
 2018-05-02 04:44:20 +00:00
Meerkov
41b4ae9aae Update leaf_arrow.txt 2018-05-02 04:21:35 +00:00
Michael Kamensky
f73d139aa7 Merge branch 'quest-decks' into 'master' 
Quest Mode decks: updating Ixalan decks with RIX cards, adding two quest opponents focused on Dominaria cards.

See merge request core-developers/forge!510
 2018-05-02 04:11:42 +00:00
Michael Kamensky
d6ca320c61 Merge branch 'patch-6' into 'master' 
Update banefire.txt

See merge request core-developers/forge!518
 2018-05-02 04:06:48 +00:00
Meerkov
d990f245d5 Update banefire.txt 2018-05-02 04:03:33 +00:00
Michael Kamensky
a0c2c41203 Merge branch 'patch-4' into 'master' 
Update chandras_defeat.txt

See merge request core-developers/forge!515
 2018-05-02 03:59:26 +00:00
Michael Kamensky
74606f6b04 Merge branch 'patch-5' into 'master' 
Update crumble_to_dust.txt

See merge request core-developers/forge!516
 2018-05-02 03:59:16 +00:00
Michael Kamensky
cca8f84f61 Merge branch 'patch-6' into 'master' 
Update living_lore.txt

See merge request core-developers/forge!517
 2018-05-02 03:59:06 +00:00
Meerkov
403b1f3c39 Update living_lore.txt 2018-05-02 03:49:11 +00:00
Meerkov
38697f0835 Update crumble_to_dust.txt 2018-05-02 03:46:25 +00:00
Meerkov
0b5beddd51 Update chandras_defeat.txt 2018-05-02 03:40:45 +00:00
Michael Kamensky
a6c3a642f8 Merge branch 'patch-3' into 'master' 
Update demigod_of_revenge.txt

See merge request core-developers/forge!514
 2018-05-02 03:34:25 +00:00
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
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
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