external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 02:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,331 Commits 31 Branches 187 Tags
d64cda692b55e98f97df3225eaf0d65ebac205cc
Commit Graph

41331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
swordshine
d64cda692b Merge branch 'patch-24' into 'master' 
Twisted Reflection

See merge request core-developers/forge!1748
 2019-06-01 04:13:25 +00:00
swordshine
a399ed94cd Merge branch 'patch' into 'master' 
Update some scripts

See merge request core-developers/forge!1751
 2019-06-01 04:11:57 +00:00
swordshine
5336b42a01 Update Throes of Chaos 2019-06-01 12:11:25 +08:00
swordshine
79a056d126 Update some scripts 2019-06-01 11:53:00 +08:00
Michael Kamensky
8d439d3068 Merge branch 'master' into 'master' 
Vesperlark: added an AI Evoke hint

See merge request core-developers/forge!1750
 2019-06-01 03:08:52 +00:00
Agetian
75bf338e84 - Vesperlark: added an AI Evoke hint 2019-06-01 06:08:26 +03:00
swordshine
65bcffa527 Merge branch 'mhspoilers2' into 'master' 
More MH1 spoilers from forgeScribe

See merge request core-developers/forge!1744
 2019-06-01 02:58:16 +00:00
Charles Baker
2100d20bfd Twisted Reflection 2019-06-01 02:30:34 +00:00
Michael Kamensky
101aacfe4d Merge branch 'evoke-ai' into 'master' 
Added a way to specify a NeedsToPlay variable for Evoke.

Closes #1030

See merge request core-developers/forge!1747
 2019-06-01 02:24:26 +00:00
Michael Kamensky
a4ca3c77d8 Added a way to specify a NeedsToPlay variable for Evoke. 2019-06-01 02:24:26 +00:00
austinio7116
687ad17036 Fixes suggested in MR 2019-05-31 20:50:48 +01:00
austinio7116
072877d644 Updated editions file 2019-05-31 07:57:18 +01:00
austinio7116
92792996da More MH1 spoilers from forgescribe 2019-05-31 07:52:44 +01:00
austinio7116
79be6b8a8b Sisay from Cryptix 2019-05-31 07:12:44 +01:00
austinio7116
d0b8f38b7e Updated editions file 2019-05-30 17:14:16 +01:00
austinio7116
ab14324f88 More MH1 spoilers from forgeScribe 2019-05-30 16:13:06 +01:00
Michael Kamensky
7da1d23018 Merge branch 'master' into 'master' 
Fixed Master of Waves

See merge request core-developers/forge!1745
 2019-05-30 10:52:35 +00:00
Agetian
cd587694c2 - Fixed Master of Waves 2019-05-30 13:52:07 +03:00
maustin
34558f3ce4 Merge remote-tracking branch 'Austin/mhspoilers2' into mhspoilers2 
# Conflicts:
#	forge-gui/res/cardsfolder/upcoming/pashalik_mons.txt
 2019-05-30 08:34:00 +01:00
austinio7116
9fc01d2e83 More MH1 spoilers from forgeScribe 2019-05-30 08:33:17 +01:00
austinio7116
2eda6ea8dc More MH1 spoilers from forgeScribe 2019-05-30 08:29:18 +01:00
Michael Kamensky
b96c734ca5 Merge branch 'master' into 'master' 
Make the AI a little less reckless when evaluating a no-counterattack attrition attack

See merge request core-developers/forge!1743
 2019-05-30 05:35:13 +00:00
Agetian
407629bb69 - Be a little less reckless when evaluating a no-counterattack attrition attack 2019-05-30 08:34:46 +03:00
Michael Kamensky
010ce2ecf7 Merge branch 'master' into 'master' 
Make the AI play a little bit more aggressively in attrition scenarios where it's favored

See merge request core-developers/forge!1742
 2019-05-30 05:32:50 +00:00
Agetian
04281db55f - Make the AI play a little bit more aggressively in attrition scenarios where it's favored 2019-05-30 08:24:30 +03:00
Michael Kamensky
db0e5e1ead Merge branch 'patch-2' into 'master' 
Added several cards to the Innistrad card list for planar conquest

See merge request core-developers/forge!1733
 2019-05-30 03:56:48 +00:00
