933 commits

Author	SHA1	Message	Date
Oleg Agafonov	2a12e788d5	clean git source	2017-11-11 13:02:49 +04:00
spjspj	19c9689f89	Apostrophes	2017-11-11 12:39:42 +11:00
Evan Kranzler	83231c8992	updated Canadian Highlander points list	2017-11-08 15:34:47 -05:00
LevelX2	0d46c68924	* Fixed some problems for handling concede during game init.	2017-11-04 18:19:41 +01:00
LevelX2	9700445fae	Merge branch 'master' into master	2017-11-02 11:29:47 +01:00
LevelX2	f1bbb37c81	Merge origin/master	2017-11-02 10:29:04 +01:00
jerekwilson	5d34a2304d	Merge branch 'master' into master	2017-10-22 20:09:26 -04:00
Jerek Wilson	8f49988bbf	JW-TalonOfPain: Implemented Talon of Pain	2017-10-22 19:37:53 -04:00
theelk801	0ac6bf93b8	Merge pull request #4119 from Faxn/feature/momirFFA ... Add Momir Basic Free for All	2017-10-21 16:11:44 -04:00
LevelX2	919ec2fade	Merge origin/master	2017-10-21 16:14:14 +02:00
LevelX2	58d3fc2328	Fixed player leaving/conceding handling.	2017-10-21 16:13:45 +02:00
Evan Kranzler	d52f46323b	Updated Adam Styborski's Pauper Cube	2017-10-19 13:55:16 -04:00
Faxn	51ea9972e0	Merge branch 'master' into feature/momirFFA	2017-10-19 13:08:13 -04:00
Jerek Wilson	be7d23d15c	JW-Dead-Iron_Sledge: Implemented Dead-Iron Sledge	2017-10-18 23:53:04 -04:00
Jerek Wilson	12f14ea488	JW-RhysticCave: Implemented Rhystic Cave	2017-10-15 11:17:23 -04:00
Jerek Wilson	1afcf67e8d	JW-IceFloe: Implemented Ice Floe	2017-10-10 00:12:26 -04:00
Jerek Wilson	50d9cb5568	JW-JaggedPoppet: Implemented Jagged Poppet	2017-10-09 22:04:30 -04:00
Evan Kranzler	901a640592	updated MTGO 1v1 Commander banlist	2017-10-09 12:30:36 -04:00
Evan Kranzler	93f01af87e	fixed SOI block being incorrectly included in standard, removed unnecessary bans	2017-10-02 13:51:52 -04:00
Faxn	31d4be7a1c	Momir Multiplayer Might just work.	2017-09-28 18:21:47 -04:00
Benjamin Maitland	f22d64df82	Fixed Zendikar release date.	2017-09-27 23:13:06 -04:00
Evan Kranzler	c8457aec49	updated Duel Commander banlist	2017-09-26 08:50:55 -04:00
LevelX2	3ac7fc2726	* Some fixes to possible exceptions.	2017-09-23 23:48:25 +02:00
LevelX2	2d6bcd83f4	xmage 1.4.26V4	2017-09-16 16:55:58 +02:00
LevelX2	2117bfc17c	Merge ReworkImageDownload	2017-09-15 23:23:49 +02:00
LevelX2	3fc3d96fe0	Some updates to image download.	2017-09-15 23:18:40 +02:00
LevelX2	5996aa12e6	Trove of Temptation working for Human.	2017-09-15 17:51:54 +02:00
LevelX2	d9c601dd26	Trove of Temptation - Basic some changes to Combat and Human	2017-09-14 17:50:00 +02:00
Evan Kranzler	252c941b4f	Refactored more subtypes usages to enum	2017-09-08 09:57:51 -04:00
LevelX2	23fc43fafe	Merge master into ReworkImageDownload	2017-09-08 13:58:09 +02:00
LevelX2	b2496e3d7f	Fixed Vintage restricted list.	2017-09-05 16:19:53 +02:00
Evan Kranzler	26e4e2672e	Updated Vintage restricted list	2017-09-04 12:11:47 -04:00
LevelX2	d003cd898f	Image download by set with source restriction to supported sets.	2017-09-04 07:57:10 +02:00
LevelX2	5bf12d227c	Some minor changes.	2017-09-01 23:50:07 +02:00
LevelX2	cba7a510ea	* Fixed a bug if casting split cards from other players e.g with Mindclaw Shaman (fixes #3867).	2017-08-30 00:30:46 +02:00
LevelX2	e909f5c801	C17 Added Portal Mage.	2017-08-28 16:50:00 +02:00
theelk801	22d253acd7	Merge pull request #43 from magefree/master ... merge	2017-08-26 19:59:51 -04:00
Evan Kranzler	942e1cce9a	Updated Canadian Highlander points list	2017-08-26 18:03:26 -04:00
LevelX2	52897094b3	* Some chnages to chat, user and player handling.	2017-08-26 18:26:55 +02:00
LevelX2	db93e3f672	* C17 Enchantment Curses - Fixed a bug that could create game errors (index out of bounds).	2017-08-17 21:36:55 +02:00
LevelX2	1fb24116ae	xmage 1.4.26V0	2017-08-15 01:27:06 +02:00
spjspj	6435b9950a	Add in Penny Dreadful EDH format (plus filter options for deck editor).	2017-08-04 17:13:25 +10:00
LevelX2	69e239d2ed	Xmage 1.4.25V0 (update because of Log problem)	2017-07-30 08:54:37 +02:00
LevelX2	fe2ee5dfec	Xmage 1.4.25V0	2017-07-29 20:35:16 +02:00
LevelX2	400bbba8e1	* Deactivated macro button, becuase it's not working correctly (#2147).	2017-07-29 17:39:13 +02:00
LevelX2	ea3d00a430	* Fixed that testing framework does not support snow mana payment (fixes #3751).	2017-07-28 12:47:00 +02:00
Jeff	e4c81df35e	Fixed Bug #3711	2017-07-24 11:12:20 -05:00
LevelX2	878ba90625	* Fixed a bug that prevented players from paying costs during spell resolution (e.g. Mana Leak) - (fixes #3715).	2017-07-23 19:48:04 +02:00
LevelX2	ee890418c5	* Added missing imports.	2017-07-23 16:59:20 +02:00
LevelX2	4806738cfb	* Some more use of StaticFilter objects.	2017-07-23 14:59:13 +02:00
fireshoes	382476206c	Restored inadvertently deleted line in DuelCommander.java	2017-07-19 16:33:57 -05:00
fireshoes	71f1acc90c	Updated Duel Commander banlist.	2017-07-17 16:33:51 -05:00
ingmargoudt	09f0c9ad97	huge rework on subtypes (#3668) ... * huge rework on subtypes * update for coat of arms * fix test	2017-07-16 16:57:39 -05:00
LevelX2	1fe841e6d9	Merge branch 'master' into master	2017-07-10 13:18:58 +02:00
fireshoes	48413a956a	Added MTGO 1v1 Commander and Amonkhet Block Constructed formats. Fixed a typo in the Duel Commander banlist.	2017-07-09 16:51:57 -05:00
Benjamin Maitland	8e16cf0bd6	Added the Old School 93/94 Format. Uses original rules.	2017-07-08 23:40:27 -04:00
Benjamin Maitland	1869777634	Fixed bug Historical Type 2 Issues #3417. ... Shards of Alara had an incorrect release date. Nemisis had the wrong set code in the hardcoded standards.	2017-07-08 14:54:44 -04:00
LevelX2	7d911ae803	XMage 1.4.24V0	2017-07-08 16:33:09 +02:00
Devon Richards	ba80bf9227	Merge pull request #6 from ruler501/master ... Merge Master In	2017-07-06 09:21:46 -05:00
Ben Homer	612d863883	Fixed bug where PlayerResponse toString throws an error sometimes.	2017-06-27 17:42:36 -05:00
fireshoes	1d183736c8	Added Vintage Cube June 2017. Added some HOU and XLN spoilers to mtg-cards-data.txt.	2017-06-26 20:31:02 -05:00
Devon Richards	fee630a0ac	Small cleanup	2017-06-24 11:23:58 -05:00
Devon Richards	63382aed93	Some stylistic fixes for code review	2017-06-21 23:51:59 -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
fireshoes	476fb37afb	Added Aetherworks Marvel to the Standard banned list.	2017-06-13 21:10:31 -05:00
fireshoes	5633fe9b18	Updated Adam Styborski's Pauper Cube through Amonkhet.	2017-06-12 11:20:58 -05:00
spjspj	71d06dd894	Update odd apostrophes (could have multiple Lion's Eye Diamonds in a vintage deck). Also aus highlander has the vintage banned list.	2017-05-25 11:23:35 +10:00
spjspj	5bba4dc7fb	Update Canadian 7pt Highlander rules	2017-05-25 11:13:09 +10:00
spjspj	dfbb87bd5d	Update Australian 7pt Highlander rules (to 24th April 2017) http://www.auseternal.com/7-point-highlander/	2017-05-25 08:51:02 +10:00
LevelX2	40f192eafc	* Squelch - Fixed that it was causing a ClassCastException (fixes #3396).	2017-05-20 23:22:31 +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
Derek M	6d52ec5a59	Merge pull request #3377 from spjspj/master ... Emblems refactor to show emblems in Card/Token Viewer	2017-05-14 12:00:58 -04:00
spjspj	739cbd12a3	Minor add to infinite combo	2017-05-14 21:51:29 +10:00
spjspj	f85c7e07ba	Emblems refactor to show emblems in Card/Token Viewer	2017-05-14 13:43:18 +10:00
magenoxx	53228d2389	Added game state change in the loop	2017-05-13 18:56:48 +03:00
spjspj	347d08298f	Allow sort by EDH Power level in Deck Editor	2017-05-11 17:52:43 +10:00
spjspj	5b225fa142	EDH Power level update	2017-05-11 16:25:15 +10:00
LevelX2	4d60685c05	* Fixed handling of standard set rotation(fixes #3260).	2017-04-29 23:18:36 +02:00
LevelX2	ab352a3c6b	* Fixed handling of standard set rotation(fixes #3260).	2017-04-29 23:17:52 +02:00
igoudt	2c34870bf0	remove util function on converted manacost, make getColorIdentity default interface method	2017-04-27 10:57:48 +02:00
drmDev	fae65241e2	updated banned standard list to include felidar guardian	2017-04-26 20:56:10 -04:00
drmDev	f794b54dda	updated banlist resolves #3232	2017-04-24 23:42:31 -04:00
fireshoes	399d589358	Added Sam Black's No Search Cube.	2017-04-20 09:59:51 -05:00
spjspj	8c46f23e02	Increased performance function for finding a card in DB with a specific set. Cube from deck (custom cube) now respects chosen set for a given card.	2017-04-18 20:58:03 +10:00
fireshoes	ea6e2ecbe7	Updated the Duel Commander banlist.	2017-04-17 19:10:50 -05:00
LevelX2	ef4cf90a0f	Release 1.4.23V0	2017-04-17 10:53:59 +02:00
LevelX2	ed341528d9	[AKH] Fixed that Aftermath card images were shown wrongly rotated.	2017-04-16 22:57:08 +02:00
fireshoes	20772ff370	Added Legacy Cube April 2017.[AKH] Added 4/11 spoilers to mtg-cards-data.txt.	2017-04-11 16:14:31 -05:00
Jeff	8072e79571	- Fixed #3064	2017-04-06 10:57:24 -05:00
ingmargoudt	6f8f10fcc3	move static function to CardImpl, and other api fixes	2017-03-30 20:09:47 +02:00
fireshoes	55b433ae36	[AKH] Added 3/27 spoilers to mtg-cards-data.txt. Implemented several of the new cards.	2017-03-28 22:25:29 -05:00
vraskulin	d3214c65e4	Merge remote-tracking branch 'fork/master'	2017-03-22 14:51:31 +03:00
vraskulin	d93061c0bc	Equals should be compared with == but not equals()	2017-03-22 14:50:50 +03:00
vraskulin	c783614cba	NotifyAll	2017-03-20 15:17:30 +03:00
LevelX2	9d8a8a33f1	Xmage 1.4.22V0	2017-03-11 13:38:55 +01:00
spjspj	17aa9e3f6c	Merge pull request #2954 from spjspj/master ... Slight fix for modern cube	2017-03-09 23:14:51 +11:00
spjspj	1646fb491f	Slight fix for modern cube	2017-03-09 23:13:56 +11:00
Nathaniel Brandes	2ecb415b4d	Removed potential integer overflow. ... If the number passed into max is Integer.MAX_VALUE, like it is with ChoiceOfDamnation, the random number will overflow. So let's not do that.	2017-03-08 21:43:37 -08:00