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

1286 commits

Author SHA1 Message Date
magenoxx
af2c69b449 Fixed too many pick ability dialogs opened. Fixed Issue 178. 2011-08-09 12:31:00 +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
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
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
BetaSteward
82654f10d5 fixed issue 103 - this should catch most card logic errors, log the error on the server and trigger a message on the client 2011-06-17 22:42:04 -04:00
magenoxx
dce59030ee redrawing in card selected in limited game 2011-06-17 22:52:10 +04:00
magenoxx
48e1b45091 [client] Phases (no interaction at the moment, only displaying) 2011-06-17 19:20:40 +04:00
magenoxx
51067b6e64 Some fixes for NPE. 2011-06-17 15:23:46 +04:00
magenoxx
7dc036ccee [deckeditor] done with list view for main and sideboard. (not tested in tournaments) 2011-06-17 13:55:34 +04:00
BetaSteward
a934d2733c Merge 2011-06-16 23:05:20 -04:00
BetaSteward
7b511c5e7a fixed Join game error 2011-06-16 23:01:30 -04:00
magenoxx
a315f09362 [deckeditor] list view in deck and sideboard, not finished yet. 2011-06-17 04:49:43 +04:00
BetaSteward
89770db58e UI changes + created lite mode (client without images) for remote desktop work 2011-06-16 14:56:35 -04:00
magenoxx
e40caef07b import clean up 2011-06-16 21:41:57 +04:00
magenoxx
992a3992b1 [deckeditor] updated card selector event handling. 2011-06-16 20:25:10 +04:00
magenoxx
cf931fd02e [deckeditor] Refactored card selectors according to MVC. As a result the list and gridcard view have shared filter and it is possible to search cards in gridcard view. 2011-06-16 19:58:36 +04:00
magenoxx
8230775e0c Updated version to 0.7.4 beta-2 2011-06-16 11:35:19 +04:00
BetaSteward
952b46bc1f fixed tournament not starting error 2011-06-15 23:24:36 -04:00
BetaSteward
c4a3a496aa moved Session to Mage.Common 2011-06-15 23:24:03 -04:00
magenoxx
bbb9e575eb Added synchronization in client session - fixes NPE on exit. 2011-06-15 23:11:05 +04:00
magenoxx
44b48a3722 Reduced font in feedback panel. 2011-06-15 23:08:57 +04:00
BetaSteward
c38804af5f rolled back changes since 0.7.3 R2 - going to switch client/server architecture 2011-06-14 23:09:18 -04:00
North
1f72804968 Load croped image from Wizard images. fixes display issue 
When resizing image to fit the BigCard panel, scale it to fit width.
The result is better.
 2011-06-14 22:13:22 +03:00
