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

418 commits

Author SHA1 Message Date
magenoxx
b9554ac31a Fixed EntityManager not setting arguments. Added class for calculating and displaying statistics. 2013-01-07 16:06:18 +04: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
4b2e6a8bc0 Redesigned handling of various art for cards. 2012-11-27 15:24:29 +01:00
LevelX2
153e3bc12e Fixed a bug, that images of basic lands in game were not displayed. 2012-11-26 00:25:39 +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
f017ab903c version bump to 0.10.0 2012-11-15 22:47:15 +13:00
LevelX2
14a4a786e8 Showing for modal spells on the stack, which mode was chosen by the caster. 2012-11-07 17:20:06 +01:00
North
f64149971a Merge branch 'CardRepository' 2012-11-05 19:37:51 +02:00
magenoxx
575cebad7f Displaying arrows for fixed targets in effects (for Jace, Architect of Thought first ability) 2012-10-24 17:45:55 +04:00
North
56a11f4da2 Replaced CardStorage references from MageFrame with CardRepository 2012-10-21 18:15:42 +03:00
LevelX2
7c44b16504 AbilityPicker shows abilities now always in the order they were defined on the object. 2012-10-10 20:43:18 +02:00
magenoxx
6b895d90cf Fixed Issue#46: Creature display order on the battlefield random 2012-09-07 21:11:24 +04:00
magenoxx
214dc7326d Removed random order in grave: Fixed Issue#45: Card display order in graveyard random 2012-09-07 20:54:23 +04:00
North
8ff5ddf9d4 Fixed build 2012-09-04 14:06:15 +03:00
Loki
46ec86b54c 0.9.2 dev 2012-09-04 21:24:44 +12:00
magenoxx
0758f4bb72 Fixed Issue#52 2012-08-31 12:43:46 +04:00
North
0589ef94cb [minor] Moved PLUGINS_DIRECTORY constant 2012-08-26 18:54:22 +03:00
Loki
85b31df2d5 Bump version to 0.9.1dev 2012-08-14 15:28:06 +12:00
North
38cfa14b34 updated pom 2012-07-19 22:49:13 +03:00
North
5d0a832642 cleaned pom files and updated sqlight dependency 2012-07-19 21:15:09 +03:00
magenoxx
b2cd3e75bd changed version from 0.8.7.dev to 0.9.0.dev 2012-07-18 15:59:07 +04:00
magenoxx
a293da3095 Fixed Issue#18: Unrecoverable error on server with copy tokens 2012-07-18 00:29:42 +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
fc2283898c [UI]Alt+E:enlarge card. New game panel layout (experimental). 2012-07-13 14:55:52 +04:00
magenoxx
5541fe4163 updated version from 0.8.6.r5 to 0.8.7 2012-06-29 14:56:13 +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
6b57822f40 Fixed Rebound 2012-06-25 10:10:07 +04:00
North
239a4fb100 [refactoring][minor] Replaced all tabs with four spaces. 2012-06-19 23:50:20 +03:00
magenoxx
0c785abb46 New way for displaying combat 2012-06-17 13:13:51 +04:00
magenoxx
48f2018af6 New stack dialog (experimental) 2012-06-16 19:33:03 +04:00
magenoxx
e34ee2e7f6 Added downloading and displaying emblem images 2012-06-13 09:48:10 +04:00
magenoxx
4393a55569 Added token type for displaying different images 2012-06-12 22:58:21 +04:00
magenoxx
9c8fe7268b Reworked emblems 2012-06-12 20:57:23 +04:00
magenoxx
2c175dadf4 Fixed random stack abilities display order in client 2012-06-05 17:26:17 +04:00
magenoxx
205710a777 New message on wrong client-server versions 2012-05-27 11:02:44 +04:00
magenoxx
5274472d7d minor changes in MageServer interface 2012-05-27 11:02:17 +04:00
North
06a185a3a5 removed unused imports 2012-05-26 20:08:39 +03:00
magenoxx
af2cfd8095 Refactoring 2012-05-26 21:00:47 +04:00
magenoxx
12b21abe52 changed version from 0.8.5 to 0.8.6 2012-05-25 19:04:40 +04:00
magenoxx
d15499748d Fixed 1,5 years old bug with battlefield scroll missing. Also removed unnecessary gap. 2012-05-21 21:55:04 +04:00
magenoxx
5a88f2750b Fixed bug in ManaPoolView 2012-05-20 15:58:18 +04:00
magenoxx
1bf0e216de Displaying tooltips and green arrows for paired creatures 2012-05-17 11:59:47 +04:00
magenoxx
fa0e623120 changed version from 0.8.4 to 0.8.5 2012-05-07 07:50:07 +04:00
Loki
a746ca680b [load] one place server ping 2012-05-06 23:40:37 +03:00
magenoxx
b88e7d7a4e Commented out the possibility to start embedded mage server 2012-04-30 19:03:13 +04:00
magenoxx
537c326789 [load] loading testing: added simple test for starting game by two players 2012-04-30 18:56:36 +04:00
magenoxx
96cfb51686 Extracted Session interface, moved implementation to SessionImpl 2012-04-29 19:03:08 +04:00
magenoxx
850103c694 upgraded jboss-remoting version from 2.5.4.SP2 to 2.5.4.SP3 2012-04-28 03:05:32 +04:00
magenoxx
d10385fad2 changed "already connected" state handling 2012-04-28 03:00:11 +04:00
magenoxx
3875c1f7c0 Changed component version from 0.8.3 to 0.8.4 (dev) 2012-03-25 12:16:46 +04:00
BetaSteward
48f5a469d4 fixes for monte carlo ai 2012-02-13 09:05:01 -05:00
magenoxx
10eb7955eb Displaying additional info from feedback db in test. 2012-02-13 01:49:01 +04: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
d813283c19 adding back recent changes - not quite sure how I managed to revert all this 2012-02-02 23:48:25 -05:00
magenoxx
3434dc1a97 Added User Feedback support. 2012-01-26 22:13:44 +04:00
magenoxx
e50de69420 compilation error fix. 2012-01-26 01:59:53 +04:00
magenoxx
b9a65e7c62 MageServerImpl refactoring. More event logging. 2012-01-26 01:50:08 +04:00
magenoxx
039d9663f0 ActionWithResult interface, ActionWithBooleanResult. 2012-01-26 00:38:45 +04:00
magenoxx
b0a1c07067 LogService. Added saving game started event to DB. Some refactoring. 2012-01-25 20:27:08 +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
8536d9d78d minor change in EntityManager 2012-01-25 18:09:42 +04:00
magenoxx
fd25002578 SQLite EntityManager 2012-01-25 14:26:37 +04:00
magenoxx
20402f1cad Initial sqlite support. 2012-01-25 02:07:23 +04:00
magenoxx
e901343aad Changed version exception message. Added logging about version difference on registering (for stats). 2012-01-24 12:17:50 +04:00
magenoxx
3f20b725db [MAD2.0] New scoring and undo system. Migrated draw cards action. 2011-12-25 11:42:32 +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
ba6508cbeb Updated component version from 0.8.1 to 0.8.2. 2011-12-09 13:15:07 +04:00
BetaSteward
550ad2bc69 another improvement to cannot connect message 2011-11-04 22:53:40 -04:00
BetaSteward
10e1469cfd improved cannot connect error message 2011-10-30 21:15:14 -04:00
Loki
a004ced17d artifactId to lowercase 2011-10-28 15:42:54 +04: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
North
27c8514d64 minor changes (removed unused imports, added @Override ...) 2011-09-24 22:37:53 +03:00
magenoxx
617374e13f fixed night card not displayed in the stack 2011-09-24 11:00:50 +04:00
BetaSteward
bbb4f8a346 fixed issue 255 2011-09-21 23:21:40 -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
magenoxx
65f444dbf8 NPE fix. 2011-09-18 18:28:05 +04:00
magenoxx
2d8948b8f6 Changed version from 0.7.5 to 0.7.6 2011-09-18 13:57:43 +04:00
magenoxx
e7bb796d48 Double-faced cards support 2011-09-17 16:47:28 +04:00
magenoxx
5bb236def0 Added -Ddebug.mage parameter for Mage.Client to disable timeout for debugging (got disconnected while debugging server code in IDEA). 2011-09-14 00:45:47 +04:00
BetaSteward
a3d1de7850 increate client ping period and timeout - reduces false disconnects 2011-09-11 22:16:06 -04:00
North
f1bf37bbd0 Fix for Avacyn's Pilgrim image download. 2011-09-11 22:58:18 +03:00
magenoxx
903dc0c5ef Added card transform in UI. For now for all cards. 2011-09-08 22:23:35 +04:00
magenoxx
33be6bd828 UserDataView. More custom avatars. 2011-09-08 10:41:52 +04:00
magenoxx
bf1a49dd0b Sending user data. Sending avatar to server on connect. 2011-09-07 21:18:58 +04:00
BetaSteward
d7e6b4560c fixed Issue 243 2011-09-06 09:37:05 -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
BetaSteward
fe79ee97a9 update deck every 5 seconds while constructing or sideboarding 2011-09-04 13:23:16 -04:00
magenoxx
0fbc805492 Lowered version from 0.8 to 0.7.5 for release. 2011-09-02 08:18:49 +04:00
BetaSteward
50a2edf80c added MageVersionException - needed for automatic client download 2011-08-31 11:32:59 -04:00
BetaSteward
f9cb39ea7e check for new card images when client starts 2011-08-31 11:28:21 -04:00
magenoxx
31d849ef46 Displaying top revealed card in client. PlayWithTheTopCardRevealedEffect. 2011-08-27 16:30:06 +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
BetaSteward
aecdbe0778 added SimpleCardView - will reduce the amount of data passed between client and server 2011-08-22 13:54:55 -04:00
BetaSteward
2e0662e295 cleanup 2011-08-19 22:19:09 -04:00
BetaSteward
2ad50b2983 show Table Waiting dialog on reconnect 2011-08-18 22:47:12 -04:00
BetaSteward
9bb0172cb8 fixed settings to make client ping server 2011-08-15 14:58:41 -04:00
magenoxx
6c144b5fc2 Message of the Day. 2011-08-11 12:45:59 +04:00
magenoxx
f3334c6e92 Possibility to view other player's hands in UI. 2011-08-04 21:51:00 +04:00
magenoxx
ed3f96c668 New ConditionalMana support. 2011-08-04 18:10:57 +04:00
magenoxx
ed2926da88 hiding card tooltip on draft pick 2011-08-03 00:32:52 +04:00
magenoxx
830664b834 Fixed Issue 193 2011-08-02 11:34:10 +04:00
magenoxx
ff32c1698b Fixed NPE and triggered abilities not working for tokens. 2011-07-30 10:52:41 +04:00
magenoxx
dc4fed493b Face down cards. Updated card plugin. [SOM] Clone Shell 2011-07-29 18:40:12 +04:00
BetaSteward
14d863a8f2 added modal abilities + Slagstorm 2011-07-20 13:42:27 -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
f65634796b Added an option to display non land cards in one pile. Fixed Issue 166. 2011-07-17 21:02:09 +04:00
magenoxx
2fe5bff43d Flipped cards. 2011-07-06 09:33:53 +04:00
magenoxx
084b5657ad Fixed Issue 176. 2011-06-28 19:41:29 +04:00
magenoxx
ef0a73f26d Made images path configurable. Fixed Issue 36. 2011-06-28 11:15:19 +04:00
magenoxx
74b9b53091 Fixed Issue 167. 2011-06-26 18:46:23 +04:00
BetaSteward
526f0c09bc fixed client ip address 2011-06-26 00:45:25 -04:00
BetaSteward
ade836c08a added connection leasing + cleanup 2011-06-25 14:34:39 -04:00
magenoxx
92e9d94c33 Fixes. 2011-06-24 19:23:42 +04:00
BetaSteward
b1408507cb added ping + code cleanup 2011-06-23 22:58:11 -04:00
BetaSteward
73939bd72c fixes for localhost ip 2011-06-22 23:18:43 -04:00
BetaSteward
05be0a14ed integrated jboss remoting 2011-06-22 22:37:50 -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
magenoxx
c7ae032d5a Fixed possible NPE between callbacks (as client and server are not synchronized between calls) 2011-06-22 20:35:16 +04:00
magenoxx
2977afea2d fixed socket leak. 2011-06-22 18:40:29 +04:00
BetaSteward
76878b642d Improvements to session state 2011-06-18 16:47:13 -04:00
BetaSteward
09be5934f5 updated session state 2011-06-17 14:49:36 -04:00
BetaSteward
f1558a255a implemented Damage Assignment Order 2011-06-16 23:02:24 -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
97eea533f3 updated version (from 0.7.3 to 0.7.4) in all pom files 2011-06-16 11:39:20 +04:00
BetaSteward
c4a3a496aa moved Session to Mage.Common 2011-06-15 23:24:03 -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
78bc920ba7 Fixed tooltips not displayed for tokens. 2011-06-13 19:56:43 +04:00
magenoxx
611c4b7b2f Now tokens connected to the source by expansionSetCode - results in token image displayed. 2011-06-13 17:43:28 +04:00
BetaSteward
a1eb9f7d0e streamlined Callback daemon - should no longer shutdown prematurely 2011-06-11 23:15:02 -04:00
magenoxx
18a416d184 Change Mage version to 0.7.4-beta 2011-06-09 20:20:28 +04:00
magenoxx
588f173254 Utility class for configurable compressing objects. 2011-06-08 20:15:40 +04:00
magenoxx
b04f843f40 Net traffic compressing. Enabled by default. Can be disabled by -Dnocompress on server. 2011-06-08 18:46:14 +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
6048ee6538 fixed an issue with client freezing 2011-06-05 09:08:45 -04:00
BetaSteward
90f0fb0590 a few more client tweaks 2011-06-02 23:48:56 -04:00
BetaSteward
d6e239586b more client fixes 2011-06-02 23:09:21 -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
North
569191a55a Removed getArt and everything related to it. 2011-05-30 00:07:02 +03:00
BetaSteward
892f7cce1b client/server overhaul - tested on localhost, remote testing pending 2011-05-24 23:52: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
magenoxx
74c7feb470 Moved version to 0.7.3 in pom files. 2011-05-19 23:49:43 +04:00
magenoxx
1e92d061e5 Fixed autoconnect(). Fixed not disabling button on autoconnect exception (Fixed Issue 124). 2011-05-19 12:51:43 +04:00
BetaSteward
94c5a0cdfb client + server improvements 2011-05-17 21:55:20 -04:00
BetaSteward
90ae07d014 missed file 2011-05-17 07:04:09 -04:00
magenoxx
d5c4ac371a Now Planeswalkers use counters for loyalty. Fixed Issue 69. 2011-05-15 16:42:45 +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
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
774d56dd6b LookAt and LookedAtView classes (forgot to commit previously). 2011-05-11 22:17:47 +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
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
BetaSteward
da7e56aba1 changed logging to log4j 2011-05-09 23:04:05 -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
33e7569f87 fixed issue 45 - show cast when cycle is available 2011-05-07 23:08:34 -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
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
4f06f78621 UI fixes - can now play simultaneous games 2011-03-04 22:46:56 -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
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
a1b2127962 Added options to gameclient target message. 2011-01-27 18:27:41 +03:00
magenoxx
04b9db5c60 Proliferate 2011-01-27 01:50:13 +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
BetaSteward
360bbc86b5 modifed revealed cards 2011-01-24 22:51:45 -05: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
Loki
83e39e900a add serialVersionUID 2011-01-23 15:45:15 +02: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
03e3be90d6 draft stuff 2011-01-08 23:54:32 -05:00
magenoxx
56eff16857 Collection Viewer. 2011-01-09 03:03:19 +03:00
BetaSteward
98d8a428a7 some more drafting stuff 2011-01-07 15:41:09 -05:00
BetaSteward
c67122b605 more draft stuff 2011-01-05 15:17:02 -05:00
magenoxx
5683a8c719 [mage.client] Fixed noise in foil cards effect. 2011-01-05 15:18:46 +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
maurer.it
b006d66a5a Fixes an issue with multiple Kalastria Highborn triggers (I never included Zone.ALL in the switch). 2010-12-31 12:40:28 -05:00
maurer.it
3d1688f851 Fixed compilation errors. 2010-12-29 14:55:45 -05:00
maurer.it
4653a53078 Merge 2010-12-29 13:40:36 -05:00