2352 commits

Author	SHA1	Message	Date
spjspj	5a7a9049d9	Merge pull request #3549 from spjspj/master ... Implement The Locust God (HOU)	2017-06-27 21:33:21 +10:00
spjspj	6d35de829f	Implement The Locust God (HOU)	2017-06-27 21:32:14 +10:00
LevelX2	9b31a5a7e3	Merge pull request #3516 from ruler501/summerproject ... Shortcut/Macro System	2017-06-26 17:53:49 +02:00
spjspj	e683a579b3	Merge pull request #3512 from spacemoses/master ... Enhancement #3222 - Adding scroll to clipboard import in deck builder	2017-06-25 23:16:21 +10:00
Devon Richards	fee630a0ac	Small cleanup	2017-06-24 11:23:58 -05:00
LevelX2	442d8ebc78	* Added HOU spoilers 2017-06-24.	2017-06-24 11:00:21 +02:00
Ben Homer	b68091683a	Added keybinding to preferences and improved UI appearance with new image file.	2017-06-22 01:42:01 -05:00
Devon Richards	0d98514550	Added better UI and made it work with most categories of combos	2017-06-21 01:09:54 -05:00
Devon Richards	028d7ed1f8	Initial working product. Doesn't handle skipping stack.	2017-06-20 19:54:16 -05:00
spacemoses	882060bf3e	Enhancement #3222 - Adding scroll to clipboard import in deck builder	2017-06-18 18:44:59 -05:00
Quercitron	0c9c7c0a56	Add scryfall.com as a source for card images (closes #3496).	2017-06-17 17:55:35 +03:00
fireshoes	52b4633340	Added Commander Anthology. Added Archenemy: Nicol Bolas to mtg-cards-data.txt (missing most collector numbers until it goes up on Gatherer). Updated tokens for CMA and E01.	2017-06-05 16:00:13 -05:00
LevelX2	b62a15f68e	Merge pull request #3454 from drmDev/add/welcomedeck2017 ... adding welcome deck 2017 (see #3453)	2017-06-03 10:31:49 +02:00
Anders Åstrand	4d0e8cb443	Review fixes	2017-05-30 18:55:40 +02:00
Derek Monturo	1d662a0a58	adding welcome deck 2017 - closes #3453	2017-05-30 07:31:14 -04:00
Anders Åstrand	ad0507e739	Ban ignored users from watching ... This commit bans ignored users from watching games where the creator has them on their ignore list.	2017-05-29 21:36:42 +02:00
LevelX2	bd9b11fc49	Fixed some problems with popup window not been hidden if another frame is shown.	2017-05-27 14:35:50 +02:00
spjspj	e752ee3156	EDH Power level fix	2017-05-20 15:45:40 +10:00
spjspj	3cb7424dfd	EDH Power updates	2017-05-16 23:14:33 +10:00
spjspj	f85c7e07ba	Emblems refactor to show emblems in Card/Token Viewer	2017-05-14 13:43:18 +10:00
spjspj	5514787871	Merge pull request #3350 from spjspj/master ... Allow sort by EDH Power level in Deck Editor	2017-05-11 17:54:23 +10:00
spjspj	347d08298f	Allow sort by EDH Power level in Deck Editor	2017-05-11 17:52:43 +10:00
LevelX2	ea439505ce	Some minor changes.	2017-05-09 17:02:30 +02:00
spjspj	0942db541f	Token refactor	2017-05-08 23:26:33 +10:00
spjspj	f909005bb1	Token refactor	2017-05-08 23:20:33 +10:00
spjspj	bec0964726	Token refactor	2017-05-08 21:53:01 +10:00
spjspj	a897b374a0	Token refactor	2017-05-07 20:57:57 +10:00
spjspj	ba6e8409d1	Token refactor	2017-05-07 11:46:52 +10:00
spjspj	e73e7d8600	Token refactor	2017-05-06 23:35:14 +10:00
bugfi5h	72ec960c95	Merge branch 'develop' into feature/CopperAngel	2017-05-01 15:10:56 +02:00
spjspj	3f125db074	Merge pull request #3271 from spjspj/master ... spjspj - Remove Tokens from Card Viewer - need to reorg the tokens fi…	2017-04-30 11:15:54 +10:00
spjspj	0d0fccc105	spjspj - Remove Tokens from Card Viewer - need to reorg the tokens first.	2017-04-30 11:14:24 +10:00
LevelX2	3cc157bc2c	* Fixed null pointer exception problems in client.	2017-04-30 00:07:37 +02:00
spjspj	04f298923c	spjspj - Add in Tokens to the Card Viewer (fix)	2017-04-29 17:42:08 +10:00
spjspj	241691b153	spjspj - Add in Tokens to the Card Viewer (first version)	2017-04-29 17:25:54 +10:00
bugfi5h	217e294470	Added Card: Copper-Leaf Angel	2017-04-27 21:25:30 +02:00
igoudt	05785f71b9	Make the implementations of CardImageSource an enum	2017-04-27 10:57:48 +02:00
igoudt	3f47d5a253	put inputstream in try body so it can be autoclosed	2017-04-27 10:57:48 +02:00
igoudt	0528555075	make DefaulActionCallback an enum and remove unused parameter	2017-04-27 10:57:48 +02:00
igoudt	ce26e5c8dd	make the combatmanager an enum	2017-04-27 10:57:48 +02:00
igoudt	5b21f34941	rewrote gettypetext, added removeIf to TableModel	2017-04-27 10:57:48 +02:00
igoudt	27aea04820	move methods from cardutil to magepermanent, cardview:getColorText now uses ObjectColor.getDescription	2017-04-27 10:57:48 +02:00
Derek M	c4330415c1	Merge pull request #3241 from drmDev/master ... Unit test confirming issue #3195 with Combat Celebrant	2017-04-25 22:09:14 -04:00
drmDev	04746c5f4f	Unit test confirming issue #3195 allowing Celebrant to attack while exerted	2017-04-25 22:07:51 -04:00
igoudt	c1ce821340	fix on playertype enum comparison	2017-04-26 00:37:06 +02:00
spjspj	4c85d89b64	Fix for the audio trigger of 'Player joined the table' not being fired.	2017-04-25 20:12:21 +10:00
spjspj	a4e7c2b407	Fix for the audio trigger of 'Player joined the table' not being fired.	2017-04-25 18:17:28 +10:00
spjspj	4ed9419cbf	Fill in missing str	2017-04-23 23:47:43 +10:00
spjspj	6ab4a94bd7	spjspj - Add in 'View Current Deck' option.	2017-04-23 13:06:09 +10:00
spjspj	8845d77628	spjspj - Remove View Limited Deck option	2017-04-22 19:35:08 +10:00