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

682 commits

Author SHA1 Message Date
magenoxx
42108ef59c fixed downloading images from flip cards according to changes on magiccards.info site 2012-04-28 03:27:36 +04:00
magenoxx
11df72593c changed version from 0.8.4.dev to 0.8.4 2012-04-27 18:09:19 +04:00
North
47bd74a24c [refactoring] Moved Sets.loadDeck to a DeckImporterImplementation 2012-04-08 16:52:21 +03:00
North
e9ac5a180b [refactoring] removed dead code (action for Challenge button) 2012-04-08 12:14:52 +03:00
magenoxx
33f19e9f8d Fixed NPE in client 2012-04-06 12:40:57 +04:00
magenoxx
4ab62efc38 Now it is possible to choose game format in deck generator. 2012-03-28 11:52:38 +04:00
magenoxx
2b7cb8ca19 Changed default tab in collection viewer to DKA. 2012-03-28 11:52:00 +04:00
magenoxx
653b2c8a05 Displaying card count in deck editor. 2012-03-26 10:06:16 +04:00
magenoxx
3875c1f7c0 Changed component version from 0.8.3 to 0.8.4 (dev) 2012-03-25 12:16:46 +04:00
Loki
770bc451c9 add missing set images, fix non-utf8 char 2012-03-09 13:41:00 +04:00
North
263c937133 Ignored Integration tests (would fail when building Mage Client) 2012-02-29 22:38:20 +02:00
BetaSteward
d79cbcb54f fixes 2012-02-09 15:58:14 -05:00
BetaSteward
6205ebaeb9 fixed Liliana Of The Veil npe when targeting tokens + added choose pile dialog 2012-02-07 15:15:47 -05:00
BetaSteward
65ce0c3948 fixed resizing 2012-02-04 16:57:22 -05:00
magenoxx
79919e1550 changed version from 0.8.3.dev to 0.8.3 2012-02-04 15:39:03 +04:00
BetaSteward
d813283c19 adding back recent changes - not quite sure how I managed to revert all this 2012-02-02 23:48:25 -05:00
magenoxx
ca0fcbad58 Fixed bug with the email value not sent to server ;(( 2012-01-30 20:34:14 +04:00
North
90ad4a16c6 [sets] Added Dark Ascension 2012-01-29 17:00:23 +02:00
magenoxx
bef2adadf2 Changed url for server-list.txt. 2012-01-28 21:37:16 +04:00
Loki
4ea776ce76 Merge remote-tracking branch 'origin/master' 2012-01-28 14:30:11 +04:00
Loki
3b1169e9d3 add USG set icon to download list 2012-01-28 14:29:54 +04:00
magenoxx
0cd53d37c7 Changed url for server-list.txt. 2012-01-28 13:37:32 +04:00
magenoxx
b3f99c43d5 Closing Feedback Dialog on send. 2012-01-28 13:37:12 +04:00
magenoxx
3434dc1a97 Added User Feedback support. 2012-01-26 22:13:44 +04:00
magenoxx
bdb2754847 Added sending broadcast message to all users on server from Admin Console. 2012-01-25 19:13:27 +04:00
magenoxx
3f20b725db [MAD2.0] New scoring and undo system. Migrated draw cards action. 2011-12-25 11:42:32 +04:00
Loki
1f259ec772 fix symbol downloading for PLS and INV 2011-12-24 17:21:14 +04:00
magenoxx
a7a496af0e Now client can start embedded Mage Server (player's feature request). 
Works only for "localhost". Still can be used with external server but in such case server should be started first.
 2011-12-23 13:14:32 +04:00
magenoxx
7bd38bb208 Fixed assembly (daily builds were broken). 2011-12-18 12:29:16 +04:00
magenoxx
13c5177d54 [ui] Now pressing "Enter" on any text field in Connect dialog will force connecting - No need to press "Connect" button anymore. 2011-12-09 15:15:48 +04:00
magenoxx
e076c0b6ee Fixed client bug where pressing "No" on "Are you sure you want to disconnect?" closed the client anyway. 2011-12-09 15:10:09 +04:00
magenoxx
ba6508cbeb Updated component version from 0.8.1 to 0.8.2. 2011-12-09 13:15:07 +04:00
BetaSteward
afef9c06fe handle smaller screen sizes 2011-12-07 10:03:17 -05:00
BetaSteward
e911f0b662 fixed large hand cards + improved resizing 2011-12-01 14:49:14 -05:00
BetaSteward
70421439f0 resize game panel when window resizes 2011-11-25 08:20:05 -05:00
magenoxx
16c03d6d4d Test for multiple connects. Reproduces bug with "already connected" exception. 2011-11-24 13:17:15 +04:00
BetaSteward
b975d98bf5 partial fix for issue 81 2011-11-21 08:29:21 -05:00
magenoxx
e302a12f5d Updated component's version from 0.8 to 0.8.1 
manually
 2011-10-28 11:36:42 +04:00
magenoxx
3350c3e829 Updated components' version from 0.7.6 to 0.8 2011-10-16 21:02:04 +04:00
magenoxx
c7dcd3605c change tournament ai level component size. changed default value to 10. 2011-10-16 18:06:13 +04:00
BetaSteward
a21e815ae9 fixed issue 281 2011-10-15 23:42:24 -04:00
BetaSteward
4c1d0728bc fixed issue 280 2011-10-15 23:41:57 -04:00
magenoxx
e2049409ab Fixed image not correctly resized for big card component. 2011-10-16 02:43:43 +04:00
magenoxx
ef1fa35555 Fixed Issue 256. 2011-10-16 02:27:37 +04:00
magenoxx
2926f0b6cb Transparent panel in Collection Viewer. 
was gray.
 2011-10-16 02:14:25 +04:00
magenoxx
3ab6b76c07 fix 2011-10-15 20:23:26 +04:00
magenoxx
ba19cc7f61 Added tab switching into Collection Viewer. 2011-10-15 19:45:16 +04:00
magenoxx
74b21979a5 Added choosing size to Collection Viewer. 2011-10-15 15:31:29 +04:00
magenoxx
5fbb8b1053 Sorting by formats in Collection Viewer. 2011-10-15 14:16:13 +04:00
magenoxx
446c1517cf Added random colors to deck generator. Fixed Issue 267. 2011-10-13 17:18:05 +04:00
Loki
6f177b1d82 Magic Player Rewards - full art cards 2011-10-12 20:39:05 +03:00
magenoxx
3e0e1e6ecd Updated AboutDialog. 2011-10-12 20:22:55 +04:00
magenoxx
0bb803a681 Added download tokens for ISD. 2011-10-12 13:02:01 +04:00
magenoxx
bf62ef248c unban ISD in magiccards.info image source 2011-10-12 12:53:30 +04:00
North
f4aa7fb71f Added remaing sets from modern. 
Added simple cards for added sets
Fixed blockName for existing sets.
 2011-10-10 22:21:00 +03:00
North
4b995918a2 removed ISD from unimplemented list 2011-10-10 21:53:39 +03:00
magenoxx
57d5dde609 Made ISD default opened set in Collection Viewer 2011-10-07 23:59:15 +04:00
Loki
6f4d3b3963 Time Spiral set added 2011-10-06 23:58:30 +03:00
Loki
4d53d7ce00 add ISD symbol to downloading list 2011-10-06 10:26:03 +03:00
magenoxx
06b83d8a5e Fixed transform animation. 2011-10-04 20:14:04 +04:00
magenoxx
f8c853fe4e Test that reproduces Issue 266. Fixed Issue 266. 2011-09-28 09:00:44 +04:00
BetaSteward
835879fe78 reformatted chat panel and game message - you can now see both areas at the same time 2011-09-25 21:53:27 -04:00
North
d050c80de0 Fixed function that reads unimplemented cards 2011-09-25 15:24:14 +03:00
North
529de2f8cf return null if url is not available for current download source 2011-09-25 15:23:25 +03:00
magenoxx
e63bec1977 Removed repaint override in CardPanel. 
Ccaused awt deadlocks.
 2011-09-25 15:08:21 +04:00
magenoxx
f3316853a2 For a while ISD images are restricted for downloading from magiccards.info 
Images have too bad quality
 2011-09-25 14:25:54 +04:00
North
04a7e79ada Added unimplemented ISD to collection viewer. 
Removed unimplemented list files for completed sets.
 2011-09-25 11:56:07 +03:00
BetaSteward
5efe352305 removed modal messages in game panel 2011-09-24 22:05:19 -04:00
North
27c8514d64 minor changes (removed unused imports, added @Override ...) 2011-09-24 22:37:53 +03:00
North
e72da7f4ed Fixes issue 260. 
Fixes download issue from magiccards.info (optimized CPU usage too).
 2011-09-24 22:37:03 +03:00
magenoxx
2a25b207ea Merge 2011-09-24 13:08:05 +04:00
North
b0b6b1186c Download possible for Double faced cards from wizards spoilers. 2011-09-24 11:06:08 +03:00
magenoxx
617374e13f fixed night card not displayed in the stack 2011-09-24 11:00:50 +04:00
magenoxx
a3105dae8c Merge 2011-09-23 11:27:21 +04:00
magenoxx
49da09ce65 Token images for M12 and DDH 2011-09-23 08:15:16 +04:00
magenoxx
08baa314f4 Added downloading double-faced cards images from magiccards.info 2011-09-23 07:01:54 +04:00
magenoxx
9e7f3ad787 new custom avatars for me 2011-09-22 19:31:11 +04:00
BetaSteward
bbb4f8a346 fixed issue 255 2011-09-21 23:21:40 -04:00
magenoxx
5978d57298 Custom avatar for "Rahan" 2011-09-21 13:46:04 +04:00
magenoxx
a4fd5e6fb7 Possible fix for Issue 256 2011-09-21 12:25:22 +04:00
magenoxx
4534f11f3d Fixed Issue 244 2011-09-20 22:42:36 +04:00
magenoxx
9f868daf3e Now players may choose avatars in Preferences Dialog. 2011-09-20 21:05:22 +04:00
Loki
19f0a6b7b0 move Mage-Server and Mage-Client jars to lib 2011-09-19 20:58:03 +03:00
magenoxx
474b022b6c fix 2011-09-18 16:33:50 +04:00
magenoxx
0d30981443 removed debug messages 2011-09-18 14:06:22 +04:00
magenoxx
2d8948b8f6 Changed version from 0.7.5 to 0.7.6 2011-09-18 13:57:43 +04:00
magenoxx
abdff12e15 Fixed MOD. 2011-09-18 13:50:13 +04:00
magenoxx
e7bb796d48 Double-faced cards support 2011-09-17 16:47:28 +04:00
magenoxx
b81992bf9d Removed transform from all cards. 2011-09-16 09:04:17 +04:00
Loki
970bef84d1 2 cards with kicker redone and fix AE 2011-09-15 23:44:13 +03:00
BetaSteward
a73d04af1a clean up 2011-09-12 22:11:17 -04:00
magenoxx
a74344a81a changed avatar for "Askael" 2011-09-12 12:02:32 +04:00
North
d09db1d58a special character fix 2011-09-12 07:27:20 +03:00
North
f1bf37bbd0 Fix for Avacyn's Pilgrim image download. 2011-09-11 22:58:18 +03:00
Loki
8df6df5faf [ISD] Gavony Township 2011-09-11 17:00:40 +03:00
North
49435820d1 Updated WizardCardsImageSource (can get images from an uncomplete spoiler now) 2011-09-11 11:48:40 +03:00
magenoxx
444341dee9 custom avatar for "Alive" 2011-09-10 11:17:18 +04:00
BetaSteward
d512fc1021 fixed client proxy settings 2011-09-09 23:07:55 -04:00
magenoxx
c2594f7b17 more solid border for active player 2011-09-09 00:35:52 +04:00
magenoxx
903dc0c5ef Added card transform in UI. For now for all cards. 2011-09-08 22:23:35 +04:00
magenoxx
8e9b6ac821 avatar for "loki" 2011-09-08 13:50:59 +04:00
magenoxx
33be6bd828 UserDataView. More custom avatars. 2011-09-08 10:41:52 +04:00
magenoxx
0b223bfe4f Added custom avatars for "nantuko", "i_no_k", "Askael" 2011-09-07 21:20:29 +04:00
magenoxx
bf1a49dd0b Sending user data. Sending avatar to server on connect. 2011-09-07 21:18:58 +04:00
magenoxx
32d4d854f4 Added new avatars. 2011-09-07 21:18:02 +04:00
magenoxx
09cc554aab Removed old avatars 2011-09-07 21:17:21 +04:00
BetaSteward
f5c3494723 improved replays - can now skip forward 10 moves or let the client play through the moves 2011-09-05 22:12:36 -04:00
North
95ca7a5d12 Added the remaing sets from the Kamigawa block. 2011-09-04 20:59:21 +03:00
BetaSteward
fe79ee97a9 update deck every 5 seconds while constructing or sideboarding 2011-09-04 13:23:16 -04:00
BetaSteward
ea44fc973f added timeout on sideboard + show construct and/or sideboard on reconnect 2011-09-03 21:44:05 -04:00
magenoxx
24e35b4a38 Finished connection tab. 2011-09-03 01:25:39 +04:00
magenoxx
e642a6aff6 "Connetion" tab in PreferencesDialog (in progress). 2011-09-02 21:37:34 +04:00
magenoxx
838f4ca0d3 Fixed Issue 205. 2011-09-02 09:32:37 +04:00
magenoxx
8404d3be25 Accidentaly removed buttons on previous commit. Fixed white chat in tournament waiting dialog. 2011-09-02 09:20:30 +04:00
magenoxx
f0d6ad73ae Fixed MOD button jumping. Fixed transparency in tables. 2011-09-02 09:11:37 +04:00
magenoxx
75c04f49d1 Forgot to change version in the code. 2011-09-02 08:44:03 +04:00
magenoxx
818d601cbb Fixed set codes and mana symbols in pay and tooltips. 2011-09-02 08:08:35 +04:00
North
e10abfe09e Now Sets are ordered by their release date. 
Manually updating this file is no longer necessary.
 2011-09-02 00:57:09 +03:00
North
e8426e6e71 Removed a couple of duplicate files. 2011-09-02 00:18:04 +03:00
magenoxx
8ec8be115c Fixed Issue 229. 2011-09-02 01:01:18 +04:00
BetaSteward
77ed081e70 fixed issue 206 - game over message is no longer modal 2011-09-01 10:54:25 -04:00
BetaSteward
c207060611 added preferences option to disable image check at startup 2011-08-31 22:52:20 -04:00
BetaSteward
f67aaf80cf add stack trace to error dialog 2011-08-31 22:30:18 -04:00
Loki
01e565f1ad [NPH] Rage Extractor 2011-08-31 20:13:23 +03:00
BetaSteward
f9cb39ea7e check for new card images when client starts 2011-08-31 11:28:21 -04:00
BetaSteward
7f93ddbf80 ensure that popupContainer gets closed with game ends 2011-08-30 12:41:10 -04:00
magenoxx
9a2b9de6eb "End The Turn" button. Fixed Issue 234. 2011-08-30 20:30:03 +04:00
BetaSteward
7926fc5004 fixed issue 228 2011-08-29 13:06:25 -04:00
magenoxx
61229202f6 Made link copyable in ErrorDialog 2011-08-28 18:57:52 +04:00
magenoxx
6244e0ae3b Uncommented ErrorDialog 2011-08-28 18:56:19 +04:00
magenoxx
31d849ef46 Displaying top revealed card in client. PlayWithTheTopCardRevealedEffect. 2011-08-27 16:30:06 +04:00
BetaSteward
1828ad033d fix for EntersBattlefieldTapped in lite mode 2011-08-26 11:34:27 -04:00
BetaSteward
4a653d55cd show completed matches - view replays 2011-08-26 10:41:28 -04:00
BetaSteward
b09de12f23 Merge 2011-08-25 07:47:08 -04:00
magenoxx
39dea2890b Commented out Error Dialog for a while to fix compilation problems. 2011-08-25 11:21:56 +04:00
BetaSteward
d85bd073c7 missed ErrorDialog 2011-08-24 21:28:42 -04:00
BetaSteward
48d7afa375 catch spell and activated ability errors and rollback state - show error dialog on client 2011-08-24 12:59:51 -04:00
North
467d96179f Set added: Fifth Dawn 2011-08-24 13:19:46 +03:00
BetaSteward
aecdbe0778 added SimpleCardView - will reduce the amount of data passed between client and server 2011-08-22 13:54:55 -04:00
magenoxx
4eaf896cff saving client logs to both console and file 2011-08-21 23:20:30 +04:00
North
2f4bfdae29 Added Invasion and Planechase sets. 
Added Tempest lands.
Fixed Booster contents for Sets without lands.
 2011-08-21 19:33:10 +03:00
BetaSteward
2e0662e295 cleanup 2011-08-19 22:19:09 -04:00
North
bc85a9c4d6 Added Lorwyn and Morningtide sets. 2011-08-19 20:20:59 +03:00
BetaSteward
2ad50b2983 show Table Waiting dialog on reconnect 2011-08-18 22:47:12 -04:00
magenoxx
9a458ae9f2 Fixed redrawing during limited construction in deck editor (card didn't disappear). 2011-08-16 21:42:39 +04:00
magenoxx
251be500aa Added trim() for values in connect dialog 2011-08-16 21:41:32 +04:00
magenoxx
14bebea64d Moved card plugin to client. Fixed Issue 143. 2011-08-15 01:36:30 +04:00
magenoxx
ae52438c67 Fixed Issue 183 2011-08-14 12:19:49 +04:00
magenoxx
6c144b5fc2 Message of the Day. 2011-08-11 12:45:59 +04:00
magenoxx
6f12b1d87c UI changes for MOD. In Progress. 2011-08-10 19:00:35 +04:00
magenoxx
e92ccb7b2f Fixed Issue 42 2011-08-10 15:19:28 +04:00
magenoxx
cbf8f02df3 Compilation fix 2011-08-10 12:27:13 +04:00
magenoxx
86d27d84bb Closing dialog in feedback "Cancel". Displaying dialog on the center. 2011-08-09 13:08:55 +04:00
magenoxx
af2c69b449 Fixed too many pick ability dialogs opened. Fixed Issue 178. 2011-08-09 12:31:00 +04:00
magenoxx
9d45f1c9f5 [M12] AEther Adept 2011-08-09 01:07:23 +04:00
North
50d915169b Removed SOM from unimplemented list 2011-08-06 08:32:14 +03:00
magenoxx
024c506522 Changes UI needs for controlling turn. 2011-08-05 19:46:54 +04:00
magenoxx
b562f57a5c Fixed in controlling the turn. Mindslaver works now. 2011-08-05 16:49:13 +04:00
magenoxx
f3334c6e92 Possibility to view other player's hands in UI. 2011-08-04 21:51:00 +04:00
magenoxx
ed2926da88 hiding card tooltip on draft pick 2011-08-03 00:32:52 +04:00
North
e4620a7295 Added cards. 2011-08-02 21:48:57 +03:00
magenoxx
43312fcf1e draft: added hiding cards between picks, added displaying "Pick a card" message 2011-08-02 15:34:20 +04:00
magenoxx
ee352e3a9a Gaps between cards in draft grid picks. 2011-08-02 14:12:17 +04:00
magenoxx
b252dae313 Gray theme - similar to lite but with card images. Can be activated with -gray mage client command line parameter. 2011-08-02 11:45:42 +04:00
magenoxx
830664b834 Fixed Issue 193 2011-08-02 11:34:10 +04:00
North
b79728e1cc Added script for generating cards list for a set (for unimplemented cards listing) 
Updated resource files for unimplemented files
Updated method for reading from the new file format (unimplemented cards)
 2011-08-01 21:25:09 +03:00
magenoxx
798734dca2 Fixed images not displayed in draft. 2011-08-01 20:19:03 +04:00
Loki
053c3a76e6 fix formula 2011-07-31 23:07:39 +03:00
Loki
5f74002205 picks file parsing and new cards ratings 2011-07-31 21:54:35 +03:00
magenoxx
7b6548ca65 Fix. m12.txt. 2011-07-31 15:20:32 +04:00
magenoxx
8be91072de Displaying not implemented cards for M12. 2011-07-31 09:51:42 +04:00
magenoxx
819acaead5 Fixed concede action executed on space time to time. 2011-07-20 22:31:27 +04:00
BetaSteward
87ec2baab7 fix merge 2011-07-17 21:45:29 -04:00
BetaSteward
955e1c76b6 Merge 2011-07-17 15:55:25 -04:00
BetaSteward
9ddea9d9c5 Merge with version 0.8 2011-07-17 15:49:38 -04:00
magenoxx
bf80c2983b Skipping phases by space. Fixed Issue 58. 2011-07-17 21:24:08 +04:00
magenoxx
f65634796b Added an option to display non land cards in one pile. Fixed Issue 166. 2011-07-17 21:02:09 +04:00
magenoxx
21be56cae9 0.7.4 beta-2 -> 0.7.4 2011-07-17 13:44:59 +04:00
magenoxx
4ee06c2b85 ability picker: single click 2011-07-16 12:34:49 +04:00
magenoxx
cc5a76e62b Finished ability picker. +even dispatching. +fixed bug in horizontal scrool bar. 2011-07-16 12:17:22 +04:00
North
40ca005ec3 imports fix 2011-07-15 20:44:18 +03:00
magenoxx
e25d0acf90 import fix 2011-07-15 17:50:23 +04:00
magenoxx
616aea619d New ability picker (though not turned on yet) 2011-07-15 17:27:22 +04:00
BetaSteward
7f312ed453 reconnect to drafts and tournaments 2011-07-12 23:13:50 -04:00
magenoxx
dc3c3523f0 [deckeditor] import deck - logging list of not implemented cards during import (previously displayed in dialog box and couldn't be copied to send card request) 2011-07-07 13:11:36 +04:00
magenoxx
2fe5bff43d Flipped cards. 2011-07-06 09:33:53 +04:00
magenoxx
ef0a73f26d Made images path configurable. Fixed Issue 36. 2011-06-28 11:15:19 +04:00
BetaSteward
bdd8a2a28e separated User from Session - will be need for reconnecting 2011-06-27 21:50:35 -04:00
magenoxx
4d05d71aa3 Tab for card images location configuration. 2011-06-26 19:31:07 +04:00
magenoxx
e8dc1b659c Fixed TableWaitingDialog chat background. 2011-06-26 18:50:47 +04:00
magenoxx
fdbc9a78a5 import fix 2011-06-26 18:47:24 +04:00
magenoxx
74b9b53091 Fixed Issue 167. 2011-06-26 18:46:23 +04:00
magenoxx
51e3e238af New Preferences dialog. Option for big card images in hand. Fixed Issue 80. Fixed Issue 165. 2011-06-26 18:10:50 +04:00
magenoxx
ac9091d6ee Fixed Collection Viewer not displaying images since latest changes. 2011-06-26 15:36:45 +04:00
magenoxx
d52ff8e221 Forgot to commit class. 2011-06-26 14:45:38 +04:00
magenoxx
bdf091daaf Forgot to commit class. +NPE fix on disconnect. 2011-06-26 14:44:28 +04:00
magenoxx
021d3e1270 [deckeditor] Fixed Issue 163. Fixed Issue 164. Fixed Issue 168. Fixed issue with tooltips. 2011-06-25 20:55:00 +04:00
BetaSteward
b1408507cb added ping + code cleanup 2011-06-23 22:58:11 -04:00
magenoxx
a121913f22 Changed main phase message. 2011-06-23 11:41:23 +04:00
BetaSteward
bc5c97c560 update client version number 2011-06-22 23:19:06 -04:00