external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,404 Commits 34 Branches 187 Tags
f1f96557c2a08d30a84a68f9bd731c94b0fc715c
Commit Graph

38404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kms70847
44f19b13a7 Merge remote-tracking branch 'upstream/master' 2018-07-14 15:07:55 -04:00
T.J. Tillman
a30aa5d873 Update remorseful_cleric.txt 2018-07-14 16:56:02 +00:00
tjtillmancoag
4d611cc0b9 For now AI always immediately sacrifices Remorseful Cleric, so removing it from AI decks 2018-07-14 00:09:53 -07:00
Michael Kamensky
918f0844eb Merge branch 'cherry-pick-33f53390' into 'master' 
add m19 decks

See merge request core-developers/forge!746
 2018-07-14 04:18:09 +00:00
Michael Kamensky
4f56595003 Merge branch 'm19someMoreFixes' into 'master' 
Few M19 Fixes

See merge request core-developers/forge!748
 2018-07-14 04:17:16 +00:00
kms70847
42dcd45392 Merge branch 'master' of git.cardforge.org:magicalblender/forge 2018-07-13 20:09:51 -04:00
kms70847
f43cc09b6f Don't specify block acronym when defining HumanExtras or AIExtras. 
Resolves https://git.cardforge.org/core-developers/forge/issues/567
 2018-07-13 20:07:10 -04:00
kms70847
8f4eb8596d Don't treat a copied ability's host like it's a copy of a card 
Bugfix follow up to commit that solved https://git.cardforge.org/core-developers/forge/issues/615
 2018-07-13 18:29:03 -04:00
kms70847
5459914156 Don't treat a copied ability's host like it's a copy of a card 
Bugfix follow up to commit that solved https://git.cardforge.org/core-developers/forge/issues/615
 2018-07-13 18:20:58 -04:00
Rob Schnautz
ecce77bbc6 Merge branch 'master' into 'cherry-pick-33f53390' 
update branch

See merge request core-developers/forge!751
 2018-07-13 21:43:18 +00:00
Rob Schnautz
dccfd3ce08 Add shop and metadata properties 2018-07-13 21:38:27 +00:00
Hans Mackowiak
c29457d341 Merge branch 'CounterNumFix' into 'master' 
CounterPut: fix with CounterNum

See merge request core-developers/forge!750
 2018-07-13 17:38:21 +00:00
Hanmac
dfdee167a4 CounterPut: fix with CounterNum 2018-07-13 19:37:00 +02:00
Michael Kamensky
ab17ab70c5 Merge branch 'schnautzr-master-patch-39605' into 'master' 
M19 now legal in Limited formats

See merge request core-developers/forge!749
 2018-07-13 16:57:35 +00:00
