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

931 commits

Author SHA1 Message Date
LevelX2
12a01788e6 Added a new column to the table list showing the number of wins for matches and number of used / total seats for tournaments. 2013-03-26 17:18:43 +01:00
LevelX2
d4e12b2fea Fixed a small bug that player list was not updated if size didn#t changed but values. 2013-03-26 15:33:47 +01:00
LevelX2
d8961a7a82 [minor] formatting 2013-03-26 13:43:24 +01:00
magenoxx
3a59ca9465 Not changing hand ui size in small mode 2013-03-22 08:39:35 +04:00
magenoxx
3afa5cc867 Fixed Issue #[166]: Allow table creator to remove table - added confirm dialog 2013-03-22 08:26:57 +04:00
magenoxx
67fcf4a911 Implemented Issue#166: Allow table creator to remove table - added remove action also for watch/replay state 2013-03-20 08:29:57 +04:00
magenoxx
4adb63cc7a Fixed Issue#165: Decksize over 99 cards not displayed correct 2013-03-20 08:27:55 +04:00
magenoxx
13c2b2d477 Implemented Issue#166: Allow table creator to remove table 2013-03-20 08:09:36 +04:00
magenoxx
3191ad7e32 Fixed Issue#158: The select a pile window is shown over the tooltip window 2013-03-15 11:53:32 +04:00
North
a7a565bb8f [minor] access modifer order 2013-03-10 14:53:02 +02:00
LevelX2
aa0290fd32 Set Version to 1.0.1 2013-03-10 11:40:56 +01:00
LevelX2
dc131fa8dd Changes to show name and number of counter on a card. 2013-03-04 00:03:21 +01:00
LevelX2
cc96a55523 Some changes to logging. 2013-03-04 00:01:12 +01:00
North
2daae9fb47 [minor] code style 2013-03-03 10:41:31 +02:00
North
122e9c700d URL hash and equal methods do IO operations; replaced with URI 2013-03-02 20:06:57 +02:00
North
a327668660 fixed possible NPEs 2013-03-02 18:02:09 +02:00
North
c0f837c2e0 removed unused fields 2013-03-02 18:02:08 +02:00
North
cdd5c3f2d3 [minor] removed redundant modifiers 2013-03-02 18:02:05 +02:00
North
5f6f1c7528 [minor] removed unused imports 2013-03-02 18:02:02 +02:00
magenoxx
6444ff723f Fixed Issue#131: If I'm using not the default location for images, the handling of symbols is faulty 2013-02-26 16:37:14 +04:00
magenoxx
441a9870c8 Pumped version in java files and main pom 2013-02-26 15:44:21 +04:00
magenoxx
23c93be6a8 Displaying loading time for checking images 2013-02-26 13:42:07 +04:00
magenoxx
cd7b0f5b08 Client start up time speed up: don't check for new images by default 2013-02-25 20:29:09 +04:00
magenoxx
0ca04e0285 Fixed Issue#142: Player's panel cosmetic bug 2013-02-22 23:47:38 +04:00
magenoxx
7f6d730975 Fixed Issue#125: Show source/reason of triggering abilites 2013-02-22 22:54:43 +04:00
LevelX2
e4145c90b5 Fixed issue #135 that cards with miracle were always shown on the stack if it was possible to cast them with miracle also if the owner of the card dicided not to use the miracle ability. Minor formating. 2013-02-14 14:50:41 +01:00
LevelX2
13e008f102 Added a new sort mode to editor that sorts by color detailed by color combinations. 2013-02-10 10:47:44 +01:00
LevelX2
fcd24572dd Computer generated decks for tournaments use now also appropriate basic lands for the cards included in the deck. 2013-02-06 00:50:00 +01:00
LevelX2
6b49ab3582 Added gatecrash token and emlem definition for download. 2013-02-05 09:33:18 +01:00
LevelX2
cf62ba330d Fixed a bug that froze the game if you finished a game, pushed ok and directly started to open a new game. The FeedbackPanel.endWithTimeout() task triggered after 8 seconds and locked the client. 2013-02-04 17:00:34 +01:00
LevelX2
5f3a8eb360 Changed logic of adding basic lands in deck generation and the add land function in limited deck editor to use lands from the sets of the cards in the decks. Added missing attributes to set definitions. 2013-02-03 16:54:03 +01:00
LevelX2
98ab1f18e3 [GTC] Corrected wrong cards numbers, allow GTC for image download 2013-01-23 13:14:09 +01:00
magenoxx
2c652770fb Fixed Issue#122: Check of deck and game type during creating a new table doesn't show a qualified error message 2013-01-21 21:14:22 +04:00
magenoxx
9f241a7041 Fixed Issue#109: Unwanted blue rectangle in UI 2013-01-15 17:30:36 +04:00
LevelX2
0d3785937b Setting position of dialog centered. 2013-01-15 00:53:32 +01:00
magenoxx
3908d8f9cd Fixed Issue#108: Display of flipped cards is erroneous 2013-01-14 22:09:28 +04:00
magenoxx
3df5466d8a Added downloading flipped card images. Removed counting images for ignored sets. 2013-01-14 22:07:07 +04:00
magenoxx
20c57ef2d6 Added GTC to image download ignore list for a while 2013-01-14 21:03:13 +04:00
LevelX2
6a138740ba Fixed NPE in deck editor cause by changes for issue #73. 2013-01-14 17:11:16 +01:00
magenoxx
55f40d2e9d Implemented Issue#73: Enchant Player enchantments - show enchanted player 2013-01-14 18:57:13 +04:00
magenoxx
17b8619b3e Implemented Issue#106: Display emblems of players 2013-01-14 18:16:12 +04:00
magenoxx
1fac540639 Fixed 'Graveyard' label cut on top in grave dialog 2013-01-14 17:57:03 +04:00
magenoxx
1de8321f44 Fixed Issue#107: Text of tooltip is shown behind the exile windows. 2013-01-14 11:52:05 +04:00
magenoxx
5ed24f1488 Fixed Issue#99: The choices window should be positioned centered of the battlefield 2013-01-11 16:03:31 +04:00
magenoxx
5345e93c30 Fixed Issue#75: tooltip textbox stays sometimes undesired 2013-01-11 15:52:56 +04:00
LevelX2
8b4b1691a4 Fixed set icon load of conflux. 2013-01-08 22:32:05 +01:00
LevelX2
8dab110060 Fixed a NPE in deck editor caused by fix of #84. 2013-01-08 22:31:43 +01:00
magenoxx
ec5b5845ef Fixed Issue#84: Arrows that show the targets are always on top 2013-01-08 15:58:48 +04:00
LevelX2
1b8adc2b25 Added download/image information. 2013-01-08 00:16:54 +01:00
magenoxx
c53bcd6b2b Minor fix for fixed Issue#45 2013-01-07 19:27:25 +04:00
magenoxx
fd7ab45a14 Fixed Issue#85: Frame resizing doesn't handle display of hand 2013-01-07 19:23:22 +04:00
magenoxx
78e1bb99d9 Fixed Issue#45: Textbox for tooltip is sometimes too small to show all the text 2013-01-07 18:02:45 +04:00
magenoxx
d951df41ec Fixed Issue#75: tooltip textbox stays sometimes undesired 2013-01-07 16:02:47 +04:00
LevelX2
11e2df7a86 Fixed symbol replacement and format definition. 2013-01-06 11:17:06 +01:00
LevelX2
36a2906ab5 Added "Unlimited Edition", "Revised Edition", "Limited Edition Beta", "Limited Edition Alpha" to the Format selector. 2013-01-06 09:26:18 +01:00
North
8e2b094837 Added LEA, LEB, 2ED and 3ED sets. 2013-01-05 18:14:38 +02:00
LevelX2
3b948a1e70 Added GTC (gatecrash) to some objects and lists. 2013-01-03 20:31:24 +01:00
LevelX2
5517474c90 Changed set selection for tournament boosters to only show sets with boosters. Closes issue #91. 2013-01-02 15:46:21 +01:00
LevelX2
03f419d176 Added Gatecrash to the available sets. 2013-01-02 13:33:00 +01:00
Loki
aa31ef23d3 bump version to 0.10.1 2012-12-28 12:48:26 +13:00
North
c0ad7812cd minor changes (mostly code style) 2012-12-24 18:43:54 +02:00
North
fde10788db removed redundant modifiers from interfaces 2012-12-20 23:45:47 +02:00
LevelX2
dcb904308c Game panel uses now a bigger vertical area for the bigCardPanel. Positions of the dividers of the game panel are saved and restored now. 2012-12-20 16:38:48 +01:00
North
f0b32e7ca3 Removed unused imports 2012-12-20 00:26:21 +02:00
LevelX2
4b2e6a8bc0 Redesigned handling of various art for cards. 2012-11-27 15:24:29 +01:00
LevelX2
f72e1a1038 Improved the handling of image files for handling also different images of non basic lands (e.g. Fallen Empires). 2012-11-25 20:09:13 +01:00
Loki
45316daf88 version bump to 0.10.0 dev 2012-11-17 01:46:36 +13:00
LevelX2
91b2d7056f Fixed wrong size of textbox when showing big card for the spell/ability on the stack. 2012-11-16 08:31:15 +01:00
LevelX2
ced533709d Fixed bug that the path for zip files of the card images is always the default path and never the individual defined preferences path. 2012-11-15 20:52:44 +01:00
Loki
f017ab903c version bump to 0.10.0 2012-11-15 22:47:15 +13:00
LevelX2
facfc6f1ce Added tooltip to window titel bar to show longer titels of windows at least as tooltip. 2012-11-09 01:28:28 +01:00
LevelX2
baedfd54bf Fixed card selector not removing card from sideboard. 2012-11-09 01:22:45 +01:00
North
dfbe144ad2 Fixed drafting cards 2012-11-08 23:26:41 +02:00
LevelX2
903c98b0ba Fixed loading and saving of preferences - Images options. 2012-11-08 13:59:26 +01:00
LevelX2
5e4d0a2008 Added Planechase 2012 edition to mage. Added missing Planechase entry to set selector. 2012-11-07 14:31:12 +01:00
North
e049f39cb1 Fixed image download when name contains ":" 2012-11-05 20:31:19 +02:00
North
cc306b2119 Removed CardsStorage. 2012-11-05 20:09:09 +02:00
North
f64149971a Merge branch 'CardRepository' 2012-11-05 19:37:51 +02:00
North
6f23ce362e Deleted CardTableSelector (unused) 2012-11-04 16:15:38 +02:00
North
bc80844fbe Fixed booster generation in Deck Editor 2012-11-04 16:15:27 +02:00
North
25cd490be3 [CardRepository] moved Sets, DeckImporter and CardRepository to Mage Framework 2012-11-04 12:52:02 +02:00
LevelX2
7eb6ee15c0 ExileFromHand Cost, some small changes 2012-11-03 16:41:19 +01:00
magenoxx
10ba5c2e72 Downloading images according to save_to_zip option 2012-10-23 17:10:56 +04:00
magenoxx
789ed428b7 [ui] disabled choosing path for images. added zip files option 2012-10-23 15:59:46 +04:00
magenoxx
6e1e27f51d [ui] updated about dialog 2012-10-23 15:55:13 +04:00
North
9acb0e23bc Removed unused code from Sets and ExpansionSet 2012-10-22 23:57:14 +03:00
North
08815ffb88 [CardRepository] Replaced findCard methods from Sets and ExpansionSet 2012-10-22 23:48:52 +03:00
LevelX2
62844401ee fixed M13 emblem picture download (emblem pictures are not used yet?) 2012-10-22 16:08:05 +02:00
North
271aaab5fd [CardRepository] replaced Sets.findCard(setCode, cardNum) 2012-10-21 18:30:15 +03:00
North
8d83251428 Renamed method in CardRepository 2012-10-21 18:23:27 +03:00
North
6faca63354 Removed unused methods from CardsStorage 
Only ratings are left and should be moved
 2012-10-21 18:15:44 +03:00
