Oleg Agafonov
8563c6d865
Merge pull request #4682 from delftswa2018/hotfix/resolving-unaccepted-changes
...
Hotfix - resolving unaccepted changes
2018-03-29 17:25:04 +04:00
Oleg Agafonov
d7237c4afa
Merge pull request #4681 from delftswa2018/feature/ClickableMsgOfTheDay
...
Clickable message of the day
2018-03-29 17:24:50 +04:00
Oleg Agafonov
0939aefe51
Merge pull request #4680 from delftswa2018/feature/loadingtime
...
Improved XMage startup time
2018-03-29 17:23:38 +04:00
Marc Zwart
a7ffaafcb0
made close call safe
2018-03-29 13:53:59 +02:00
Danny Plenge
aa96caa554
Removed useless else case
2018-03-29 12:54:43 +02:00
spjspj
938ac35981
Have a faded life total over the avatar which glows then fades again reddish for damage and bluish for life gain.
2018-03-29 00:28:56 +11:00
Danny Plenge
98c2b171de
Added the URLHandler which makes the URL's in the message of the day clickable.
...
At the moment when there are 2 URL's in 1 message, it only makes the last one clickable.
2018-03-28 13:49:04 +02:00
Christiaan
f956075341
Merge remote-tracking branch 'origin/master' into feature/loadingtime
2018-03-27 17:28:58 +02:00
Christiaan
e69423af27
performance improvements for startup
...
added option to skip generating small icons that already exist, load symbol images multithreaded
2018-03-27 17:26:19 +02:00
spjspj
08ffbecdb4
Have a faded life total over the avatar which glows then fades again reddish for damage and bluish for life gain.
2018-03-28 02:22:28 +11:00
spjspj
1340f75c1e
Merge pull request #4658 from spjspj/master
...
Karn, Scion of Urza (DOM)
2018-03-25 09:04:49 +11:00
spjspj
4527f791aa
Karn, Scion of Urza (DOM)
2018-03-25 01:44:23 +11:00
igoudt
00f91391e9
Homarid Drake, reprints, and rewriting his or her to their
2018-03-22 16:52:26 +01:00
ArcadeMode
5ac975c52e
Blocker and Critical level bugfixes throughout the project ( #4648 )
...
* fixed https://sonarcloud.io/project/issues?id=org.xmage%3Amage-root&issues=AWIlv32RgrzAwlaaQ7rP&open=AWIlv32RgrzAwlaaQ7rP
* ensure closing of scanner if it was opened
* Refactored method in EmpyrialArchAngel to not always return same value.
* Refactored method in FalkenrathAristocrat to not always return same value.
* Refactored method in GilderBairn to not always return the same value.
* fixed left open resources, ensured quiet closing of the streams
* Refactored method in IceCave to not always return same value.
* Refactored method in KjeldoranRoyalGuard to not always return same value.
* Refactored method in LegionsInitiative to not always return same value.
* Refactored method in NaturesWill to not always return same value.
* added quiet closing method in new streamutils class, used to clean up the connectdialog
* Fix small typo
* added quiet closing to saveobjectutil
* closed resources in savegame method of gamecontroller
* properly close resources in loadGame method of GameReplay class
* further proper resource closing in ServerMessagesUtil
* fixed unclosed resources in copy method in mage framework Copier
* closed unclosed resources in copyCompressed method in Copier
* ensure closing of filewriter in manasymbols
* ensure proper closing of Stream in arcane UI
* ensure closing of datagram socket in arcane Util
* ensure resource closing in deckimport from clipboard
* ensure closing of plugin classloader
* ensured closing of zipinputstream resource
* ensure closing of fileoutputstream in ScryfallSymbolsSource
* ensure closing resources after finishing/canceling download of pictures
* remove commented code
* move locks to try block to ensure unlocking along all execution paths
* remove dangerous instance of double-checked locking
* removed dangerous instance of double checked locking in settingsmanager
* Removed dangerous instance of double-checked locking in ThemePluginImpl
* close resource which did not happen certainly
* close another stream
* ensure closing of inputstream
2018-03-22 08:13:13 -05:00
Marc Zwart
c2c395420e
close resource which did not happen certainly
2018-03-22 10:30:10 +01:00
Danny Plenge
90631eff60
Removed dangerous instance of double-checked locking in ThemePluginImpl
2018-03-20 16:10:09 +01:00
Marc Zwart
3e1312064f
removed dangerous instance of double checked locking in settingsmanager
2018-03-20 16:04:10 +01:00
Marc Zwart
6debe066f1
remove dangerous instance of double-checked locking
2018-03-20 16:01:48 +01:00
Marc Zwart
d299ee0882
remove commented code
2018-03-20 15:37:46 +01:00
Marc Zwart
f883d6b0a8
ensure closing resources after finishing/canceling download of pictures
2018-03-20 15:37:25 +01:00
Marc Zwart
1e18875725
ensure closing of fileoutputstream in ScryfallSymbolsSource
2018-03-20 15:27:14 +01:00
Marc Zwart
1ec5a3fb4d
ensure resource closing in deckimport from clipboard
2018-03-20 15:00:08 +01:00
Marc Zwart
338e9833cc
ensure closing of datagram socket in arcane Util
2018-03-20 14:59:41 +01:00
Marc Zwart
63dbfb8a9b
ensure proper closing of Stream in arcane UI
2018-03-20 14:48:22 +01:00
Marc Zwart
a0a2ac1b5a
ensure closing of filewriter in manasymbols
2018-03-20 14:40:58 +01:00
Marc Zwart
4bc5a9bd61
Merge branches 'hotfix/close-unclosed-resources-mage-client', 'hotfix/close-streams-in-updater', 'hotfix/fix-non-closed-scanner' and 'hotfix/manapiechart-potential-zero-division' into feature/SonarqubeFixes
2018-03-20 13:03:28 +01:00
Marc Zwart
7233f5d86f
added quiet closing to saveobjectutil
2018-03-20 12:55:37 +01:00
Marc Zwart
9912a23007
added quiet closing method in new streamutils class, used to clean up the connectdialog
2018-03-20 12:46:53 +01:00
spjspj
8ff4f81cea
Merge pull request #4640 from spjspj/master
...
New M15 Rendering for Unstable lands
2018-03-20 16:49:00 +11:00
spjspj
a368c93845
New M15 Rendering for Unstable lands
2018-03-20 16:12:43 +11:00
Oleg Agafonov
1635766262
* Added localized card images download for Russian, Korean and Portuguese from wizards.com;
2018-03-19 22:01:54 +04:00
Oleg Agafonov
4774c0290e
* Deck editor: unique filter disabled by default now ( #4612 );
2018-03-19 18:06:11 +04:00
spjspj
da7bca48df
Merge pull request #4638 from spjspj/master
...
Fix for mana symbols indexoutofbounds exception
2018-03-19 21:18:20 +11:00
spjspj
de6eb6ece1
Fix for mana symbols indexoutofbounds exception
2018-03-19 21:16:32 +11:00
LevelX2
b073ce1c42
* Added to all toUpperCase/toLowerCase calls the Locale.ENGLISH to prevent problems with some languages (e.g. Turkish). Removed some unused import statements. ( #4634 ).
2018-03-18 18:18:54 +01:00
LevelX2
af296cbe79
* Added display of live on player avatar image,
2018-03-17 00:47:09 +01:00
LevelX2
9c0d0a0153
* Saved table spectator setting to preferences.
2018-03-17 00:46:12 +01:00
spjspj
cd21387659
Merge pull request #4624 from spjspj/master
...
Add rendering for Expeditions
2018-03-16 22:57:37 +11:00
spjspj
89d58bef5b
Add rendering for Expeditions
...
(With non-copyright background image)
2018-03-16 22:49:21 +11:00
LevelX2
753e039d02
* Fixed a problem that a tooltip window was shown of cards from panels in the back.
2018-03-16 00:28:12 +01:00
LevelX2
64f9dc6e60
* Add Land Dialog - Added deck size value and images of mana symbols.
2018-03-15 23:37:05 +01:00
Marc Zwart
51b266a2de
fixed https://sonarcloud.io/project/issues?id=org.xmage%3Amage-root&issues=AWIlv32RgrzAwlaaQ7rP&open=AWIlv32RgrzAwlaaQ7rP
2018-03-15 10:47:31 +01:00
Oleg Agafonov
1b8049780b
clean
2018-03-15 00:27:09 +04:00
Oleg Agafonov
83a3de9a93
* UI: improved choose number dialog (fixed enter key, added more info colorized info for mana distribute dialog);
2018-03-15 00:14:04 +04:00
Oleg Agafonov
4a77ab1714
* UI: added hotkeys to pick number dialog (choose value by <ENTER> key);
2018-03-14 18:46:28 +04:00
LevelX2
25f5be3aba
* Fixed a problem with download of Unhinged card images with a card name.
2018-03-13 22:56:39 +01:00
LevelX2
bd56b074a0
* Some minor changes to game end window.
2018-03-13 18:01:26 +01:00
spjspj
a4485e92eb
Merge pull request #4611 from spjspj/master
...
Add an 'add only full art land' option to the add land dialog.
2018-03-13 01:04:16 +10:00
spjspj
7e919b9f39
Add an 'add only full art land' option to the add land dialog.
...
Should give an error message when someone says only full art lands, but then chooses a set that has no full art lands.
2018-03-13 00:38:43 +11:00
LevelX2
fe5743b29e
Fixed a bug that the mana symbols for monocolored hybrid mana were not shown.
2018-03-11 13:03:58 +01:00
