poixen a5242ff087 resolved conflicts		2015-11-21 12:02:55 +01:00
..
abilities	resolved conflicts	2015-11-21 12:02:55 +01:00
actions	* Fixed some problems with undo/cancel action (fixes #1267).	2015-10-02 01:04:40 +02:00
cards	Updated mtg-cards-data.txt. Added a land deck for Mormir Basic format.	2015-11-15 10:25:02 +01:00
choices
constants	Pulled from trunk.	2015-11-01 16:42:44 -05:00
counters	Implement cards: Apes of Rath, Endless Scream, Fool's Tome, and Fylamarid	2015-11-04 09:29:08 +02:00
filter	[C15] Oreskos Explorer, Bastion Protector and Dawnbreak Reclaimer.	2015-11-15 18:54:26 +01:00
game	Update Swiss tournament pairing - For the last round, for each unpaired player pair against the highest ranked player they haven't played against	2015-11-20 02:54:50 +03:00
players	[C15] Added Deadly Tempest and Dread Summons.	2015-11-18 20:04:00 +01:00
target	Pulled from trunk.	2015-11-01 16:42:44 -05:00
util	Changed ability handling of modal spells to be able to select the same mode multiple times with different targets.	2015-11-14 01:56:56 +01:00
watchers	Pulled from trunk.	2015-11-01 16:42:44 -05:00
ConditionalMana.java
MageException.java
MageInt.java
MageItem.java
MageObject.java
MageObjectImpl.java	Please test! Some changes to the display of user choices, showing also a longer text in tooltip window.	2015-06-28 21:55:48 +02:00
MageObjectReference.java	Fixed some possible exceptions.	2015-09-13 09:48:35 +02:00
Mana.java	resolved conflicts	2015-11-21 12:02:55 +01:00
ManaSymbol.java
ObjectColor.java	* Fixed a bug of check if two objects sharing a colors were also to colorless objects did return a positive result (e.g. caused Dream Halls to cast Artifacts by discarding lands).	2015-07-01 13:37:32 +02:00