Commit graph

15136 commits

Author SHA1 Message Date
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
shootbot
94f63acf0a Merge remote-tracking branch 'refs/remotes/magefree/master' 2016-06-30 19:01:13 +06: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
spjspj
784447dad4 Merge pull request #2034 from spjspj/master
spjspj - Add Rich man cube draft
2016-06-26 13:04:32 +10:00
spjspj
b73d68437e spjspj - Add Rich Man Cube draft. This is a variation on the Rich Man set draft. It still (like cube) shouldn't let there be more than one copy of a card in the draft but will give each player a new pack from the cards that haven't been picked already each time. Allows 2 player cube drafts to be playable. 2016-06-26 12:57:52 +10:00
spjspj
2eb68403cf spjspj - Add Rich Man Cube draft. This is a variation on the Rich Man set draft. It still (like cube) shouldn't let there be more than one copy of a card in the draft but will give each player a new pack from the cards that haven't been picked already each time. Allows 2 player cube drafts to be playable. 2016-06-26 12:54:59 +10:00
drmDev
c1c63c7c91 Thopter Squadron 2nd ability fix 2016-06-25 10:58:21 -04:00
draxdyn
62d5d45a45 Add support for F6
Skips everything until next turn, except for declare attackers and blockers.

F11 and F9 are a better design, but F6 is provided for compatibility with
established conventions.

There is currently no GUI button for it.
2016-06-24 21:34:30 +02:00
spjspj
b7a05a6e5b Merge pull request #2031 from spjspj/master
spjspj - Modifications to shrink size of players who have left.
2016-06-24 20:13:57 +10:00
spjspj
157d94360c spjspj - Modifications to shrink size of players who have left. 2016-06-24 19:20:46 +10:00
fireshoes
48ae863459 [EMN] Implemented Thalia, Heretical Cathar 2016-06-23 15:56:13 -05:00
emerald000
32f6ed94af Minor rule text fix. 2016-06-23 13:26:48 -04:00
fireshoes
95a1146947 Added Vintage Cube June 2016. [EMN] Added Thalia, ~Identity Impersonator, and Hanweir, the Writhing Township to mtg-cards-data.txt. 2016-06-23 11:37:23 -05:00
draxdyn
053580c412 Add support for disabling animations 2016-06-23 16:21:34 +02:00
draxdyn
b8e5f5f942 Draw CardPanel to a buffered image and cache it across instances
Speeds up GUI performance.
2016-06-23 16:21:34 +02:00
draxdyn
892cfdce45 Draw MageRoundPane and its shadow to a buffered image and cache it across instances
Speeds up GUI performance.
2016-06-23 16:21:34 +02:00
draxdyn
ffb65d48fe Draw GlowText to a buffered image and cache it across instances
Speeds up GUI performance.
2016-06-23 16:21:34 +02:00
draxdyn
4b190eeaf4 Drastically simplify ScaledImagePanel by having it just use the resized image cache
All the current behavior of ScaledImagePanel seems to be useless, since the source
images are static, so we can just use the highest quality scaling possible and
cache the result using TransformedImageCache.
2016-06-23 16:21:34 +02:00
draxdyn
e3d84ca212 Cache resized and rotated images
RotatedResizedImageCache and MultiRotatedResizedImageCache contain the caching
machinery.

A cache of rotated and resized images is added to ImageCache, and is used by
the resizing functions there.

All the resizing and rotation functions in ImageHelper are redirected to the
ones in ImageCache.

This is slightly inefficient because it will cache some calls that are never
repeated, but it prevents developers from mistakenly using uncached functions
when calls are repeated, seriously impacting performance.

Also resizing functions that only take a width or an height have been removed,
and their calls fixed to provide the other dimension. It's still possible to
specify -1 as width or height to ignore constraints in that dimension, though.

Greatly speeds up UI performance.
2016-06-23 16:21:34 +02:00
draxdyn
1999dfe5c0 Add mechanism to register image caches and flush them all on GUI size change
This should avoid the issue of having lots of unused entries in caches if the
GUI size is changed multiple times.
2016-06-23 16:21:34 +02:00
draxdyn
415c8cce7e Don't call setText() on the popup text component until it is shown
Performance improvement, impacts profiles.
2016-06-23 16:21:34 +02:00