Commit Graph

35728 Commits

Author SHA1 Message Date
Rob Schnautz
19a1bf0c0e Premium Gigantomancer 2018-01-21 19:39:34 +00:00
Rob Schnautz
16adb81cd2 Description, premium Deepfathom Skulker 2018-01-21 19:35:20 +00:00
Rob Schnautz
115b77682b Description, premium Nephalia Moondrakes 2018-01-21 19:26:57 +00:00
Rob Schnautz
82839cc500 Description, premium Sanctifier of Souls 2018-01-21 19:21:08 +00:00
Rob Schnautz
5dca460399 Description, premium Dragonscale General 2018-01-21 19:15:33 +00:00
Michael Kamensky
0eeb68737c Merge branch 'patch-4' into 'master'
Premium Sphinx of Jwar Isle

See merge request core-developers/forge!133
2018-01-21 19:15:10 +00:00
Michael Kamensky
389e21aca7 Merge branch 'patch-3' into 'master'
Update Untamed Wild.dck

See merge request core-developers/forge!132
2018-01-21 19:14:30 +00:00
Michael Kamensky
1eec2905b1 Merge branch 'patch-5' into 'master'
Premium Lich Lord of Unx

See merge request core-developers/forge!134
2018-01-21 19:13:22 +00:00
Rob Schnautz
7823368ebc Premium Lich Lord of Unx 2018-01-21 19:05:57 +00:00
Rob Schnautz
8b0f5ff91e Premium Sphinx of Jwar Isle 2018-01-21 18:36:42 +00:00
Rob Schnautz
f45a4d06a3 Update Untamed Wild.dck 2018-01-21 18:33:59 +00:00
Michael Kamensky
d16a197651 Merge branch 'assorted-fixes' into 'master'
- Fixed the AI for Hunt the Weak/Savage Storm, prevented a crash when trying to exec a trigger with a non-existent SVar

See merge request core-developers/forge!130
2018-01-21 18:04:27 +00:00
Hanmac
95263720f3 Merge branch 'master' of git.cardforge.org:core-developers/forge 2018-01-21 17:56:35 +01:00
Hanmac
56f05c54f9 CardFactoryUtil: fixed Haunt for non creature 2018-01-21 17:53:45 +01:00
Agetian
b20c5acf75 - Issue a warning when trying to execute a trigger that references a SVar which does not exist and abort the execution of that trigger instead of hard-crashing the game (makes the issue with a manifested Hideaway land dying non-fatal). 2018-01-21 19:49:04 +03:00
Michael Kamensky
33f296da7c Merge branch 'newcard' into 'master'
- Daretti, Ingenious Iconoclast: Cleanup remembered for the second ability

See merge request core-developers/forge!131
2018-01-21 16:46:29 +00:00
Rob Schnautz
429ac3c072 TextUtil not needed in this file. 2018-01-21 16:17:13 +00:00
Agetian
4b5a555c1e - Fixed the AI overtargeting cards like Hunt the Weak and Savage Stomp and failing to add the card to stack. 2018-01-21 16:38:45 +03:00
swordshine
278d64d800 - Daretti, Ingenious Iconoclast: Cleanup remembered for the second ability 2018-01-21 20:24:30 +08:00
Michael Kamensky
6ceb08d41d Merge branch 'mobile-release' into 'master'
- Preparing Mobile Forge publish v1.6.6.001 [incremental].

See merge request core-developers/forge!129
2018-01-21 12:22:50 +00:00
Agetian
0e513614c3 - Preparing Mobile Forge publish v1.6.6.001 [incremental]. 2018-01-21 15:16:59 +03:00
Hans Mackowiak
b8ac0819aa Merge branch 'Keywordcache' into 'master'
Cache keywords to fix the slowdown issues on mobile Forge

