35754 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Michael Kamensky	16f2b16d22	Merge branch 'patch-3' into 'master' ... DDT - Add periods in "vs." See merge request core-developers/forge!122	2018-01-19 04:39:24 +00:00
Michael Kamensky	3efde7a2e3	Merge branch 'patch-2' into 'master' ... Token image updates for cards beginning with A See merge request core-developers/forge!113	2018-01-19 04:33:42 +00:00
Sol	032bcec313	Merge branch 'upcoming_rix2' into 'master' ... Fixed TriggerZones for Storm the Vault plus corrected description on trigger See merge request core-developers/forge!121	2018-01-19 03:05:59 +00:00
Rob Schnautz	a5d5ed8524	Add periods in "vs."	2018-01-18 23:53:24 +00:00
Rob Schnautz	c1e5d346c8	fix syntax	2018-01-18 22:03:04 +00:00
austinio7116	0a004b8f7e	Fixed TriggerZones for Storm the Vault plus corrected description on trigger	2018-01-18 20:51:55 +00:00
Agetian	ffcd5b2f2c	- Fixed Angrath, the Flame-Chained.	2018-01-18 18:57:51 +03:00
Sol	11ed680b5a	Merge branch 'assorted-fixes' into 'master' ... - Fixed some RIX cards, some long PTK quest deck file names, and updated CHANGES.txt. See merge request core-developers/forge!111	2018-01-18 13:37:41 +00:00
Agetian	3abc22a855	- Attempted to fix Angrath, the Flame-Chained [-3] ability.	2018-01-18 11:38:48 +03:00
Agetian	ef9d6203c0	- Updating CHANGES.txt to reflect recent changes.	2018-01-18 09:15:19 +03:00
Agetian	016df27726	Merge remote-tracking branch 'origin/assorted-fixes' into assorted-fixes	2018-01-18 09:10:19 +03:00
Agetian	246ce114e2	- Rename some long deck file names in PTK quest to satisfy tar requirements for packaging.	2018-01-18 09:09:44 +03:00
Michael Kamensky	f3767417b0	Merge branch 'patch-3' into 'master' ... Anthologies See merge request core-developers/forge!114	2018-01-18 05:13:52 +00:00
Michael Kamensky	67fb62ec52	Merge branch 'patch-4' into 'master' ... Battle Royale See merge request core-developers/forge!115	2018-01-18 05:13:43 +00:00
Michael Kamensky	27f2dcc8d5	Merge branch 'patch-5' into 'master' ... Beatdown See merge request core-developers/forge!116	2018-01-18 05:13:26 +00:00
Michael Kamensky	9f37393a69	Merge branch 'patch-6' into 'master' ... Deckmasters: Garfield vs. Finkel See merge request core-developers/forge!117	2018-01-18 05:13:05 +00:00
Michael Kamensky	a7af6ecfc0	Merge branch 'patch-7' into 'master' ... Duels of the Planeswalkers See merge request core-developers/forge!118	2018-01-18 05:12:54 +00:00
Michael Kamensky	f772ab5fcc	Merge branch 'newcard' into 'master' ... - Fixed Palace Jailer See merge request core-developers/forge!119	2018-01-18 05:12:26 +00:00
swordshine	6076954881	- Fixed Palace Jailer	2018-01-18 09:21:53 +08:00
Rob Schnautz	581bb74b9c	revert	2018-01-17 21:17:06 +00:00
Rob Schnautz	81a8c93db4	revert	2018-01-17 21:16:45 +00:00
Rob Schnautz	6d8e162df3	revert	2018-01-17 21:16:36 +00:00
Rob Schnautz	9f44b46186	revert	2018-01-17 21:16:32 +00:00
Hanmac	e15f826190	Blessing: need to do blessing before condition	2018-01-17 21:04:44 +01:00