T.J. Tillman
e79b2a3ad3 Update militia_bugler.txt 2018-07-13 16:56:31 +00:00
Rob Schnautz
53c50afca0 M19 now legal in Limited formats 2018-07-13 14:12:37 +00:00
tjtillmancoag
43862557f4 Few M19 Fixes 
-Ajani, Adversary of Tyrants's first ability didn't specify NumCounters and was causing it to crash
-Fixed capitalization of nontoken to nonToken in Lena, Selfless Champion
-Militia Bugler was revealing all 4 cards dug to both players, fixed that
-Open the Graves was naming the zombies "Saproling", fixed to "Zombie"
-Made Skyrider Patrol work at least the way it was scripted (still isn't technically correct, but it works now)
-Corrected cost of Vivien Reid's ultimate
 2018-07-12 22:18:06 -07:00
Hans Mackowiak
204da34651 Merge branch 'master' into 'master' 
When copying abilities, the source of the ability should not be copied.

Closes #615

See merge request core-developers/forge!747
 2018-07-13 05:02:18 +00:00
kms70847
f92fd358c8 When copying abilities, the source of the ability should not be copied. 
Resolves https://git.cardforge.org/core-developers/forge/issues/615
 2018-07-12 23:52:34 -04:00
Michael Kamensky
407b8b213c Merge branch 'patch-1' into 'master' 
normalize filename

See merge request core-developers/forge!745
 2018-07-13 03:18:29 +00:00
schnautzr
9a14dba0f8 add m19 decks 
(cherry picked from commit 33f533900d2a49236ee551e2524700487869c342)
 2018-07-13 03:06:45 +00:00
Rob Schnautz
94e4b00226 normalize filename 2018-07-12 20:54:54 +00:00
Michael Kamensky
19aaf067d8 Merge branch 'master' into 'master' 
Added an alt token image spec for Jiang Yanggu's Mowu token.

See merge request core-developers/forge!744
 2018-07-08 05:40:40 +00:00
Agetian
9de2a69c26 - Added an alt token image spec for Jiang Yanggu's Mowu token. 2018-07-08 08:39:03 +03:00
Michael Kamensky
059644a27d Merge branch 'charm-ai' into 'master' 
Fixed AI not making choices for AF Charm when playing spells without paying mana cost

See merge request core-developers/forge!742
 2018-07-07 13:32:00 +00:00
Michael Kamensky
ac12db1738 Merge branch 'eggs' into 'master' 
cards: Egg now is a creature type again

See merge request core-developers/forge!741
 2018-07-07 13:31:51 +00:00
Michael Kamensky
bcf4485331 Merge branch 'master' into 'master' 
Fixed Fell Specter.

See merge request core-developers/forge!743
 2018-07-07 13:31:20 +00:00
Michael Kamensky
8493f9ca2c - Fixed Fell Specter. 2018-07-07 16:30:47 +03:00
Michael Kamensky
e89a742b24 - Added a simple CheckDFC logic for putting counters on cards that can transform later as a result (Ludevic's Test Subject). 2018-07-07 14:43:17 +03:00
Michael Kamensky
020e02fb50 - AI should make choices for AF Charm when playing a SA with this API without paying its mana cost. 2018-07-07 14:21:05 +03:00
Hanmac
5bbd10dfbb cards: Egg now is a creature type again 2018-07-07 10:26:49 +02:00
Michael Kamensky
eb102da367 Merge branch 'fixDruidofHorns' into 'master' 
Few M19 fixes

See merge request core-developers/forge!739
 2018-07-07 04:46:36 +00:00
Michael Kamensky
2dd7d8d9ba Merge branch 'm19finalfew' into 'master' 
Fixed Shield Mare triggering on wrong sources

See merge request core-developers/forge!738
 2018-07-07 04:46:01 +00:00
tjtillmancoag
f6690b2bee Corrected Druid of Horns to be a 2/3 2018-07-06 16:26:50 -07:00
tjtillmancoag
5f0bd1852d Few M19 fixes 
-Corrected Draconic Disciple to a 2/2
-Fixed Skilled Reanimator so that targeted non-creature artifacts will become creatures
 2018-07-06 16:24:31 -07:00
austinio7116
ff592f0bd3 Fixed Shield Mare triggering on wrong sources 2018-07-06 20:28:28 +01:00
Michael Kamensky
078a713302 Merge branch 'master' into 'master' 
Move Skyrider Patrol out of upcoming.

See merge request core-developers/forge!737
 2018-07-06 12:13:03 +00:00
Agetian
8fa6f80acd - Move Skyrider Patrol out of upcoming. 2018-07-06 15:12:37 +03:00
Michael Kamensky
a0576418aa Merge branch 'm19-aiflags' into 'master' 
Adding AI deckbuilding and some gameplay hints for M19.

See merge request core-developers/forge!736
 2018-07-06 11:52:01 +00:00
Agetian
b1b892bbc8 - Adding AI deckbuilding and some gameplay hints for M19. 2018-07-06 14:50:13 +03:00
Michael Kamensky
24fbcd2859 Merge branch 'master' into 'master' 
Fixed Brawl-Bash Ogre implementation

See merge request core-developers/forge!735
 2018-07-06 11:25:29 +00:00
Agetian
7d421a482d - Fixed Brawl-Bash Ogre (CARDNAME). 2018-07-06 14:08:30 +03:00
Agetian
14438ac5b3 - Fixed Brawl-Bash Ogre. 2018-07-06 14:02:56 +03:00
Michael Kamensky
93fb466075 Merge branch 'master' into 'master' 
Fixed description on Liliana, Untouched by Death ultimate.

See merge request core-developers/forge!734
 2018-07-06 10:28:59 +00:00
Agetian
0f5ad7e851 - Fixed description on Liliana, Untouched by Death ultimate. 2018-07-06 13:28:30 +03:00
Michael Kamensky
a61adf78b6 Merge branch 'master' into 'master' 
Fixed cost on Liliana, Untouched by Death ultimate.

See merge request core-developers/forge!733
 2018-07-06 10:23:06 +00:00
Agetian
a1f8ee4a0e - Fixed cost on Liliana, Untouched by Death ultimate. 2018-07-06 13:22:46 +03:00
Michael Kamensky
9ed0f74820 Merge branch 'm19finalfew' into 'master' 
Fix Liliana's last ability

See merge request core-developers/forge!732
 2018-07-06 10:18:24 +00:00
austinio7116
b124d8b4c4 Fix Liliana's last ability 2018-07-06 10:20:31 +01:00
Michael Kamensky
7b40392bc5 Merge branch 'setStateFixes' into 'master' 
SetState: nonPerm can't turn faceup, also canTransform check

See merge request core-developers/forge!728
 2018-07-06 06:19:20 +00:00