Viktor Azorius
eec4dfb3ec Ordered the list of extra cards added to innistrad. 
Removed a second extraneous listing of Jeleva, nephalia's scourge and predator's howl
Removed Ajani's pridemate as it has nothing to do with innistrad
Added Entreat the Dead as it's a black miracle and thus on theme.
Added several cards from magic origins that seem to be on theme for innistrad
Added Liliana's contract because it seemed on theme with the demons in general and grislebrand in particular.
 2019-05-30 03:56:48 +00:00
swordshine
c5d9226662 Merge branch 'patch' into 'master' 
Update some scripts

See merge request core-developers/forge!1741
 2019-05-30 01:40:14 +00:00
swordshine
b94e3621e3 Update some scripts 2019-05-30 09:38:36 +08:00
swordshine
f384e1dd99 Merge branch 'mh1spoilers' into 'master' 
Mh1spoilers

See merge request core-developers/forge!1729
 2019-05-30 01:22:03 +00:00
swordshine
ada0667bfb Merge branch 'patch-23' into 'master' 
Pashalik Mons

See merge request core-developers/forge!1734
 2019-05-30 01:21:12 +00:00
Charles Baker
6ae22b0c5c Update pashalik_mons.txt 2019-05-29 21:20:28 +00:00
Michael Kamensky
e905ffdac6 Merge branch 'master' into 'master' 
Added draft cube: SCG Con Cube 2018 December

See merge request core-developers/forge!1740
 2019-05-29 17:34:43 +00:00
Agetian
37b1201a4f - Added draft cube: SCG Con Cube 2018 December 2019-05-29 20:33:44 +03:00
Michael Kamensky
2d890defcf Merge branch 'master' into 'master' 
Don't run triggers for cards being turned up when moving from battlefield

See merge request core-developers/forge!1739
 2019-05-29 16:05:29 +00:00
Agetian
228b522565 - Don't run triggers for cards being turned up when moving from battlefield 2019-05-29 19:03:31 +03:00
Michael Kamensky
97b98aeae7 Merge branch 'master' into 'master' 
Fix DamageDealAi setting damage to 0 if adjustment to minimum required damage fails.

Closes #1023

See merge request core-developers/forge!1738
 2019-05-29 15:54:10 +00:00
Agetian
2dcf1c088a - Fix DamageDealAi setting damage to 0 if adjustment to minimum required damage fails. 2019-05-29 18:53:32 +03:00
Michael Kamensky
c015893ea3 Merge branch 'master' into 'master' 
Fix AI for Hide // Seek

Closes #1022

See merge request core-developers/forge!1737
 2019-05-29 15:30:48 +00:00
Agetian
b9a848f7eb - Fix AI for Hide // Seek 2019-05-29 18:27:01 +03:00
Hans Mackowiak
5efc4a32ab Merge branch 'fix-akoum_stonewaker' into 'master' 
FIX: Exile token of Akoum Stonewalker properly

Closes #953

See merge request core-developers/forge!1736
 2019-05-29 13:23:27 +00:00
pfirpfel
99f34af5df FIX: Exile token of Akoum Stonewalker properly 2019-05-29 15:05:26 +02:00
swordshine
cb996d48c5 Merge branch 'fix-ai-removeanycounter' into 'master' 
Fix Remove Any Counter for the AI

See merge request core-developers/forge!1735
 2019-05-29 12:28:52 +00:00
swordshine
0bf17d5357 Merge branch 'patch-22' into 'master' 
Kaya's Guile

See merge request core-developers/forge!1732
 2019-05-29 12:16:05 +00:00
Agetian
d3b8a2cc0e - Fix Remove Any Counter for the AI 2019-05-29 14:24:01 +03:00
Charles Baker
59456e1aec Pashalik Mons 2019-05-29 02:18:33 +00:00
Charles Baker
bbda835e68 Kaya's Guile 2019-05-29 01:53:39 +00:00
swordshine
ba35cbb578 Merge branch 'handsize' into 'master' 
Fix NPE when AI discards to hand size

See merge request core-developers/forge!1731
 2019-05-29 00:43:06 +00:00
swordshine
3c434aca4c Merge branch 'mh1-cards' into 'master' 
MH1 cards (Hexdrinker, Winds of Abandon)

See merge request core-developers/forge!1719
 2019-05-29 00:37:28 +00:00
apantel
a93d131e02 Fix NPE when AI discards to hand size 2019-05-28 20:02:44 -04:00