external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28: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
Blacksmith
1d273d1c70 [maven-release-plugin] prepare release forge-1.6.12 forge-1.6.12 2018-07-31 01:38:44 +00:00
Blacksmith
ba540a73ec Update README.txt for release 2018-07-31 01:36:50 +00:00
Mitchell Matthews
69de2ef5c5 Merge branch 'fix-suncleanser' into 'master' 
Fix bad encoding for Suncleanser

See merge request core-developers/forge!815
 2018-07-31 01:13:41 +00:00
tehdiplomat
b624832293 Fix bad encoding 2018-07-30 21:00:39 -04:00
Hanmac
d11bafd244 GameAction: fixed putEtbCounters with Arixmethes 2018-07-30 23:14:19 +02:00
NikolayHD
6256a157ab codestyle 2018-07-30 22:40:42 +03:00
NikolayHD
43a12342e9 Fix incorrect path when extracting downloaded .zip 2018-07-30 22:40:42 +03:00
austinio7116
3d85051f7f Merge branch 'arixmethes' into 'master' 
Arixmethes, plus slumber counters

See merge request core-developers/forge!811
 2018-07-30 15:57:29 +00:00
austinio7116
c83279ad1f Lord Windgrace 2018-07-30 10:18:44 +01:00
austinio7116
e65dcbe6d5 Arixmethes - enters tapped 2018-07-29 20:21:20 +01:00
austinio7116
5e16d52ce9 Arixmethes - enters tapped 2018-07-29 20:14:29 +01:00
austinio7116
8331660825 Arixmethes, plus slumber counters 2018-07-29 19:30:48 +01:00
Hans Mackowiak
fc3cd818b2 Merge branch 'patch-1' into 'master' 
Update Kargan Dragonrider

See merge request core-developers/forge!808
 2018-07-29 12:12:06 +00:00
Hans Mackowiak
19ca07e65d Update Kargan Dragonrider 2018-07-29 10:44:22 +00:00
austinio7116
e903cfc32c Fixed Whiptongue Hydra 2018-07-29 10:36:12 +01:00
Michael Kamensky
5be840ab1d Merge branch 'targetedOrControllerFix' into 'master' 
cards: fixed cards with TargetedOrController

See merge request core-developers/forge!807
 2018-07-29 08:56:23 +00:00
austinio7116
5567c32a4a Fixed Ravenous Slime 2018-07-29 09:54:47 +01:00
Michael Kamensky
d3db01cf69 - Added missing DBDamageResolve to Which of You Burns Brightest. 2018-07-29 11:38:08 +03:00
austinio7116
1379e06678 Correcting/polishing AI generated C18 scripts 2018-07-29 09:10:38 +01:00
Hanmac
e4c4a87d45 cards: fixed cards with TargetedOrController 2018-07-29 09:56:52 +02:00
austinio7116
8f10afac00 C18 scripts created by the ForgeScribe neural network that look correct on visual inspection and load in Forge without crashing 
(cherry picked from commit b154229)
 2018-07-29 07:33:33 +01:00
Michael Kamensky
8f8493bd47 Merge branch 'updateSparktongueDragon' into 'master' 
Update Sparktongue Dragon to use Immediate Trigger Effect

See merge request core-developers/forge!805
 2018-07-29 04:20:10 +00:00
tjtillmancoag
0d7081a119 Update Sparktongue Dragon to use Immediate Trigger Effect 2018-07-28 12:44:24 -07:00
Hans Mackowiak
2ae2f90f5b Merge branch 'patch-1' into 'master' 
Update Commander 2018 remove SplitName

See merge request core-developers/forge!804
 2018-07-28 05:11:30 +00:00
Hans Mackowiak
098790cbf3 Update Commander 2018 remove SplitName 2018-07-28 05:11:01 +00:00
Michael Kamensky
448f723c2c Merge branch 'iss633' into 'master' 
Use distinct names for SVars

Closes #633

See merge request core-developers/forge!803
 2018-07-28 03:17:33 +00:00