See merge request core-developers/forge!127
2018-01-21 07:31:04 +00:00
Rob Schnautz
8380da7a10 Don't need transformPT anymore. 2018-01-21 04:59:46 +00:00
Rob Schnautz
cb7922fe15 Don't need TextUtils here 2018-01-21 04:57:51 +00:00
Rob Schnautz
3b6cfef67d TextUtil isn't needed here. 2018-01-21 04:46:22 +00:00
Rob Schnautz
b20bb2d023 simplify strings 2018-01-20 21:04:08 +00:00
Rob Schnautz
f8decaac41 simplify strings 2018-01-20 20:51:37 +00:00
Rob Schnautz
d7674c15b5 Update CardFace.java 2018-01-20 20:45:06 +00:00
Rob Schnautz
9d1c6eaa7f simplify string generation 2018-01-20 20:34:01 +00:00
Michael Kamensky
1927a94879 Merge branch 'assorted-fixes' into 'master'
- Fixed Oathsworn Vampire ability description.

See merge request core-developers/forge!126
2018-01-20 20:27:20 +00:00
Rob Schnautz
590b877f76 simplify string generation 2018-01-20 19:59:28 +00:00
Agetian
6c93862891 Merge branch 'master' of git.cardforge.org:core-developers/forge into assorted-fixes 2018-01-20 22:44:48 +03:00
Agetian
cd9289bcdd - Fixed Oathsworn Vampire ability description. 2018-01-20 22:23:14 +03:00
Hanmac
c294e1f6df Card cached keywords move to CardState, tests still run 2018-01-20 18:52:34 +01:00
Rob Schnautz
9090cc70bf Probably want to use err, not out. 2018-01-20 15:41:55 +00:00
Rob Schnautz
244e2a9e8d Remove concatWithSpace since there's nothing to concatenate anymore. 2018-01-20 15:33:11 +00:00
Rob Schnautz
cc2b2921d9 Move the log output here to make it display the correct edition. 2018-01-20 15:02:24 +00:00
Rob Schnautz
88339864f7 The edition displayed isn't correct. Moving that part of the output to the class that creates the "unsupported card" object. 2018-01-20 14:57:44 +00:00
Michael Kamensky
f0ad9083a5 Merge branch 'volrath-fix' into 'master'
Fixed Volrath's Shapeshifter

See merge request core-developers/forge!124
2018-01-20 11:58:37 +00:00
Hanmac
e66194fb9d Card: getUnhiddenKeywords uses cache
that is updated by CardStateView#updateKeywords
2018-01-20 08:09:56 +01:00
Agetian
042693bf53 - Volrath's Shapeshifter: unfortunately, the generic solution for AB Discard on a SVar didn't work (doesn't work with cloning, crashes the game), so resorting to a non-generic version specific to VS. 2018-01-19 22:16:16 +03:00
Michael Kamensky
4a8cecd225 Merge branch 'assorted-fixes' into 'master'
Various minor card and definition fixes.

See merge request core-developers/forge!123
2018-01-19 19:04:14 +00:00
Agetian
1a9003c999 - Trim the spaces on TokenAltImages. 2018-01-19 21:51:20 +03:00
Michael Kamensky
e35f09ea2f Merge branch 'angrath-fix' into 'master'
- Fixed Angrath, the Flame-Chained [-3] ability.

See merge request core-developers/forge!120
2018-01-19 18:42:15 +00:00
Agetian
056d66b865 - Apparently the extra copy for activated ABs is no longer necessary for Volrath's Shapeshifter. 2018-01-19 21:40:36 +03:00
Agetian
ceafaf5e2e - Fixing Volrath's Shapeshifter, pass 2. 2018-01-19 21:31:45 +03:00
Agetian
5207e697dd - Fixing Volrath's Shapeshifter, pass 1. 2018-01-19 12:06:14 +03:00
Agetian
39a5da9a1b - Fixed Sporogenesis. 2018-01-19 07:45:30 +03:00
Agetian
4ed99e026f - Fixed Sword Guardian rarity in RIX def file. 2018-01-19 07:44:17 +03:00
Agetian
cdff15dade - Fixed TokenAltImages definition in Awakening Zone. 2018-01-19 07:44:00 +03:00