magenoxx
2a7b412a8c [client] new chat 2011-06-14 21:08:38 +04:00
magenoxx
8e788f3b32 updated about dialog. 2011-06-13 17:58:19 +04:00
magenoxx
bbfd775191 Added displaying not implemented cards of New Phyrexia to Collection Viewer. 2011-06-12 17:03:33 +04:00
BetaSteward
9d385c2ef9 moved some code out of EDT 2011-06-11 23:13:45 -04:00
BetaSteward
d46a421bfa fixed UI updates so that they are guaranteed to run in EDT 2011-06-11 23:13:15 -04:00
magenoxx
18a416d184 Change Mage version to 0.7.4-beta 2011-06-09 20:20:28 +04:00
magenoxx
b36aea3ed5 Commented out printing stack trace for mana symbols. 2011-06-09 16:36:28 +04:00
magenoxx
e29e2cd6dc Updated about dialog 2011-06-09 16:36:08 +04:00
magenoxx
a1905fcbca Added magefree.com to about dialog. 2011-06-09 15:45:42 +04:00
magenoxx
9421cec0ff Repaired mana symbol support in feedback panel. 2011-06-09 09:19:27 +04:00
magenoxx
3eb387b780 Feedback panel back to the left. Some more minor changes. 2011-06-09 09:09:02 +04:00
magenoxx
b2ba439a48 Playing with Client UI. 2011-06-08 21:18:09 +04:00
magenoxx
7ca04d4cf7 Additional panel on the bottom with the buttons linked to feedback panel (should be easier to use). 2011-06-08 20:13:51 +04:00
magenoxx
e0d1ab226f Added background color to hand area. 2011-06-08 19:03:22 +04:00
magenoxx
05759b2966 Net traffic compressing. Enabled by default. Can be disabled by -Dnocompress on server. 2011-06-08 18:45:57 +04:00
BetaSteward
19b518d389 suppress calls when tournament is not visible 2011-06-07 23:26:53 -04:00
BetaSteward
2ff280caa7 fixed bug when switching from game to another pane 2011-06-07 23:26:04 -04:00
BetaSteward
d8fca737fd added some client window management + suppress calls when TablesPane is not visible 2011-06-07 22:32:58 -04:00
magenoxx
b76c0e5b16 Serializing all net traffic (for tracking and optimization). 2011-06-06 23:30:57 +04:00
BetaSteward
872057c49a undoing some checkins from merge 2011-06-05 14:26:51 -04:00
BetaSteward
6cbd5369c3 Merge 2011-06-05 09:50:31 -04:00
BetaSteward
d6e239586b more client fixes 2011-06-02 23:09:21 -04:00
BetaSteward
3ef090b6f5 clean up imports 2011-06-02 23:06:33 -04:00
BetaSteward
8b1c463d35 big client update - moved Session to Mage.Common project, this will allow other clients to reuse connection logic 2011-05-31 23:01:07 -04:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
BetaSteward
ffc7b5bfd8 added tournaments - drafts are now a variant of tournament 2011-02-06 11:09:25 -05: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
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
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
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
8003a1073e SOM cards. 2011-01-24 02:50:58 +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
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
magenoxx
5252255891 [cl.viewer] Displaying not implemented cards (SOM only). There is issue with bigCard not always updated because constant UUID for not implemented cards ;(. 2011-01-09 22:41:52 +03:00
magenoxx
b73a2a58e3 Downloading images of not implemented som cards. 2011-01-09 21:40:21 +03:00
magenoxx
128a6600af [cl.viewer] repaint fix 2011-01-09 11:34:07 +03:00
BetaSteward
5c10e54b7d added missing parameter 2011-01-09 00:27:01 -05:00
BetaSteward
03e3be90d6 draft stuff 2011-01-08 23:54:32 -05:00
magenoxx
56eff16857 Collection Viewer. 2011-01-09 03:03:19 +03:00
BetaSteward
6bd05ecce0 Merge 2011-01-07 15:45:17 -05:00
BetaSteward
98d8a428a7 some more drafting stuff 2011-01-07 15:41:09 -05:00
BetaSteward
41bf33d107 sort cards in deck editor by name 2011-01-06 23:20:00 -05:00
BetaSteward
c67122b605 more draft stuff 2011-01-05 15:17:02 -05:00
magenoxx
5774a886fe [mage.client] again updated foil effect params. 2011-01-05 19:19:26 +03:00
magenoxx
b76fa3db0d [mage.client] because of slowness, turned off all foil animation for cards except bigCard. Changed range (left and right color offset) of the effect. 2011-01-05 19:12:46 +03:00
magenoxx
85f69e1520 minor fix 2011-01-05 13:19:52 +03:00
magenoxx
3cf90f2875 [mage.client] Foil cards support. For now have strange noise that is only with JInternalFrame, works for JFrame nicely so possibly will need to reimplement all dialogs. 
For now every 5 card is a foil and the property is not attached to the card and may differ in various zone (need to change card entity).
 2011-01-05 13:14:39 +03:00
BetaSteward
7bea472fff initial drafting stuff 2011-01-03 23:52:28 -05:00
magenoxx
d1ca72d0e7 New Deck Generator that builds stronger random decks + better mana fixing. 2010-12-30 00:46:38 +03:00
BetaSteward
e460b9af20 fixed some match problems 2010-12-29 15:00:18 -05:00
BetaSteward
4b26727d71 changes to support multi-duel matches and sideboarding 2010-12-28 23:34:06 -05:00
magenoxx
10f365254d MageFrame code cleanup. 2010-12-28 15:40:28 +03:00
magenoxx
33d29bcdac fixed bug in pvp phase stops (now based on uuid, not player's name) 2010-12-28 13:32:25 +03:00
BetaSteward
5df3a6e488 removed bad import 2010-12-26 20:42:09 -05:00
magenoxx
7bc6a97a44 [deck.generator] Added Set.findCard(name, random). Now decks contain random basic lands (against previous M11 only). 2010-12-26 22:38:22 +03:00
magenoxx
3123207b0d New tooltips. 2010-12-26 18:40:28 +03:00
BetaSteward
6ae4ac3c5e changes to support matches 2010-12-26 00:34:34 -05:00
magenoxx
9b72097827 Fixed Phase stops (skipped possibility to response to spells and abilities if phase was off) 2010-12-25 23:48:56 +03:00
magenoxx
b9eba43ccf New feedback panel (supports mana symbols). 2010-12-25 22:52:16 +03:00
magenoxx
faa09b45b7 [deck.generator] Removed basic lands from non basic land cardpool. 2010-12-25 22:50:39 +03:00
magenoxx
55957f17a0 Fixed Issue 15: Graveyard card list becomes unavailable 2010-12-22 00:17:18 +03:00
magenoxx
0a26f595a7 Changed version for splash screen. 2010-12-21 23:35:27 +03:00
magenoxx
1a0d10f563 Separated delay timing for tooltip (to give some time for jeditorpane to reload html) 2010-12-21 22:46:09 +03:00
magenoxx
85c24cd66b Changed version from 0.5 to 0.5.1 (for release) 2010-12-21 22:34:47 +03:00
magenoxx
642512f157 Return back JFrame.MAXIMIZED_BOTH 2010-12-21 22:34:05 +03:00
magenoxx
760f059fb8 Rewrote displaying tooltips (fixes grayed rectangle bug and wrong tooltip location on the edge). 2010-12-21 18:20:54 +03:00
magenoxx
caae384903 3 color decks in deck generator color chooser. 2010-12-21 15:23:07 +03:00
magenoxx
4efdb15f9c Sort set names in deck editor (by name). 2010-12-21 13:40:25 +03:00
BetaSteward
c9d34c4422 cyrillic alphabet not installed in my IDE 2010-12-16 23:25:14 -05:00
BetaSteward
ba8532ea86 deck format change 2010-12-15 23:50:52 -05:00
magenoxx
94d883b5ba New tooltips (support delayed displaying, mana and tap symbols, styled text). 2010-12-15 07:14:35 +03:00
magenoxx
1a945de4de One more compilation error fix. 2010-12-14 21:31:42 +03:00
magenoxx
a006f37457 Fixed wrong import (compilation error fix). 2010-12-14 21:25:21 +03:00
magenoxx
49e44b92b1 [card.plugin] Added card info panel. At the moment can be seen only in deck editor with -DtestCardInfo VM parameter. 2010-12-14 19:33:30 +03:00
magenoxx
62aa6af269 Fixes in phase stops. 2010-12-13 03:33:51 +03:00
magenoxx
e45efd0527 DeckEditor: draft mode, removing card for cardpool and no possibility to return card back. 2010-12-13 00:26:39 +03:00
magenoxx
100a0a54e1 CardsList: replaced mouseClicked by mousePressed (better interaction). 2010-12-12 23:39:50 +03:00
magenoxx
b26db98817 Phase stops - done. 2010-12-12 17:02:24 +03:00
magenoxx
8a454d38a7 Fixed NullPointerException thrown time to time for ability picker shown for cards in hand. 2010-12-12 11:15:57 +03:00
magenoxx
10799024be Phase stops dialog (not finished yet). 2010-12-11 10:57:27 +03:00
magenoxx
850f931bc7 Fade in\fade out effects for adding and removing permanents. 2010-12-09 22:14:19 +00:00
magenoxx
55eba04697 r484 broke arrows for Abilities in the stack. Fixed. 2010-12-09 11:06:51 +00:00
magenoxx
168c8dc294 Fixed DeckGenerator that included rated cards that didn't fit chosen colors. 2010-12-09 09:08:09 +00:00
BetaSteward
b2d9c3b344 fixes 2010-12-09 04:55:01 +00:00
magenoxx
e45a8ad1e0 Using ability UUID for stack view as a key for cards added on the panel. 2010-12-08 17:59:55 +00:00
magenoxx
14b8069afc Fixed Issue 41. Made title displayed on the center. 2010-12-08 16:21:16 +00:00
magenoxx
b20b572f60 Fixed Deck generator that put very high rated cards even if they didn't fit the selected colors. Fixed bug in grouping attachments. 2010-12-05 14:08:55 +00:00
magenoxx
881f162056 Setting "Limited" deck type as default. 2010-12-05 09:02:26 +00:00
magenoxx
50df25489e DeckGenerator started to use card ratings to build more strong decks. 2010-12-05 08:42:15 +00:00
magenoxx
f93fd2feeb Rating cards on client using Mage.Rate.Plugin results. 2010-12-05 08:41:28 +00:00
magenoxx
96ed56638d Fixed last card in hand not displayed at full size. 2010-12-05 06:56:45 +00:00
BetaSteward
63d1710cb7 fixed issue 36 2010-12-05 03:36:59 +00:00
magenoxx
cb3e454002 Fixed test mode (Issue 35): now uses server test mode state. 2010-12-04 20:20:27 +00:00
magenoxx
9306d94ad2 Increased h.scroll speed for cards in hand. Made client maximized on startup. 2010-12-04 20:17:15 +00:00
magenoxx
e2955de950 Done - Issue 35: Hide Quick Start button 2010-12-04 16:40:30 +00:00
magenoxx
92dc74634b Application icon. 2010-12-04 15:07:10 +00:00
magenoxx
7f65397ac5 missing class fix. 2010-12-04 10:09:46 +00:00
magenoxx
5fa07209ea Mage title on startup screen. Please give feedback (will remove if you don't like it). 2010-12-04 10:04:15 +00:00
magenoxx
8193502a6e Moved ImagePanel class to common (as used in three modules). Replaced startup background by the image used in tablespane and deckeditor. Changed table background color from black to white. Reuploaded plugins. 2010-12-04 09:23:19 +00:00
magenoxx
fe3903d825 Replaced mouseClicked by mousePressed everywhere (works betters). Rebuild everything. 2010-12-04 09:02:57 +00:00
magenoxx
4c8344a8fd Compilation error fix: removed unused import. Sorry for one of my previous commits. 2010-12-04 07:54:24 +00:00
magenoxx
fdfb7efa5f Background for deck editor, the same as for table. 2010-12-03 16:27:25 +00:00
magenoxx
9242b72910 Issue 34 fix. But "Conqueror's Pledge" name is wrong (another bug). You may check console log for that card (Added logging to CardsStorage). 2010-12-03 05:24:54 +00:00
BetaSteward
53d7e5623b send list of targets to client 2010-12-02 04:39:18 +00:00
magenoxx
36f512de71 Checking for server connection after frame was displayed. 2010-12-01 22:01:34 +00:00
magenoxx
770e5673f5 Now random decks contain non basic lands. 2010-12-01 21:55:37 +00:00
magenoxx
eff9aa95d5 Removed timing for displaying popups as it causes problems. Create corresponding task in Issue log for next release (0.6). 2010-12-01 09:06:08 +00:00
magenoxx
1fcac53bf7 Updated mageactioncallback. Commented out popups for a while (not always work correctly). Added delayed viewer. 2010-12-01 06:57:23 +00:00
magenoxx
0721c843d2 added transfer data object to mouseExited. added desktoppane to ui components references. 2010-12-01 06:17:54 +00:00
magenoxx
6d589abe6d Removed MessageBox displayed after deck was generated. removed splash screen closing (caused exception time to time). updated plugin. 2010-11-30 21:04:53 +00:00
magenoxx
30b341f7d9 Mana symbols in ColorsChooser for deck generator. 2010-11-30 18:14:15 +00:00
magenoxx
0ee0661e5c fix for popup (but still is blinking) 2010-11-30 17:11:08 +00:00
magenoxx
2987d15b4e Aded Random deck generation to Mage.Client start up dialog. Also now all cards on client can be fetched using CardsStorage.getAllCards() method. 2010-11-30 16:16:54 +00:00
magenoxx
791ce58b23 Fix for splash screen being null (NullPointerException). 2010-11-30 08:13:56 +00:00
BetaSteward
3ca748e16d fixed issue 25 - server waits for all clients to confirm initialization before starting game 2010-11-30 04:35:26 +00:00
magenoxx
f81c238994 Updated About Dialog. Added mage version on splash screen. 2010-11-29 22:24:30 +00:00
magenoxx
937ddf79a2 Chat panel is one touch resizeable. Minor fix for delayed popup. Added sorting layout on BattlefieldPanel resize. 2010-11-29 21:59:21 +00:00
magenoxx
fa2a2888e1 Delay for card tooltip (0,5 sec). 2010-11-29 21:00:12 +00:00
magenoxx
aea2fc2fcf Not displaying tapped for combat dialog. 2010-11-29 20:56:03 +00:00
magenoxx
0211787433 Fixed arrows displayed under dialogs. Since now card.plugin is used in ShowCardsDialog. Added sourceCard to AbilityView (required for source arrows). 2010-11-28 21:10:31 +00:00
magenoxx
8c2d5fcafb Replaced nimbus standard desktop pane background image by background.jpg. 2010-11-28 19:22:34 +00:00
magenoxx
3368f63161 Added splash screen on Mage.Client startup. Use VM arguments: -splash:splash.jpg if you want to see it. Removed unused hardwoodfloor.png from resources. 2010-11-28 12:23:04 +00:00
magenoxx
11bec637ee StartMultiGamesTest and class for getting access for Mage.Client GUI components. 2010-11-28 10:14:53 +00:00
magenoxx
8b77a67574 Added junit test that starts Mage.Client and starts 10 games in a row. Minor fixes. Client is maximized now. 2010-11-28 10:13:54 +00:00
magenoxx
e36d4e57e1 [card.plugin] Added sickness image. At the moment there is no way to determine whether permanent has sickness on client - so for a while all creatures will ALWAYS have sickness image displayed. 2010-11-27 16:17:01 +00:00
magenoxx
03cb41f2aa Now StackAbilityView has sourceCard. Added displaying source card for abilities. Fixed arrows offsets. Added "source" blue arrows (target arrows are red). Fixed NullPointerException happen for AbilityPicker. Fixed random order of spells in stack. Code clean up. 2010-11-27 15:29:48 +00:00
magenoxx
32547a3f4e Fixed ui bug: enchanted or equipped permanent changing location on battlefield on every update. 2010-11-27 08:45:59 +00:00
magenoxx
2aad7682bd Removed white rectangle at startup in big card. Changed gaps between components a little. 2010-11-24 14:41:45 +00:00
magenoxx
ff0f66c003 Moved card description component on top. 2010-11-24 14:33:28 +00:00
magenoxx
c650c43f94 [card.plugin] Symbols support: download and display. Please try it, if you don't like it, will remove or make configurable. Thanks to SillyFreak (Laterna Magica) for GathererSymbols downloader code. 2010-11-24 08:20:46 +00:00
magenoxx
d0d718c0da Fixed the blinking of battlefield layout. 2010-11-23 13:42:24 +00:00
magenoxx
b1858396a5 Fixed NullPointerException in case card wasn't found by name. Fixed CardGrid (didn't removed mage card if card plugin was used) 2010-11-22 16:45:26 +00:00
magenoxx
b94dad6c2c [card.plugin] enchant creatures and equipments displaying works now. 2010-11-22 14:35:45 +00:00
magenoxx
6cfabc7490 [card.plugin] arrows now work either 2010-11-22 14:00:33 +00:00
magenoxx
08d020d998 [card.plugin] now replaces cards in deckeditor if used. removed debug logging. 2010-11-22 13:02:36 +00:00
magenoxx
b501b10f9a [card.plugin] unified mouse adapter. now tooltips should work. 2010-11-22 12:36:37 +00:00
magenoxx
ec51f30d37 some fixes. 2010-11-22 03:53:34 +00:00
magenoxx
63d8231928 [card.plugin] now cards displayed on hand and stack (some stuff still needs to be updated). PLEASE DO REBUILD PLUGIN IF U USE mage-card-plugins.jar. 2010-11-21 13:02:55 +00:00
magenoxx
c0139976bf [card.plugin] Copied tooltips from Mage.Client\Card. Moved TextPopup to Mage.Common. Need to rebuild mage-card-plugin.jar if you use it. 2010-11-19 16:19:11 +00:00
magenoxx
7ac7fe1087 Should have fixed blinking issue and synchronization stuff for mouse over card displaying. 2010-11-19 15:39:41 +00:00
magenoxx
e893935ce6 Added title to Mage.Client. Forgot to commit utility class on previous commit. 2010-11-19 15:10:50 +00:00
magenoxx
3a0fd73854 [card.plugin] Displaying JXPanel in case there is no image. 2010-11-19 15:10:04 +00:00
magenoxx
502b21fddb Now if there is big image (card.plugin), rules box is not displayed. 2010-11-19 09:01:47 +00:00
magenoxx
4d0a5c899e [card.plugin] Fixed permanent not deleted and drawn over other cards. No need to rebuild jar. 2010-11-17 07:08:35 +00:00
magenoxx
9c4fb8ed90 Now there plugin updates table dialog. Updated mage-theme-plugin.jar in Mage.Client. 2010-11-16 23:32:51 +00:00
magenoxx
a731fba667 Made a hack for Nimbus LAF to add transparency to JInternalFrames. Updated CombatDialog. Updated Mage-Theme-Plugin (jar) with background. Fixed "Games played:" title length, so game count can be seen for big numbers. 2010-11-16 18:31:10 +00:00
magenoxx
b143a5a44d Done Issue 16: Games played counter plugin. 2010-11-14 17:01:12 +00:00
BetaSteward
437bdaca7f added mwDeck and txt deck importers 2010-11-14 04:22:31 +00:00
BetaSteward
95cd28cb22 fixed decks and deck loading in editor 2010-11-13 16:25:16 +00:00
magenoxx
e4c01b0693 Small fixes: returned text component in card plugin for rules. Removed debug logging. Fixed NullPointerException for attached cards. 2010-11-13 06:47:50 +00:00
BetaSteward
5acf46bb60 updated sets and added booster packs - commented out planechase set 2010-11-11 04:38:36 +00:00
BetaSteward
1ed7b3f486 fixes and new server plugins 2010-11-07 03:11:36 +00:00
magenoxx
beb37db93a should be more smooth now. 2010-11-06 22:42:44 +00:00
magenoxx
5771691972 [card.plugin] first version (at the moment replaces only cards on battlefield) (should be installed manually) 2010-11-06 21:23:21 +00:00
BetaSteward
46656f19b5 fixed cardNumber for permanents 2010-11-06 01:54:24 +00:00
magenoxx
ad50277430 ... 2010-11-05 15:53:24 +00:00
magenoxx
d9686a0a9b Fixed interfaces. Some changes to mouse handling (commented out for a while). 2010-11-05 12:47:37 +00:00
magenoxx
48e3a65d3a Card Plugin implementation. Added displaying card and card layout. 2010-11-03 17:33:51 +00:00
Loki
b223d83be5 fix card images displaying in linux 2010-11-03 13:23:23 +00:00
magenoxx
2b44ff0d69 deleted class previously moved to Mage.Common. 2010-11-03 07:01:12 +00:00
magenoxx
9eb8b0e487 Interfaces and abstract classes for Mage.Card.Plugin. Replaced creating permanent by calling plugin manager that returns old implementation but new is also possible since now. 2010-11-03 06:59:55 +00:00
magenoxx
b356d2c7c1 [plugins] Added plugins support to Mage.Client (jspf). Created Mage.Theme.Plugin. Please run Mage.Client/install_3d_party_libs.sh (.bat) once to put library to local maven repository. 2010-10-31 12:44:34 +00:00
magenoxx
4d6c70e390 Not sure this is correct handling, but spent 2h because of missing exception in the logs when jar is missing or path is not correct. 2010-10-30 17:37:01 +00:00
BetaSteward
93120eedea fixed some timing errors 2010-10-29 01:59:45 +00:00
magenoxx
875614b96c Added multitarget arrows (Fireball). 2010-10-28 11:52:54 +00:00
BetaSteward
3a784f59ee ... 2010-10-28 03:19:26 +00:00
magenoxx
80d16d5f28 new texture for background. 2010-10-22 14:58:57 +00:00
magenoxx
a271ee7107 Image from Incantus as background texture. Looks much better than previous one. Will be configurable latter. 2010-10-22 14:18:29 +00:00
magenoxx
05fa7f20e5 Minor change for getting texture. 2010-10-22 14:04:20 +00:00
magenoxx
f775f7c511 Moved /src and /resources to maven stardard /src/main/java and /src/main/resources. Hope it's ok, if not I'll revert. 2010-10-22 12:40:50 +00:00