Michael Kamensky
924e5bdaf1 Merge branch 'c18editions2' into 'master' 
C18 editions file generated by scryfall parsing script (still need to add type…

See merge request core-developers/forge!802
 2018-07-28 03:16:03 +00:00
kms70847
da81748f54 Use distinct names for SVars 
Possibly resolves https://git.cardforge.org/core-developers/forge/issues/633
 2018-07-27 19:57:56 -04:00
austinio7116
422f8d2c80 C18 editions file generated by scryfall parsing script (still need to add type lookups for future sets) 
(cherry picked from commit 97c3935)
 2018-07-27 23:53:55 +01:00
Hans Mackowiak
157aa30918 Merge branch 'patch-1' into 'master' 
Update sakashimas_student

See merge request core-developers/forge!801
 2018-07-27 15:33:47 +00:00
Hans Mackowiak
ee87a75621 Update sakashimas_student 2018-07-27 15:33:15 +00:00
Michael Kamensky
6852748739 Merge branch 'puzzle-engine' into 'master' 
Added puzzle PS_M192.

See merge request core-developers/forge!800
 2018-07-27 03:35:27 +00:00
Agetian
63bca8ce93 - Added puzzle PS_M192. 2018-07-27 06:34:44 +03:00
Sol
0d6fbb60ca Merge branch 'planeswalkerUpdate' into 'master' 
Planeswalker update

See merge request core-developers/forge!662
 2018-07-27 02:44:30 +00:00
Michael Kamensky
a670245b3d Merge branch 'bushidoFix' into 'master' 
Bushido fix

See merge request core-developers/forge!794
 2018-07-26 06:24:03 +00:00
Michael Kamensky
9b27742a5a Merge branch 'brawlm19format' into 'master' 
Brawl M19 format update

See merge request core-developers/forge!799
 2018-07-26 06:13:58 +00:00
austinio7116
ca7f551af4 Brawl M19 format update 2018-07-26 07:04:14 +01:00
Michael Kamensky
61040f4c05 Merge branch 'iss632' into 'master' 
Swap order of operands so `.equals` can't get called on a null value.

Closes #632

See merge request core-developers/forge!797
 2018-07-26 06:01:23 +00:00
Hanmac
421da7285c ComputerUtilCombat: hotfix for predictPowerBonusOfBlocker and predictToughnessBonusOfBlocker 2018-07-26 06:54:57 +02:00
Hanmac
6d829db99e ComputerUtilCombat: hotfix for predictPowerBonusOfAttacker and predictToughnessBonusOfAttacker 2018-07-26 06:48:33 +02:00
Hanmac
60d247503e cards: update Bushido 2018-07-26 06:35:07 +02:00
Hanmac
50cea02ae1 CardFactoryUtil: switch Bushido to new : format 2018-07-26 06:35:07 +02:00
kms70847
05c3402817 Swap order of operands so .equals can't get called on a null value. 
Resolves https://git.cardforge.org/core-developers/forge/issues/632
 2018-07-26 00:07:27 -04:00
Michael Kamensky
34c29be136 Merge branch 'keywordEnumTypeFix' into 'master' 
Keyword: fixed getting Enum

See merge request core-developers/forge!795
 2018-07-26 03:29:45 +00:00
Sol
efa8fa10d6 Update thorn_lieutenant.txt 2018-07-26 02:09:44 +00:00
Michael Kamensky
8f93f8e4bc Merge branch 'deckgenupdatem19' into 'master' 
Updated deck gen data

See merge request core-developers/forge!796
 2018-07-25 18:29:13 +00:00
austinio7116
fd061354ff Updated deck gen data 2018-07-25 18:43:14 +01:00
Agetian
b7553385f1 - Compile fix (deFails -> deTails) 2018-07-25 19:52:49 +03:00
Hanmac
805048b6b8 Keyword: fixed getting Enum 2018-07-25 17:57:12 +02:00
Michael Kamensky
85ad10a78a Merge branch 'immediate_trigger' into 'master' 
Working on Immediate trigger type

See merge request core-developers/forge!752
 2018-07-25 08:14:47 +00:00