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
2160 commits 2 branches 0 tags 782 MiB
Commit graph

561 commits

Author SHA1 Message Date
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
magenoxx
c021a6fdb5 Fixed Mage.Client mvn dependency to point to latest mage-card-plugin version (caused build failing on new environment). 2011-08-02 09:47:44 +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
dc4fed493b Face down cards. Updated card plugin. [SOM] Clone Shell 2011-07-29 18:40:12 +04:00
Loki
f13c81398d 2 WWK 2011-07-24 00:29:44 +03:00
magenoxx
819acaead5 Fixed concede action executed on space time to time. 2011-07-20 22:31:27 +04:00
North
543eaf55c7 build fix 2011-07-18 23:14:06 +03: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
magenoxx
b707d11aa4 Decks by inok.goo 2011-07-16 01:24:19 +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
Loki
d91a950c0b fix missed varuiable in release config 2011-07-04 15:28:02 +03: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
Loki
2e92da3259 Caw Blade sample deck 2011-06-28 00:51:45 +03: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
BetaSteward
34cd3bbcdc fixed version 2011-06-22 22:32:33 -04:00
BetaSteward
a8b8d36637 updated pom files 2011-06-22 22:12:14 -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
97eea533f3 updated version (from 0.7.3 to 0.7.4) in all pom files 2011-06-16 11:39:20 +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
maurer.it
e13140b8b7 Modified the <productVersion> to be dynamic based on the project.version. 2011-06-11 21:50:51 -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
49fbca47f2 fixed starter decks - were failing standard validation 2011-06-02 23:13:25 -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
magenoxx
76181c4185 Fixed Germ token not displaying. Added MBS and NPH tokens to download. 2011-06-02 01:57:46 +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
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