external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,934 Commits 32 Branches 187 Tags
677ee26e91b1ce3d9dfaee0edb88c64db04dad3c
Commit Graph

38934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
48f0d5b5e4 Merge branch 'm19deckgenupdate' into 'master' 
M19 deckgen updates for standard

See merge request core-developers/forge!767
 2018-07-17 17:59:05 +00:00
austinio7116
eaaa18b15e M19 deckgen updates for standard 2018-07-17 18:18:14 +01:00
Michael Kamensky
613bae436d Merge branch 'puzzle-engine' into 'master' 
GameState: preserve the number of lands played so that land drops from the previous game state do not affect the new game state

See merge request core-developers/forge!766
 2018-07-17 15:27:18 +00:00
Agetian
3c2f5b2ecf - Also reset the lands played last turn. 2018-07-17 16:13:35 +03:00
Michael Kamensky
15aa393d19 Merge branch 'changes-updated' into 'master' 
Updated changes before release.

See merge request core-developers/forge!765
 2018-07-17 07:56:42 +00:00
Michael Kamensky
f8fda3fb2c Merge branch 'CorrectMacabreWaltz' into 'master' 
Fix Macabre Waltz bug

See merge request core-developers/forge!763
 2018-07-17 07:53:42 +00:00
Agetian
442263710b - GameState: preserve the number of lands played so that land drops from the previous game state do not affect the new game state. 2018-07-17 08:50:56 +03:00
maustin
41013330fc Updated changes before release. 2018-07-17 06:29:40 +01:00
Michael Kamensky
64b456827d Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_M191.

See merge request core-developers/forge!764
 2018-07-17 05:25:35 +00:00
Agetian
54ad6393ac - Added puzzle PS_M191. 2018-07-17 08:24:53 +03:00
tjtillmancoag
c4a3e93e44 Fixed bug where if opponent controlled your creature and then it died, that creature couldn't be targeted by Macabre Waltz 2018-07-16 22:23:53 -07:00
Michael Kamensky
d51b9cfa24 Merge branch 'CorrectThornLieutenant' into 'master' 
Fix Thorn Lieutenants token generating trigger

See merge request core-developers/forge!762
 2018-07-17 05:09:31 +00:00
tjtillmancoag
7250fa7134 Changed parameter SourceType$ to ValidSource$ in Thorn Lieutenant so that it properly doesn't create tokens from being targeted by its controllers spells and abilities 2018-07-16 21:46:56 -07:00
Michael Kamensky
91b60f1c0f Merge branch 'cherry-pick-f5322112' into 'master' 
Support viewing cardscripts from the "upcoming" folder in the Card Workshop.

Closes #18

See merge request core-developers/forge!761
 2018-07-17 04:20:39 +00:00
schnautzr
3e87e8bb55 Support viewing cardscripts from the "upcoming" folder in the Card Workshop. 
(cherry picked from commit f53221125cc5ecf218b145493838b89f43edc41c)
 2018-07-17 02:36:41 +00:00
Michael Kamensky
dbe6f2714f Merge branch 'scriptFix' into 'master' 
ForgeScript: try to fix the SpellAbility Checks

See merge request core-developers/forge!760
 2018-07-16 17:58:29 +00:00
Hanmac
25220a46ee ForgeScript: try to fix the SpellAbility Checks 2018-07-16 19:51:54 +02:00
Michael Kamensky
ff3a0fffea Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_M190.

See merge request core-developers/forge!759
 2018-07-15 18:24:11 +00:00
Agetian
c9f71ec6f2 - Added puzzle PS_M190. 2018-07-15 21:23:36 +03:00
Michael Kamensky
6bc8aabb6b Merge branch 'facedownTezz' into 'master' 
ChangeZoneEffect: special Facedown rules for Tezzeret

See merge request core-developers/forge!758
 2018-07-15 18:13:13 +00:00
Michael Kamensky
f577e5446a Merge branch 'CorrectSarkhanCost' into 'master' 
Corrected Mana cost of Sarkhan, Dragonsoul

See merge request core-developers/forge!757
 2018-07-15 17:48:22 +00:00
Hanmac
d18f891e8f ChangeZoneEffect: special Facedown rules for Tezzeret 2018-07-15 18:42:01 +02:00
tjtillmancoag
ca6514fa45 Corrected Mana cost of Sarkhan, Dragonsoul 2018-07-15 09:34:26 -07:00
Michael Kamensky
14043d88e5 Merge branch 'iss567' into 'master' 
Remove set acronyms from more affected challenge decks

See merge request core-developers/forge!755
 2018-07-15 04:49:10 +00:00
Michael Kamensky
73234133b1 Merge branch 'iss616' into 'master' 
Add Battlefield TriggerZone to Barren Glory.

See merge request core-developers/forge!756
 2018-07-15 04:48:48 +00:00
kms70847
5436aa10f0 Add Battlefield TriggerZone to Barren Glory. 
Fix for https://git.cardforge.org/core-developers/forge/issues/616.
 2018-07-14 17:37:16 -04:00
kms70847
87ffcbef1c Remove set acronyms from more affected challenge decks 
Follow up to fix for https://git.cardforge.org/core-developers/forge/issues/567
 2018-07-14 17:23:09 -04:00
Hans Mackowiak
4d297385a7 Merge branch 'm19remorsefulClericRemAIDeck' into 'master' 
Remorseful Cleric fix

See merge request core-developers/forge!754
 2018-07-14 21:09:29 +00:00
T.J. Tillman
6e5ebd50ba Update remorseful_cleric.txt 2018-07-14 20:56:22 +00:00
Hans Mackowiak
9020530a74 Merge branch 'master' into 'master' 
Don't treat a copied ability's host like it's a copy of a card

Closes #567

See merge request core-developers/forge!753
 2018-07-14 20:36:57 +00:00
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