Commit graph

15104 commits

Author SHA1 Message Date
drmDev
eb8519cd78 Merge remote-tracking branch 'upstream/master' 2016-07-04 04:16:33 -04:00
drmDev
a4dc6a12b8 Soul Separator (EMN) 2016-07-03 21:27:33 -04:00
LevelX2
7f4fc245cd * Fixed some cards that choose a subtype as entering the battlefield that did not work for copied permanents (e.g. Brass Herald for Mormir format). 2016-07-03 21:43:12 +02:00
drmDev
3d00bd33d5 Lamplighter of Selhoff bug fix 2016-07-03 13:45:08 -04:00
LevelX2
fd60e43a03 * Fixed a problem with UNDO/rollback setting the wrong active player (fixes #2046). 2016-07-03 18:14:18 +02:00
fireshoes
1c0a4a7532 [EMN] Added Collective Brutality, Borrowed Malevolence, and Turn Aside. 2016-07-03 10:19:40 -05:00
spjspj
6b870f2f6b Merge pull request #2047 from spjspj/master
spjspj - Add the option of having a .dck file as a cube
2016-07-04 00:24:17 +10:00
spjspj
26d38f0773 spjspj - Add the option of having a .dck file as a cube 2016-07-04 00:20:31 +10:00
drmDev
548b05ba74 Whoops... removing unnecessary line 2016-07-03 06:23:50 -04:00
drmDev
e1bd9a5331 EmrakulsEvangel fix 2016-07-03 06:22:32 -04:00
LevelX2
b85af92942 * Fixed bug concerning Escalate's mana cost. 2016-07-03 10:30:18 +02:00
drmDev
41326affb5 Emrakuls Evangel (EMN) 2016-07-03 04:09:46 -04:00
LevelX2
ce91f6aae7 Fixed a problem with transformed image cache. 2016-07-02 19:07:26 +02:00
LevelX2
1c2aa4c10a Fixed cleint exception problem with transformable cards. 2016-07-02 18:38:29 +02:00
LevelX2
7cfdd80c57 Chnaged permanent row handling so creatures are always shown towards the opponent side. 2016-07-02 13:45:34 +02:00
LevelX2
e9993f980a Added workaround to deck generator to handle missing basic lands. 2016-07-02 13:44:36 +02:00
emerald000
2e3f963363 [EMN] Implemented Escalate. Added Blessed Alliance. 2016-07-02 03:08:39 -04:00
emerald000
c8790f34ad [EMN] Fixed Emerge not caring about timing restrictions. 2016-07-02 02:12:39 -04:00
fireshoes
9c0e73dfdb Fixed Warriors' Lesson to only trigger on combat damage instead of all damage.[EMN] Added a few more cards. 2016-07-01 15:00:18 -05:00
fireshoes
1670ad712f Merge origin/master 2016-07-01 11:35:45 -05:00
fireshoes
5ca4de6f78 [EMN] Added 7/1 spoilers to mtg-cards-data.txt. 2016-07-01 11:34:39 -05:00
LevelX2
a6094afa40 * Worldheart Phoenix - Fixed that if cast from graveyard the counters were not added. 2016-07-01 17:04:42 +02:00
spjspj
9a1c67a9a4 Merge pull request #2040 from spjspj/master
spjspj - Implement Stitcher's Graft [EMN]
2016-07-02 00:06:50 +10:00
spjspj
dad0b3809f spjspj - Implement Stitcher's Graft [EMN] 2016-07-02 00:03:50 +10:00
LevelX2
2874996994 Merge pull request #2032 from draxdyn/hold_priority
Hold priority on Ctrl+click
2016-07-01 16:00:20 +02:00
spjspj
b91b6402dc spjspj - Implement Stitcher's Graft [EMN] and slight change to mtg-cards-data.txt 2016-07-01 23:59:47 +10:00
LevelX2
3b0f7b074f * Some changes to distance calculation of enchantments on the battlefield. Added minimal permanet size preference setting (not working correctly yet). 2016-07-01 15:08:40 +02:00
Styxo
541e6a7f9b Added Earth Surge 2016-07-01 14:50:18 +02:00
emerald000
3ca28d2eb6 [EMN] Implemented Emerge. Added Elder Deep-Fiend. 2016-07-01 01:15:56 -04:00
fireshoes
8d7ebdc088 [EMN] Added even more 6/30 spoilers to mtg-cards-data.txt. Added a couple of those cards. 2016-07-01 00:06:48 -05:00
fireshoes
33ac32f5c4 [EMN] Added additional 6/30 spoilers to mtg-cards-data.txt. Added some more cards. 2016-06-30 14:47:59 -05:00
fireshoes
e86946b23e [EMN] Added 6/30 spoilers to mtg-cards-data.txt. Fixed bugs with Lone Rider and Docent of Perfection. Added several cards. 2016-06-30 10:26:42 -05:00
fireshoes
9b91dcc8e8 [EMN] Added even more 6/29 spoilers to mtg-cards-data.txt. 2016-06-29 22:54:21 -05:00
draxdyn
a7409f3d08 Hold priority on Ctrl+click
In most cases, it is not useful to hold priority after doing something,
since the spell or ability added to the stack can just be performed
beforehand.

Hence, automatically passing priority is the only comfortable setting.

However, in some cases it is useful (chiefly for Infernal Tutor +
Lion's Eye Diamond and similar interaction), and currently players
have to open Preferences, change the option and then change it back
whenever they need to hold priority, which is very annoying.

This change allows to temporarily hold priority by simply holding
Control while performing an action, which solves the issue in a
manner similar to other clients.

A "Hold" indicator next to the spells cast indicator is displayed so
that the user knows his Control key holding was registered.

The code works by adding a new HOLD_PRIORITY player action that causes
the automatic priority pass options to be ignored until the player is
given priority again.

The client sends the message whenever it's not already holding priority
and Ctrl+click/space/enter happens anywhere.

This is somewhat "loose" as it means that Ctrl+click on the background
also holds priority, but this might actually be desirable and it greatly
simplifies the code, since only a global AWT event listener is required,
and there is no need to change every place in the code that could add
something to the stack.

It is also possible to hold priority and stop holding priority using
the context menu.
2016-06-29 19:57:45 +02:00
fireshoes
4ed2e40841 [EMN] Added more 6/29 spoilers to mtg-cards-data.txt. 2016-06-29 11:59:05 -05:00
fireshoes
d844c6056a [EMN] Added 6/29 spoilers to mtg-cards-data.txt. Implemented several cards (will be testing with the clearImage fix in). 2016-06-29 10:01:00 -05:00
drmDev
9deb1bd0da Ignition Team implementation (requested card) 2016-06-29 03:21:40 -04:00
LevelX2
60b74289c9 * Fixed some tooltip texts caused by Oracle update #2039. 2016-06-28 23:33:34 +02:00
fireshoes
7cb6ae826d [EMN] Added 6/28 spoilers to mtg-cards-data.txt. Fixed Thalia's Lancers collector number. 2016-06-28 11:21:16 -05:00
LevelX2
facd5ffa2c Merge pull request #2028 from draxdyn/cardpanel_threading
Fix broken threading in CardPanel
2016-06-28 13:28:37 +02:00
LevelX2
0733729382 Merge pull request #2029 from draxdyn/audio_threadpool
Use a dedicated thread pool for audio
2016-06-28 13:27:18 +02:00
LevelX2
d220c739a8 Merge pull request #2030 from draxdyn/performance
Improve GUI performance
2016-06-28 13:26:44 +02:00
LevelX2
f7cecdf050 Merge pull request #2033 from draxdyn/f6
Add support for F6
2016-06-28 09:16:09 +02:00
LevelX2
c505c2f44f Merge pull request #2027 from draxdyn/resize_editor
Update image when cards in editor are resized
2016-06-28 09:08:37 +02:00
fireshoes
fd29307ad4 [EMN] Added additional 6/27 spoilers to mtg-cards-data.txt Fixed Identity Thief's translated name. Implemented several new EMN cards. Fixed rules text on several tap and don't untap cards. 2016-06-27 19:33:05 -05:00
fireshoes
744e303265 [EMN] Added 6/27 spoilers to mtg-cards-data.txt Fixed Thalia's translated name. 2016-06-27 11:40:00 -05:00
spjspj
05ff3d18bf Merge pull request #2036 from spjspj/master
Slight fix for Molten Sentry (RAV)
2016-06-26 22:56:11 +10:00
spjspj
a3dc06c51f Slight fix for Molten Sentry (RAV) 2016-06-26 22:52:48 +10:00
spjspj
8eb74565b1 Merge pull request #2035 from spjspj/master
spjspj - Add Insidious Dreams (TOR)
2016-06-26 22:38:44 +10:00
spjspj
efa8bade8f spjspj - Add Insidious Dreams (TOR) 2016-06-26 22:30:57 +10:00