github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-17 19:19:32 +00:00
Code Issues Projects Releases Packages Wiki Activity
10963 commits 2 branches 0 tags 782 MiB
Commit graph

1243 commits

Author SHA1 Message Date
LevelX2
a2484cc6d9 Added F10 to skip priority while the stack resolves. 2014-11-16 08:59:59 +01:00
LevelX2
108faf4c8c * Commander 2014 - Added set and already implemented cards. 2014-11-09 11:07:53 +01:00
LevelX2
ef75597fa2 * Fixed includes. 2014-11-08 02:13:23 +01:00
LevelX2
a835c19533 Changed handling of tooltip size calculation. 2014-11-06 23:13:34 +01:00
LevelX2
220331dcd9 * Animate Dead (finished). Only Battlefield layout can't handle a attached card in graveyard yet. 2014-11-06 15:34:18 +01:00
LevelX2
e747326028 Added logger message to card DB exception. 2014-11-03 17:21:57 +01:00
LevelX2
999528e633 Added audio waning 1 minute before timeout for constructing or sideboarding deck. 2014-11-03 07:59:58 +01:00
LevelX2
532345e28a * Darft - Play countdown sound during drafting only if no card from curretn booster was draft. 2014-11-02 12:12:39 +01:00
LevelX2
8426816b09 * Some changes to table and match view. 2014-11-01 14:24:23 +01:00
LevelX2
18d71a9377 * Added display of player order to the draft panel. Added tray info for next card to pick if the XMage window is not active. 2014-11-01 01:59:33 +01:00
LevelX2
2a2c593dd8 * Fixed a bug that changing player type started unwanted cascading change loop that needed longer time to resolve. 2014-11-01 01:57:26 +01:00
LevelX2
1396760d5e * Fixed a problem that prevented cards from beeing marked as choosable in select card panel after the changes made for displaying resized counters. 2014-10-31 18:34:41 +01:00
LevelX2
e6c7fa5f96 * Draft - Added possibility to mark a card to draft on timeout. Added sounds to draft. Changed compression of some sound files. 2014-10-31 16:22:10 +01:00
LevelX2
c3adb1337b * Game layout fix to prevent unneccessary area movement. 2014-10-31 10:36:41 +01:00
LevelX2
2ac1340af7 * Some changes to version handling. Added display of server version (incl. minor server version) in client window titel. 2014-10-31 10:35:53 +01:00
LevelX2
b158ef4f3c * Added acustic an optical signals for use of skip buttons. 2014-10-30 23:43:32 +01:00
LevelX2
df71237f46 * Added logic to auto select replacement effects. Some changes to counter size and font size handling. 2014-10-30 20:40:23 +01:00
LevelX2
ab9c0ae893 * Create tournament dialog - Set min number of swiss rounds in relation to number of players. 2014-10-29 17:20:10 +01:00
LevelX2
791cc828c4 Fixed tournament panel color setting. 2014-10-25 16:01:44 +02:00
LevelX2
2cc129daa6 Changed ChatPanel transparency setting. 2014-10-25 16:00:56 +02:00
LevelX2
ac4c7048c0 [BOK] Added 3 cards. 2014-10-22 19:57:48 +02:00
LevelX2
c3c0d047b1 * Some minor changes to pom files. 2014-10-22 11:55:19 +02:00
LevelX2
2fae1df8c7 * Reverted chat focus handling change. 2014-10-20 00:50:52 +02:00
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
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
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
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
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
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
magenoxx
65a0c9fc79 [UI] Displaying creatures that can attack 2014-07-18 16:05:21 +04:00
magenoxx
e949918da9 [UI] Fixed Issue#464: Play card interaction with set hand order 2014-07-18 12:07:08 +04:00
LevelX2
ee44e41da0 * Added Starter 1999 + 2000 sets + known and simple cards. 2014-07-16 16:36:57 +02:00
magenoxx
60d04e2614 [UI] Showing choosable cards in dialog - Issue#456 2014-07-15 16:31:41 +04:00
magenoxx
118196c8c3 [UI] CardPanel code clean up 2014-07-15 15:12:51 +04:00
LevelX2
0d31e319c5 * Card download - Fixed a bug that prevented to download some cards with blanks in names from MtgImageSource. 2014-07-15 01:09:20 +02:00
magenoxx
5dc2a1b8f5 [UI] removing y offset effect because of no rely on mouse message existing/order 2014-07-14 18:11:48 +04:00
magenoxx
b368e3661c [UI] Fix for NPE on battlefield cards 2014-07-14 13:49:23 +04:00
magenoxx
6cdef93426 [UI] Added minor y offset effect on d'n'd 2014-07-14 13:41:59 +04:00
magenoxx
43a31f6d98 [UI] Fixed wrong card position on d'n'd with small moves 2014-07-14 13:30:02 +04:00
magenoxx
b6e0544c95 [UI] Fixed stack cards offset 2014-07-14 13:29:32 +04:00
magenoxx
8ca8d80a5c [UI] Fixed Issue#454: Enchanted land position is not correct on the layout 2014-07-12 11:20:01 +04:00
magenoxx
bcb91dade1 [UI] Fixed popup location 2014-07-11 21:52:24 +04:00
magenoxx
5fcc3b1ba8 [UI] Displaying playable cards in hand 2014-07-11 19:35:01 +04:00
magenoxx
2b76bbf2c6 Fixed Issue#438: Enchanted permanent can't be clicked because out of sight 2014-07-11 14:40:37 +04:00
magenoxx
045a81e66a Fixed Issue#396: Display of stacking auras 2014-07-11 13:14:44 +04:00
magenoxx
f8a1b327b4 [UI] Order of cards in hand is changable 2014-07-11 10:49:00 +04:00
magenoxx
6d0d511323 [UI] Changing from card.mousePressed to card.mouseReleased. Shouldn't matter. 2014-07-10 11:00:18 +04:00
LevelX2
03e6ccf4ab [M15] Added temp. fix for image download of M15 cards from Wizards side. Problems caused by new web design of wizards. Images are now added as png files. Png images are saved with a jpg suffix name but they are correctly displayed in XMage. Needs more work for a clean solution. 2014-07-09 17:36:07 +02:00
magenoxx
41a2046479 [UI] FullScreen mode for Mac OS clients 2014-07-07 15:09:21 +04:00
LevelX2
14a58b0338 * Added Magic 2015 set. 2014-07-01 08:34:39 +02:00
LevelX2
6c6d12f40f * Fixed that game name for menu works also for watching games. 2014-06-25 12:28:43 +02:00
LevelX2
c519814f03 * Vintage Masters - Added set and already implemented cards. 2014-06-25 10:37:07 +02:00
LevelX2
eb1e8dda14 * Client Windows - Name of game in windows sub menu is now build with player names. 2014-06-25 01:32:55 +02:00
LevelX2
fc95ef68f1 * Conspiracy - Added Conspiracy set to XMage. Changed order of sets in deck editor set selector. 2014-06-23 15:58:07 +02:00
Plopman
64b0da7aab Deck editor. Don't reload all cards every times. Fix scrolling issue #439 2014-06-22 14:28:04 +02:00
Plopman
0d3223ff0e Deck editor. Simplify code 2014-06-22 12:46:06 +02:00
LevelX2
d244551e3b * Added Morph ability. 2014-06-09 17:53:55 +02:00
magenoxx
97dd0dd8a7 New XMage Logo 2014-06-04 10:45:45 +04:00
North
77d05d665d fixed Mage.Client build 2014-06-02 16:06:09 +03:00
magenoxx
c09215a7f3 build fix 2014-06-02 16:01:47 +04:00
magenoxx
4e1901166b Undo old implementation change (caused an enchant land bug) 2014-06-02 10:12:04 +04:00
LevelX2
b39eeac103 * Client - fixed wrong borders on some of the client menu bar items at the top of the window. 2014-05-30 23:00:22 +02:00
LevelX2
03f01bba3b Updated some texts, changed from MAGE to XMage. 2014-05-30 21:00:01 +02:00