North
809910e8c7 Used CardRepository in Deck Editor 2012-10-21 18:15:43 +03:00
North
56a11f4da2 Replaced CardStorage references from MageFrame with CardRepository 2012-10-21 18:15:42 +03:00
North
4a4ed72324 Replaced some CardStorage references with CardRepository 2012-10-21 18:15:40 +03:00
North
ca912d4e03 Used CardRepository for DeckGenerator 
Rewritten the getRandomColors method
 2012-10-21 18:15:38 +03:00
North
7ea23a1ba1 Added CardRepository initialization 2012-10-21 18:15:37 +03:00
LevelX2
c335a8f34b Added token names for downloading pictures of token creatures from M13 and RTR. Added RTR name for download of tokens. 2012-10-15 16:26:08 +02:00
LevelX2
cf88bb5ac3 Updated selected sets for "Standard" and "Selected". Added blocks to selectable Formats. Made all formats selectable in card selector, mage book and automated deck generation. 2012-10-14 10:08:16 +02:00
LevelX2
665ea374ed added missing set abbr. anc corrected wrong values for symbol download 2012-10-03 19:10:34 +02:00
magenoxx
72de08ed39 RTR is default set for Collection Viewer 2012-09-26 13:07:03 +04:00
magenoxx
63b066672b Removing temp zip files on download task completion. Removed recreating executor. 2012-09-26 13:01:24 +04:00
North
ff77767098 Already downloaded image files are moved to the zip file. 2012-09-25 22:10:28 +03:00
North
6a5b656419 Replaced AEther Tradewinds special character in wwk.txt 2012-09-25 21:48:41 +03:00
North
1223d0e9ce Added RTR to WizardCardsImageSource 2012-09-23 21:44:14 +03:00
North
b1d2212ee7 Fixed downloading double sided cards from magiccards.info source 2012-09-23 21:43:50 +03:00
North
7ede15438e Fixed image downloading for HML, ALL and DRK 2012-09-23 20:46:17 +03:00
North
ca047718b6 Added early sets 2012-09-12 10:33:11 +03:00
North
183553a684 [ICE][CSP] added sets (completed Ice Age block) 2012-09-12 09:37:18 +03:00
North
20ea0ba76f Fixed support for HQ archives (inconsistent capitalization) 2012-09-12 00:45:41 +03:00
Backfir3
40f03c9be1 [ALL] Added Alliances set with simple and extended cards 2012-09-11 21:34:09 +02:00
North
964bf0ed13 Moved archiving configuration to MageFrame 2012-09-11 13:25:21 +03:00
North
dbe0d9170c [refactoring] improved support for HQ image archives 
The names for the images in the HQ arhives don't have consistent capitalization
 2012-09-10 12:33:12 +03:00
