LevelX2
|
58bbe60c72
|
Merge origin/master
|
2014-10-18 23:04:15 +02:00 |
|
LevelX2
|
b9285c0118
|
* Fixed wrong imports.
|
2014-10-18 23:03:36 +02:00 |
|
betasteward
|
55d2233f2e
|
Merge branch 'master' of https://github.com/magefree/mage
|
2014-10-18 14:11:13 -04:00 |
|
LevelX2
|
0ecb04d8d2
|
* Minor change to user info.
|
2014-10-18 18:23:05 +02:00 |
|
LevelX2
|
2bd14269d6
|
* Finished button handling above stack.
|
2014-10-18 12:15:40 +02:00 |
|
LevelX2
|
26e1e5daa5
|
Moved button panel from third split panel above stack area (functional but not finished yet).
|
2014-10-17 17:23:43 +02:00 |
|
betasteward
|
9e28fa9b0c
|
fix to allow Launcher to start client - also slightly improves performance
|
2014-10-14 13:58:52 -04:00 |
|
LevelX2
|
fd3b8f4c29
|
* F4/F5/F7 can also be used now without having priority.
|
2014-10-14 15:29:21 +02:00 |
|
LevelX2
|
bdd163080d
|
* Draft - Show draft time and draft progress. Show game threads and ma games. Fixed a problem with AI player and password.
|
2014-10-12 22:37:39 +02:00 |
|
LevelX2
|
499b548a14
|
* Some changes to chat handling to fix unintended empty line.
|
2014-10-12 18:56:37 +02:00 |
|
LevelX2
|
b206983e75
|
* Fixed that deck elements visible state of JoinTablePanel was set wrongly.
|
2014-10-12 12:34:29 +02:00 |
|
LevelX2
|
5ccc1c91ae
|
* Tournaments - Added handling for constructed formats and password protection.
|
2014-10-12 04:19:28 +02:00 |
|
LevelX2
|
8f690f7e02
|
* Added option to start matches with password protection.
|
2014-10-11 16:29:37 +02:00 |
|
LevelX2
|
e424635d20
|
* Fixed typo in info message.
|
2014-10-11 10:19:26 +02:00 |
|
LevelX2
|
05ba67a9c9
|
Added player life to tooltip of small player name label (if no avatar images is shown). So life can be shown (at least with tooltip) if the top card of library is turned face up.
|
2014-10-06 14:34:26 +02:00 |
|
LevelX2
|
7f46323f67
|
* Added F7 to skip until next main phase. Added some preference options to skip handling. Clicking on phase bar opens now phase bar preferences.
|
2014-10-05 14:33:47 +02:00 |
|
LevelX2
|
af4fa9d542
|
* Fixed that watching tournament could not be started.
|
2014-10-05 00:39:52 +02:00 |
|
LevelX2
|
140ffb256a
|
* Fixed Standard Format selection. Client used fixed date. Check on deck validator used wrong month (1.11 insted of 1.10).
|
2014-10-02 16:59:25 +02:00 |
|
magenoxx
|
922e35ff1c
|
Fixed NPE in tooltips for Emblem choose-trigger
|
2014-10-02 12:17:25 +04:00 |
|
LevelX2
|
8ac8d36c03
|
* Some connection handling changes.
|
2014-10-02 01:14:32 +02:00 |
|
LevelX2
|
e0ffef40cc
|
Added possibility to set some more JBoss Remoting parameters with config.xml on server start.
|
2014-10-01 16:04:26 +02:00 |
|
LevelX2
|
e765e3a0b9
|
* Fixed show card name preferences handling that prevented to switch off card names.
|
2014-09-29 20:00:40 +02:00 |
|
LevelX2
|
2835a4e152
|
Some fixes to reconnect handling.
|
2014-09-28 15:45:15 +02:00 |
|
LevelX2
|
d2f7063e25
|
Fixed that tooltip popup window was not shown if additional card name was deactivated.
|
2014-09-27 19:59:16 +02:00 |
|
LevelX2
|
4f5c8fc45d
|
Removed some debug messages.
|
2014-09-27 19:58:22 +02:00 |
|
LevelX2
|
0a068e2258
|
* Fixed chat command handling (\list), the user chat input is now escaped to prevent using html tags.
|
2014-09-26 19:42:58 +02:00 |
|
LevelX2
|
54ec3b658e
|
* Added preferences setting to switch on/off to write card names in bigger font on card panels.
|
2014-09-26 19:40:57 +02:00 |
|
LevelX2
|
02ca83324c
|
* Client - Don't load games again if not neccessary if "Games" menu item is clicked.
|
2014-09-26 13:44:57 +02:00 |
|
LevelX2
|
2c63d3bff8
|
* Client connect - Fixed that reconnect request was also shown if no successful connection was set up before.
|
2014-09-25 23:13:05 +02:00 |
|
LevelX2
|
341db7b01f
|
* Morph Ability - Some fixes for displaying / handling morph cards/permanents.
|
2014-09-25 16:51:41 +02:00 |
|
LevelX2
|
f3ea64e27c
|
* Changed handling of phases to stop to server based handling.
|
2014-09-25 00:33:58 +02:00 |
|
LevelX2
|
aa842efacc
|
Added F5 button to skip priority until end step of opponent. Added PlayerAction handling.
|
2014-09-24 16:55:51 +02:00 |
|
LevelX2
|
ebd21eab1d
|
Fixed a problem that manual mana payment was sometimes hard because the mana labels covered the mana buttons.
|
2014-09-24 16:54:33 +02:00 |
|
LevelX2
|
cc713808cf
|
* Download definition for M15 + CNS token and emblem images.
|
2014-09-22 23:31:26 +02:00 |
|
LevelX2
|
da0100d3fd
|
Increased window size of pick choice dialog.
|
2014-09-20 17:45:23 +02:00 |
|
LevelX2
|
a57ebc5314
|
* Table handling - Fixed a bug that if table owner tried to create a table with invalid deck, the table was added to the finished tables with no players.
|
2014-09-19 13:37:59 +02:00 |
|
LevelX2
|
ffa959d536
|
Removed KTK image download stop.
|
2014-09-18 23:39:48 +02:00 |
|
LevelX2
|
c3fba626a2
|
Some changes to Morph card image display.
|
2014-09-16 07:53:00 +02:00 |
|
LevelX2
|
bc5dc80f95
|
* Chat panel - Fixed that the text of the chat panel was changable by the user.
|
2014-09-13 21:06:28 +02:00 |
|
LevelX2
|
5578e4c158
|
Added names to AboutDialog.
|
2014-09-13 11:21:54 +02:00 |
|
LevelX2
|
b2fc6923b9
|
Some changes to format of messages.
|
2014-09-10 22:37:35 +02:00 |
|
LevelX2
|
19124de0bd
|
Some changes to format of messages.
|
2014-09-10 22:37:13 +02:00 |
|
LevelX2
|
27f658f250
|
Changed format of some messages to html.
|
2014-09-10 17:51:46 +02:00 |
|
LevelX2
|
e8f9c0822f
|
* Chat / game log - Switched to html output. So mana symbols and html tags are correctly shown. Colors have to be adjusted still a bit.
|
2014-09-10 17:13:26 +02:00 |
|
LevelX2
|
382223bb90
|
* Deck Editor - Show images for amna symbols.
|
2014-09-10 17:11:06 +02:00 |
|
LevelX2
|
9c1f69983b
|
Fixed a problem with NPE and match start. Chanes to handling of logging.
|
2014-09-09 07:45:53 +02:00 |
|
LevelX2
|
da44199b3d
|
Fixed possible npe in debug info generation.
|
2014-09-07 15:44:21 +02:00 |
|
LevelX2
|
c3c77e3974
|
* Server - Some changes to user / match / table handling.
|
2014-09-07 02:28:47 +02:00 |
|
LevelX2
|
d051aef63f
|
Fixed a bug of handling of tournament sub tables if a user left. Some changes to match view.
|
2014-09-04 19:03:48 +02:00 |
|
LevelX2
|
8b331eefce
|
* Fixed a bug in table expired check. Changed expired check. Some fixed for table / tournament state handling.
|
2014-09-03 15:38:45 +02:00 |
|
LevelX2
|
fec0744315
|
Fixed a bug that while a match or tournament was just starting a player could still leave the table, setting the table / tournament / match to an undefined state. Now the player can only leave the Match / Tournament if it has started properly.
|
2014-09-03 01:02:10 +02:00 |
|
LevelX2
|
cb835f4f9b
|
[KTK] Added Kahns of Tarkir set.
|
2014-09-01 19:25:32 +02:00 |
|
LevelX2
|
b98c16f061
|
Added connection speed information per user (milliseconds the ping needs). Some minor changes to server console.
|
2014-08-31 17:46:14 +02:00 |
|
LevelX2
|
1285df5da3
|
Added some modern sample decks.
|
2014-08-31 17:27:43 +02:00 |
|
magenoxx
|
92479c0ba0
|
[UI] sorting layout if counters on a permanent were changed
|
2014-08-29 13:33:23 +04:00 |
|
LevelX2
|
ee5831bdc9
|
* Moved workaround for #451 to first possible position main of client.
|
2014-08-28 01:30:04 +02:00 |
|
magenoxx
|
d516137a5b
|
[UI] Putting lands with counters separately (without using land stack)
|
2014-08-27 13:49:10 +04:00 |
|
LevelX2
|
a2fe968582
|
Adjusting font position and size of counter amount.
|
2014-08-27 08:45:03 +02:00 |
|
LevelX2
|
dce2b027ee
|
Updated HelperPanel button handling, try to fix #451.
|
2014-08-24 18:43:43 +02:00 |
|
LevelX2
|
aad1a2da89
|
* Client - Added number of active games to the header of the games column of the user list.
|
2014-08-24 07:03:01 +02:00 |
|
LevelX2
|
19de064710
|
Merge truevfs branch
Conflicts:
Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
|
2014-08-22 12:23:43 +02:00 |
|
LevelX2
|
3757a4a6c9
|
Merge truevfs branch
Conflicts:
Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
|
2014-08-22 12:23:24 +02:00 |
|
LevelX2
|
4990bdc9c9
|
Counter display - don't display counters if 0 amount.
|
2014-08-22 08:22:52 +02:00 |
|
LevelX2
|
d9a1cc1334
|
Added display of counters on card panel (needs probably some more fine adjusting and testing).
|
2014-08-22 02:38:10 +02:00 |
|
LevelX2
|
05f1a88157
|
Added image for displaying counter.
|
2014-08-21 17:06:38 +02:00 |
|
North
|
15d10f5797
|
upgraded truezip to truevfs
|
2014-08-21 16:05:55 +03:00 |
|
magenoxx
|
3454b2db8a
|
For Issue#524: added connect task timeout, reduced number of auto connection retries to one
|
2014-08-20 08:25:30 +04:00 |
|
LevelX2
|
175280b381
|
Setting java.util.Arrays.useLegacyMergeSort=true in client main to avoid Comparison method violates its general contract of swing class. (Fixes #451).
|
2014-08-14 11:49:46 +02:00 |
|
LevelX2
|
357e80c7c2
|
Prevent NPE after disconnect for open tournament panel.
|
2014-08-13 22:01:06 +02:00 |
|
LevelX2
|
9020a287d6
|
Some NPE fixing for server and client.
|
2014-08-12 08:51:06 +02:00 |
|
magenoxx
|
97ca70318b
|
minor change
|
2014-08-11 15:29:04 +04:00 |
|
magenoxx
|
26d763611a
|
[UI] Fixes #481 : removed gap and moved cards up so scrollbar doesn't hide part of the hand cards
|
2014-08-11 15:24:03 +04:00 |
|
magenoxx
|
5f040b218a
|
Fixed #467 : changing attacker color to red
|
2014-08-11 14:55:32 +04:00 |
|
magenoxx
|
eb6dc10faa
|
[UI] Param for starting in fullscreen mode (osx only)
|
2014-08-11 14:39:58 +04:00 |
|
magenoxx
|
0e2255f71f
|
Fixes Issue#467 : marking possible attackers with blue instead of yellow
|
2014-08-11 14:18:32 +04:00 |
|
magenoxx
|
13d80e72f1
|
Fixes #492 : Tarmogoyf p/t stats now also displayed in grave&exile zones
|
2014-08-11 13:55:07 +04:00 |
|
magenoxx
|
58e4c66af6
|
Fixes #492 : Tarmogoyf p/t stats are not displayed in hand
|
2014-08-11 11:10:27 +04:00 |
|
Dustin Conrad
|
809d61d5ea
|
Use dependency management to use common versions of log4j and junit in all the projects.
|
2014-08-09 19:38:34 -04:00 |
|
magenoxx
|
d1a8678086
|
[UI] Capitalize first leffer of abilities in ability (mode) picker
|
2014-08-09 10:41:17 +04:00 |
|
magenoxx
|
7adf282ff5
|
[UI] Fixed question dialogs always appearing on root virtual table instead of current one (linux&macos)
|
2014-08-07 15:38:05 +04:00 |
|
magenoxx
|
53453243dc
|
[UI] Exile dialog
|
2014-08-07 15:30:44 +04:00 |
|
magenoxx
|
14d899ea79
|
[UI] Fixed only lands with two enchant lands were put aside
|
2014-08-07 09:07:08 +04:00 |
|
magenoxx
|
15dc313ffb
|
[UI] Made land cards in stack close to each other
|
2014-08-07 08:46:07 +04:00 |
|
magenoxx
|
fbf3554051
|
[UI] Removing black borders for cards with images as it gives more space
|
2014-08-06 10:27:36 +04:00 |
|
magenoxx
|
9f76582bff
|
Issue#479: increased attachments offset
|
2014-08-06 10:26:59 +04:00 |
|
LevelX2
|
3aab091492
|
Some changes to client and server logging messages.
|
2014-08-04 17:21:14 +02:00 |
|
LevelX2
|
9f6555240a
|
* Changes to logging.
|
2014-08-03 15:01:33 +02:00 |
|
LevelX2
|
9bcbdbb73d
|
* Updated log4J version.
|
2014-08-03 14:59:51 +02:00 |
|
magenoxx
|
95843f6fa3
|
[UI] Fixed Issue#470: equipped wasn't positioned correctly if equipped creature was returned to owner's hand
|
2014-08-01 14:04:33 +04:00 |
|
magenoxx
|
bd56decfd3
|
Fixed Issue#470: curses not displayed correctly on the battlefield
|
2014-08-01 13:45:41 +04:00 |
|
LevelX2
|
69ce53e6e8
|
* New Tournament dialog - Changed look of player 1 name field.
|
2014-07-30 20:38:15 +02:00 |
|
LevelX2
|
865665767b
|
* Client - After reconnect still active game or deck editor of build step gets topmost panel again (because tablesPanel is loaded automatically now after connect to server).
|
2014-07-30 17:30:02 +02:00 |
|
LevelX2
|
7b8a6e3f46
|
* Added an example deck.
|
2014-07-27 01:57:33 +02:00 |
|
LevelX2
|
ecc6295638
|
Added sound if player leaves table. Changed some sounds.
|
2014-07-26 14:59:42 +02:00 |
|
LevelX2
|
e25a60b312
|
* Changed table maneger to remove chat sessions that were never removed. Minor formattings.
|
2014-07-25 15:54:51 +02:00 |
|
magenoxx
|
b52e526c0f
|
Fixed Issue#454: offset for enchanted permanents
|
2014-07-24 12:18:20 +04:00 |
|
LevelX2
|
3a62115c3a
|
Added icon for triggered and activated abilities on the stack to better distinct it from casting a card.
|
2014-07-23 17:23:49 +02:00 |
|
LevelX2
|
4a3a5ff7d1
|
* TablesPanel - Fixed that restoring of divider positions did not work properly (update).
|
2014-07-23 17:21:51 +02:00 |
|
LevelX2
|
84f67f1fcd
|
* TablesPanel - Fixed that restoring of divider positions did not work properly.
|
2014-07-23 12:07:42 +02:00 |
|
LevelX2
|
59142feb41
|
* Client - The table panel is loaded automatically as getting connected to a server.
|
2014-07-22 17:28:27 +02:00 |
|