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

459 commits

Author SHA1 Message Date
BetaSteward
14891b1b77 added deck validation feedback to client + queue all RMI messages 2011-05-31 00:10:44 -04:00
BetaSteward
b676e59001 more client server improvements 2011-05-29 23:52:02 -04:00
BetaSteward
3311f6a1f3 perform connection in background thread - allows user to cancel 2011-05-29 23:51:15 -04:00
North
569191a55a Removed getArt and everything related to it. 2011-05-30 00:07:02 +03:00
magenoxx
84b79000ff Phyrexian mana support. NPH: Mutagenic Growth, Dismember. 2011-05-29 23:12:21 +04:00
magenoxx
e438d81740 fix in card list 2011-05-25 19:23:45 +04:00
BetaSteward
e38111072d fixed some annoying client errors 2011-05-25 00:17:00 -04:00
BetaSteward
892f7cce1b client/server overhaul - tested on localhost, remote testing pending 2011-05-24 23:52:26 -04:00
BetaSteward
975ce7ba21 added reconnect dialog - not quite finished 2011-05-20 23:29:12 -04:00
BetaSteward
89f6e18c90 switched logging to log4j 2011-05-20 23:26:37 -04:00
BetaSteward
5621b8a518 fixed bug that prevented joining a game 2011-05-20 23:24:26 -04:00
magenoxx
e1aa3c0587 Fixed green M11 Starter Deck (had no lands). 2011-05-20 17:56:48 +04:00
magenoxx
935bf45c57 Enhanced deck generator: monocolor decks, card pool 3 times bigger, bonus for multicolored cards, no duplicate cards. 2011-05-20 16:40:16 +04:00
Loki
1eb65e8d13 update Launch4j configuration 2011-05-20 11:26:24 +03:00
BetaSteward
e841ed0cf8 TableWaitingDialog is not closeable and stays on top 2011-05-19 21:34:31 -04:00
magenoxx
f9fdeeb5a9 Update version in client. Updated AboutDialog. 2011-05-20 00:43:46 +04:00
magenoxx
74c7feb470 Moved version to 0.7.3 in pom files. 2011-05-19 23:49:43 +04:00
magenoxx
4133a13120 Non modal tablewaiting dialog (allows to chat, to create several games). Pressing "Join" causes all your games appear on top. Updated logging. Fixed removing table not working (but not fully, as game ending still doesn't work). 2011-05-19 20:07:34 +04:00
magenoxx
8d45a9465e Added using remembered password in autoconnect. 2011-05-19 14:00:13 +04:00
magenoxx
2695f584be Made proxy password hidden (JPasswordField). Added remembering username and password in preferencies. 2011-05-19 13:59:21 +04:00
magenoxx
2efe38b96b Fixed proxy authentication: previous type wasn't discarded (so http didn't work). 2011-05-19 13:56:53 +04:00
magenoxx
67ec4bf3bd dependency for form editor 2011-05-19 13:12:02 +04:00
magenoxx
31e6132f2f Fixed "cheat" button displayed not only in test mode. 2011-05-19 13:11:25 +04:00
magenoxx
1e92d061e5 Fixed autoconnect(). Fixed not disabling button on autoconnect exception (Fixed Issue 124). 2011-05-19 12:51:43 +04:00
magenoxx
31585f73b1 Deck Editor: moved sideboard to bottom of deckarea (because of problems with horizontal scrolling for jlayeredpane inside jscrollpane I couldn't manage (it's known problem for Swing)). 2011-05-19 08:58:59 +04:00
magenoxx
ffd0404089 Deck Editor: adding cards by double click in list view. Not discarding selection in Constructed Mode. 2011-05-19 06:29:15 +04:00
BetaSteward
94c5a0cdfb client + server improvements 2011-05-17 21:55:20 -04:00
BetaSteward
21b7ad8808 added HTTP proxy - fixes issues 77 & 78 2011-05-16 22:58:58 -04:00
magenoxx
d32a8e041f Multi thread image downloading. Fixed Issue 18. 2011-05-17 02:38:48 +04:00
magenoxx
da574fa967 Collection Viewer: added displaying unimplemented cards for ZEN, WWK, ROE. 2011-05-17 01:32:16 +04:00
magenoxx
9551a38d5c Displaying connected players. (but smth wrong with net beans form editor, will take a look at later) 2011-05-16 22:02:45 +04:00
magenoxx
2e331f2481 Now AI default skill is 10. Made skill checkbox wider (didn't fit "10" value in Nimbus LAF). 2011-05-15 13:06:43 +04:00
magenoxx
4b832aa974 Added additional logging to cope with Issue 102. 2011-05-15 08:43:44 +04:00
BetaSteward
0e66c5e030 retrying without jars 2011-05-14 23:39:41 -04:00
BetaSteward
a4c3deb7ac Backed out changeset: 83cb579a3761 2011-05-14 23:32:22 -04:00
BetaSteward
473f6bcad9 fixed client/server ping + added server console 2011-05-14 23:28:07 -04:00
magenoxx
f193659d3e It was M, not space symbol. One more fix for M11 deck names. 2011-05-13 23:40:19 +04:00
magenoxx
d946e3cc6d Fixed names in M11 decks. 2011-05-13 23:38:53 +04:00
magenoxx
e6b1cf6824 Merge 2011-05-13 23:36:02 +04:00
magenoxx
9d1b4212a4 M11 Starter Decks (thanks to soulless) 2011-05-13 23:34:55 +04:00
magenoxx
54adc043ec Getting information about connected players in Mage Client (without gui part at the moment, only logging to console). 2011-05-13 20:25:46 +04:00
BetaSteward
da316cc345 fixed Issue 76 2011-05-12 21:20:07 -04:00
magenoxx
92d42c16b5 Backed out changeset: b5d9cea65b73 2011-05-12 09:20:19 +04:00
BetaSteward
ab599dd335 added client/server ping + remove inactive connections from server 2011-05-11 22:08:11 -04:00
magenoxx
57193b3723 Added missing set symbols displayed in tooltips. 2011-05-11 21:49:05 +04:00
magenoxx
c0da5e1fa0 Updated mage-card-plugin. 2011-05-11 21:24:34 +04:00
magenoxx
f78b4017bf Added support for looking at cards (Jace, The Mind Sculptor 2nd ability). Fixed Issue 50. 2011-05-11 21:24:17 +04:00
magenoxx
50b60c0c19 [deck.editor] fixes. 2011-05-11 20:30:03 +04:00
magenoxx
560346251d [deck.editor] Table View: "Add to Main", "Add to Sideboard" buttons. Searching by name and in card rules. 2011-05-11 19:58:01 +04:00
magenoxx
21c22dba9c [deck.editor] Fixed splitter resizing issue (jdk bug: setting divider location doesn't work before first paint). 2011-05-11 18:57:43 +04:00
magenoxx
f66fd8fc97 [deck.editor] Switching between card selectors. Displaying cards from the list. --All sets-- option to show all cards at once (appears only in CardTableSelector). 2011-05-11 17:52:16 +04:00
magenoxx
6e3a7ede39 Advanced card image loading: thumbnails (slow on first run). Updated mage-card-plugin. Disabled foil cards. 2011-05-11 17:17:15 +04:00
magenoxx
539cf2552f Deck Editor: CardTableSelector. Done, but not in place yet: need to add buttons to add cards to deck and sideboard as well as switching between two card selectors. 2011-05-11 09:41:54 +04:00
BetaSteward
b9eac322d2 added additional logging + keep session alive for most connection errors 2011-05-10 23:57:47 -04:00
BetaSteward
0dff1ac743 use SwingWorker instead of Timer - greatly reduces lag 2011-05-10 23:54:29 -04:00
Loki
4d15d3f6ae missed ico 2011-05-10 19:00:36 +03:00
Loki
28a5151131 update Launch4j 2011-05-10 18:25:22 +03:00
magenoxx
59cf5a2646 Remembering generated deck and using it in next game. 2011-05-10 15:25:40 +04:00
magenoxx
3f2bd1800d Default game name in NewTableDialog (its annoying to type it over and over). 2011-05-10 15:04:14 +04:00
BetaSteward
017b2b4339 remove games from list when finished + added name and owner to tables 2011-05-09 23:02:54 -04:00
BetaSteward
2f515e242b fixed Issue 64 2011-05-09 22:58:40 -04:00
North
de8c30d76d Mage.Tests/pom.xml parent version updated 
MageBook.java Strings equality check changed to equals
 2011-05-09 22:16:08 +03:00
magenoxx
1651e0100d Commented out the Challenges Mode as it won't be ready before forthcoming release. 2011-05-09 01:38:57 +04:00
magenoxx
f080943426 Now players can find public servers using our (dynamic) list. 2011-05-09 01:26:26 +04:00
BetaSteward
4862053a25 fixed Issue 52 2011-05-08 16:25:40 -04:00
BetaSteward
aad92334aa fixed Issue 43 2011-05-08 15:57:23 -04:00
BetaSteward
6cda7ea076 fixed NPE in Deck Editor when not connected to server 2011-05-08 12:35:13 -04:00
BetaSteward
c87328d08e skill setting is now used by AIs 2011-05-07 23:16:00 -04:00
magenoxx
31e5dff618 Fixed UnknownHostException that appeared if space existed in server address (user report) 2011-05-07 19:37:12 +04:00
magenoxx
7c49bc5ce7 Fixed Mage.Tests dependency. Fixed import in MageJDecktop class. 2011-05-07 19:33:02 +04:00
BetaSteward
1fef6e6bb4 added client proxy settings + other fixes 2011-05-05 23:06:19 -04:00
BetaSteward
b81938210a changes for public server 2011-05-04 23:18:13 -04:00
Loki
1fdc50570f add initial Launch4j support and one card 2011-04-29 23:54:16 +03:00
magenoxx
be2fdd6487 Challenge Mode. In progress. 2011-04-29 20:32:22 +04:00
BetaSteward
86f708b17a detect client version + client changes for AI skill level 2011-04-28 22:52:52 -04:00
magenoxx
b639380f87 Fixed bug in client for servers without AI support. Updated card ratings. 2011-04-15 17:57:25 +04:00
magenoxx
9f58382d6d Updated version on empty image. 2011-04-15 10:30:52 +04:00
magenoxx
6670b9c916 face4.jpg 2011-04-15 08:32:34 +04:00
magenoxx
417a501f67 fix case collision 2011-04-15 08:29:11 +04:00
magenoxx
5e93c35c37 one more rename. 2011-04-14 16:57:01 +04:00
magenoxx
b7795f33e9 Renamed wrong names for avatars. 2011-04-14 15:20:19 +04:00
magenoxx
1d7328a869 Renamed wrong names for avatars. 2011-04-14 15:18:02 +04:00
magenoxx
b42e056750 [Collection viewer] Drawing set name on the tabs (vertical for selected and normal for tabs without images). 2011-04-10 11:25:25 +04:00
Loki
9cbba501f1 fix downloading for guru lands 2011-04-03 18:13:49 +03:00
BetaSteward
74bdfb9ea7 updated to version 0.7.1 2011-04-02 23:10:02 -04:00
BetaSteward
84c6ab76e0 update to version 0.7 2011-04-01 21:05:43 -04:00
magenoxx
fb8cd79b59 More efficient use of background image. Now Mage takes much less memory. Also updated plugins in Mage.Tests. 2011-04-01 17:35:38 +04:00
BetaSteward
35f0767f1b fixed replay + some other fixes 2011-03-18 18:27:01 -04:00
BetaSteward
42509dd4f8 optimizations + leave game fix 2011-03-10 22:05:15 -05:00
magenoxx
93496b38c5 Fixed arrows for multi games. 2011-03-06 02:09:04 +03:00
BetaSteward
4f06f78621 UI fixes - can now play simultaneous games 2011-03-04 22:46:56 -05:00
BetaSteward
0013f19fd5 UI fixes 2011-02-26 00:14:15 -05:00
BetaSteward
51a9c03ed1 additional fixes + some missed files 2011-02-24 22:02:32 -05:00
BetaSteward
d1f0f5bf43 add card sorting to draft screen 2011-02-24 21:56:47 -05:00
BetaSteward
8f2e4f09b6 allowing sorting by piles in deck editor 2011-02-21 00:21:20 -05:00
BetaSteward
659f790325 AI fixes and deck construction 2011-02-18 23:22:31 -05:00
BetaSteward
f8a26d4e7e sub-sort on name when editing decks 2011-02-13 23:48:43 -05:00
BetaSteward
fabcc28e46 more draft/sealed fixes 2011-02-13 08:20:14 -05:00
BetaSteward
d217d332b6 added sorting and counts to deck editor 2011-02-11 22:57:22 -05:00
BetaSteward
f7ffbb4773 added Sealed tournaments 2011-02-10 22:00:47 -05:00
BetaSteward
e2fd0299c7 fixed multi-human drafting 2011-02-08 11:34:28 -05:00
Loki
6d188d76d7 some cards, start effects moving 2011-02-07 22:09:47 +02:00
BetaSteward
ffc7b5bfd8 added tournaments - drafts are now a variant of tournament 2011-02-06 11:09:25 -05:00
magenoxx
725f0ad4a8 Added MBS (sets, Collection Viewer, Downloader). 2011-02-06 11:03:06 +03:00
magenoxx
2a2f3a0ceb Added MBS (sets, Collection Viewer, Downloader). 2011-02-06 11:02:11 +03:00
magenoxx
5f4454c1e4 Change version to 0.6.1 2011-02-05 01:34:38 +03:00
BetaSteward
8952c96e1e fixed Swing deadlock 2011-02-04 14:36:30 -05:00
magenoxx
93f35535af Fixed wrong versions in poms. 2011-01-31 18:37:30 +03:00
magenoxx
a99be05446 Fixed tooltip bug appeared after adding displaying counters. Updated card plugin. Hid New Draft button for release as drafting is not ready yet. 2011-01-30 19:01:26 +03:00
magenoxx
4cc14cb3ed Built\Updated card ratings. 2011-01-30 18:13:40 +03:00
magenoxx
f6b812bce1 Updated to version 0.6. Fixed and updated rate plugin. 2011-01-30 10:42:35 +03:00
magenoxx
2abc0e888d Reduced hand cards size. Removed battlefield card area gap (cards now have more place and are less reduced in size). 2011-01-29 20:03:22 +03:00
magenoxx
93878d4868 Displaying player's poison counters. Displaying alls counters info in tooltips. 2011-01-29 10:45:05 +03:00
magenoxx
76b1d94977 Reuploaded server plugins (caused targeting issue after previous commit). Enhanced Proliferate (now "Done" button is displayed instead of default "Cancel") 2011-01-28 00:30:05 +03:00
magenoxx
a1b2127962 Added options to gameclient target message. 2011-01-27 18:27:41 +03:00
magenoxx
883d1b373f Fixed closing combat dialog. 2011-01-26 00:11:05 +03:00
magenoxx
77e3b6812a fixes 2011-01-25 23:46:49 +03:00
magenoxx
8a21263e16 Fixed rate plugin. 2011-01-25 23:33:32 +03:00
magenoxx
e1f65eae90 Update mage rate plugin - now works with new cards. 2011-01-25 20:41:37 +03:00
magenoxx
4c8122ebbb Another fix for "NoSuchMethodError: mage.components.ImagePanel.<init>(Ljava/awt/image/BufferedImage;I)V" 2011-01-25 20:38:56 +03:00
magenoxx
6e82f194b9 Fixed "java.lang.NoSuchMethodError: mage.components.ImagePanel.<init>(Ljava/awt/image/BufferedImage;I)V" 2011-01-25 12:39:05 +03:00
magenoxx
522ecfad59 Fixed imports. Commented out "gameReveal" message handling. 2011-01-25 11:32:59 +03:00
BetaSteward
360bbc86b5 modifed revealed cards 2011-01-24 22:51:45 -05:00
BetaSteward
55feb4a320 missed GamePanel 2011-01-24 22:43:22 -05:00
BetaSteward
fcf1cd3d8d missed GamePanel 2011-01-24 22:40:38 -05:00
BetaSteward
812d1bc9c3 added Windows button to toolbar 2011-01-24 22:35:07 -05:00
magenoxx
6e7576abe7 fixed rate plugin. add builded executable jar to mage.client, but can't load card classes - seems because of class loading changed. 2011-01-24 10:22:32 +03:00
magenoxx
8003a1073e SOM cards. 2011-01-24 02:50:58 +03:00
magenoxx
e286f6ff72 Reduced jpg image for background (no visible effect but saves 115 Mb of memory used). 2011-01-23 22:15:26 +03:00
magenoxx
c23b065479 minor fix for tooltips 2011-01-23 19:10:50 +03:00
magenoxx
08a4aa4aea New game panel: new player info, centered hand, displaying poison counters, layout fix (Issue 25 fix), avatars, etc. 2011-01-23 14:41:57 +03:00
magenoxx
66c04db9f4 Displaying set images in tool tips. 2011-01-17 03:05:22 +03:00
magenoxx
a453d3a6ac [cl.viewer] using common set icons on tabs. 2011-01-15 00:51:48 +03:00
magenoxx
42812541b9 Added attacker to canBlock method. 2011-01-13 23:29:15 +03:00
magenoxx
7edffebb5d Separated DeckGenerator and DeckBuilder. Moved DeckBuilder to mage.common (will be used by ai to construct draft decks). 2011-01-13 19:53:24 +03:00
BetaSteward
cb73d4a25d added draft timing 2011-01-12 23:44:04 -05:00
BetaSteward
a48c7b1ff1 add land dialog for drafting deck construction 2011-01-11 15:52:54 -05:00
BetaSteward
f74df18cc9 still more Deck Editor changes 2011-01-11 15:51:57 -05:00
magenoxx
18b7b8c514 comment fix 2011-01-11 19:04:44 +03:00
magenoxx
7b48e9e0bf comment fix 2011-01-11 19:00:13 +03:00
magenoxx
d62d0c78f7 Now new (not rated) cards will have rating 6 (from [1;10] range) instead of previous 0 so will appear in generated decks much more often. 2011-01-11 18:55:48 +03:00
BetaSteward
f5fa87036c more deck editor changes 2011-01-11 00:03:07 -05:00
BetaSteward
6fcce4ab8b changes to support deck editor modes 2011-01-10 13:50:20 -05:00
magenoxx
90d826304a DraftGrid: repaint on new cards. 2011-01-10 21:46:19 +03:00
magenoxx
e9eb3231c3 DraftGrid: replaced double-click by single press. 2011-01-10 21:43:19 +03:00
magenoxx
c0004fd85c [SOM] Sunblast Angel, True Conviction, Salvage Scout. 2011-01-10 15:37:29 +03:00
magenoxx
c6b2cd8938 change paging sound to be the same for prev and next page 2011-01-10 14:08:04 +03:00
BetaSteward
c79758f0e5 added deck construction to draft 2011-01-09 23:33:22 -05:00
magenoxx
d62b512a72 Audio manager. Added playing sounds for paging in collection viewer. 2011-01-10 01:54:43 +03:00
magenoxx
5a0ca8025d [cl.viewer] bigCard update issue fix. 2011-01-10 01:34:32 +03:00