North
ce9dc9ebe9 Removed ROE and M13 from CarsStorage 2012-09-10 12:33:12 +03:00
magenoxx
e0de28693b [client] Autoclosing game windows after 8 seconds they finished 2012-09-09 13:56:42 +04:00
magenoxx
ec123fee33 Added RTR to ignore list 2012-09-08 11:30:43 +04:00
North
fa82f1b159 [feature] Card images are now saved and read from zip files 2012-09-07 20:49:01 +03:00
North
e0d4285a69 Replaced checks for BasicLandNames with regular expresion. 2012-09-07 20:49:00 +03:00
North
9b10053e11 Removed MtgatheringRuImageSource 2012-09-07 20:49:00 +03:00
magenoxx
6b895d90cf Fixed Issue#46: Creature display order on the battlefield random 2012-09-07 21:11:24 +04:00
LevelX2
fe72ab9192 Fixed bug that leaves unmodifiable lines for lands in the deck editor. 
Happens when you add more than one land from the same expansion with quantity > 1 and e.g. pushed new button afterwards.
 2012-09-07 13:34:03 +02:00
Loki
46ec86b54c 0.9.2 dev 2012-09-04 21:24:44 +12:00
Loki
76bb3f827d 0.9.1 2012-09-04 18:33:51 +12:00
North
0589ef94cb [minor] Moved PLUGINS_DIRECTORY constant 2012-08-26 18:54:22 +03:00
North
0575034084 Removed TrayIconDemo class 2012-08-20 22:16:27 +03:00
magenoxx
b229fafcf9 Fixed Issue#36: End combat icon will not be shifted to left if it's the current phase 2012-08-16 01:07:01 +04:00
Loki
85b31df2d5 Bump version to 0.9.1dev 2012-08-14 15:28:06 +12:00
Loki
b729631cc6 0.9.0 2012-08-13 18:58:51 +12:00
magenoxx
36cb5f95b9 Fixed Issue#37: graveyard dialog not displayed when multi games played 2012-08-08 11:31:35 +04:00
magenoxx
964aaf23ab Graveyard dialog auto close on pay message. Usefull for flashback cards. 2012-08-03 19:44:48 +04:00
magenoxx
5c1a2f7a43 Madness fixes. Removed end_of_turn sound 2012-08-03 17:11:16 +04:00
magenoxx
931381606d Fixed concede game option not working in popup menu 2012-08-03 13:27:10 +04:00
North
aaf296afd0 [4ED] added set 2012-07-29 20:42:19 +03:00
North
90559b8d69 [6ED] added set 2012-07-29 20:42:17 +03:00
North
355f4bcb7b [7ED] added set 2012-07-29 20:42:16 +03:00
magenoxx
50ffb96a3f [UI] Quick game start missing test.dck handling 2012-07-29 08:34:04 +04:00
magenoxx
e832ff3b53 [UI] made cheat button not focusable 2012-07-27 17:11:16 +04:00
magenoxx
0e361959c6 Removed list of M13 cards (all h.b. implemented) 2012-07-25 19:39:00 +04:00
magenoxx
721c87757b [UI] trasnparent players list in gamefind panel 2012-07-25 09:54:40 +04:00
magenoxx
421732a404 [UI] Displaying current phase 2012-07-25 00:21:53 +04:00
magenoxx
0d20e954dc [UI] Phases new Look and Feel 2012-07-24 19:40:09 +04:00
magenoxx
5c58edced6 [UI] Added Phases component to the right centered by Relative Layout. 2012-07-24 14:42:52 +04:00
magenoxx
886bd640ea [UI] RelativeLayout 2012-07-24 14:41:57 +04:00
magenoxx
47d44c6aef Returned game info panel to the right 2012-07-24 09:32:55 +04:00
North
1542ba9ab6 [filters] converted FilterCard conditions to Predicates 2012-07-23 21:53:54 +03:00
magenoxx
29e57830b4 Remembering toggle state for BigCard component between games 2012-07-23 09:07:25 +04:00
magenoxx
c783cbc41f personal game messages 2012-07-23 01:29:56 +04:00
North
265bc900a9 Added sets: Mirage, Visions 2012-07-21 15:38:58 +03:00
North
eeca9e6db2 Added sets: Stronghold, Exodus 2012-07-21 15:27:32 +03:00
North
3351d9420b Added sets: Mercadian Masques, Nemesis, Prophecy 2012-07-21 14:31:43 +03:00
North
a9b95595dc Added Odyssey and Torment sets 2012-07-21 14:31:41 +03:00
magenoxx
6fbf4c1257 Renamed parameter name. [UI] Fixed big card image blinking on mouse move 2012-07-21 14:10:07 +04:00
North
6bbb7521c7 [SCG] added set 2012-07-21 11:46:08 +03:00
North
9cf12d4c15 [LGN] Added Set 2012-07-21 11:46:07 +03:00
magenoxx
59b9087257 BigCard component back with toggle option. 2012-07-20 17:33:48 +04:00
magenoxx
de146458a9 [UI] Some sounds 2012-07-19 18:11:00 +04:00
magenoxx
b2cd3e75bd changed version from 0.8.7.dev to 0.9.0.dev 2012-07-18 15:59:07 +04:00
magenoxx
9c6dc78842 Shuffling player seats in multi player 2012-07-18 12:12:12 +04:00
magenoxx
ed0af0faee Added skip-all-turns-and-actions feature. Bound to F9. 2012-07-18 10:15:50 +04:00
magenoxx
8598f9ead1 Displaying tray message on player join and quit events 2012-07-17 14:18:38 +04:00
magenoxx
872ced4344 [UI] Tray menu. Blinking on new players added to table. Added window restore on double-click. 2012-07-16 20:23:56 +04:00
magenoxx
9214051279 [UI] Mage tray icon 2012-07-16 19:08:03 +04:00
magenoxx
2de4506ad2 [UI] Added popup menu. Moved Concede action to popup. 2012-07-16 16:49:09 +04:00
magenoxx
44a3c05ba8 [UI] displaying tooltips: clean up and code refactoring 2012-07-16 16:14:53 +04:00
magenoxx
7443e2a9fa [UI] card image zoom in/out on mouse wheel with 700 ms timeout 2012-07-16 16:08:12 +04:00
magenoxx
6d24c7001b Fixed tooltip not displayed in Collection Viewer 2012-07-16 09:07:28 +04:00
magenoxx
ccf201cfc4 stack min size 2012-07-16 09:06:55 +04:00
North
43322d3c1a Merge branch 'filters' 2012-07-13 23:10:10 +03:00
magenoxx
fc2283898c [UI]Alt+E:enlarge card. New game panel layout (experimental). 2012-07-13 14:55:52 +04:00
North
ecf765ecf5 [filters] Replaced CardType conditions with Predicate 2012-07-12 23:42:46 +03:00
magenoxx
9187cbff07 (Issue#6) Fixed tooltip not displayed until updated in Preferences dialog 2012-07-12 06:00:26 +04:00
magenoxx
7d1bdfb0ce Added F4 hot key for 'End Turn' action 2012-07-08 18:42:28 +04:00
magenoxx
5294e2cba4 Changed title for graveyard dialog 2012-07-08 18:40:53 +04:00
magenoxx
6d670fa3ff [UI] Moved Concede button from helper component to bottom-left 2012-07-08 09:41:04 +04:00
magenoxx
d9e0590763 fix for m13 type in deck generator 2012-07-08 08:06:54 +04:00
magenoxx
3ddff4a113 Added M13 option for deck generator 2012-07-08 07:21:26 +04:00
North
ff2f12fcc7 [USD] added set 2012-07-07 22:33:23 +03:00
North
4ee6ea5ae9 [JUD] added set 2012-07-07 22:19:45 +03:00
North
6395e82e47 [M13] added set 2012-07-06 14:23:24 +03:00
North
7734abe87f Fixed quick start action (for testing). 2012-07-03 08:25:50 +03:00
magenoxx
9ac166abc9 updated version to r2 2012-07-03 00:38:41 +04:00
magenoxx
375cc311b9 Fixed ClassCastException for Client windows 2012-06-30 09:10:36 +04:00
magenoxx
5541fe4163 updated version from 0.8.6.r5 to 0.8.7 2012-06-29 14:56:13 +04:00
magenoxx
ebf8e372bd Minor helper fix 2012-06-29 10:01:37 +04:00
magenoxx
7bcd512351 Not included changes (can be ignored for now) 2012-06-28 16:40:46 +04:00
magenoxx
30264a4326 Made button non visible on helper component rather than disabled 2012-06-28 10:08:13 +04:00
magenoxx
6ad352709a Focus on button for space and enter hot keys 2012-06-28 01:06:38 +04:00
magenoxx
25bdce4b67 Hiding 'End Turn' button 2012-06-28 00:53:59 +04:00
magenoxx
004aa20d08 Decreased tooltip display delay from 700ms to 300ms 2012-06-28 00:16:26 +04:00
magenoxx
b5032226f4 Showing already chosen cards in choice dialog 2012-06-27 18:44:03 +04:00
magenoxx
638a6368d2 Displayint card name in choice dialog. Bigger cards for choice many. 2012-06-27 18:07:13 +04:00
magenoxx
8f0159d706 Displaying tooltips over card choice dialogs 2012-06-27 17:34:58 +04:00
magenoxx
0f15fd1186 ClassCastException fix on game close 2012-06-27 17:33:47 +04:00
magenoxx
a8588c1c83 Added displaying 'Your turn' message 2012-06-27 15:35:37 +04:00
magenoxx
d5c5a89e85 Made stack window bg color transparent 2012-06-27 15:13:59 +04:00
magenoxx
75e641580c Displaying text in helper component. Removed feedback component 2012-06-27 15:07:01 +04:00
magenoxx
c2a517f1b3 New helper component 2012-06-27 14:25:12 +04:00
magenoxx
b11d843d0b Unlocked 3 avatars 2012-06-27 12:59:38 +04:00
magenoxx
d31197a8c2 Fix for arrows not removed on game end 2012-06-27 12:59:06 +04:00
magenoxx
559ba76906 New graveyard dialog 2012-06-27 12:09:14 +04:00
magenoxx
59a2eaafd8 Minor changes 2012-06-26 18:13:32 +04:00