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

317 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
BetaSteward
4b26727d71 changes to support multi-duel matches and sideboarding 2010-12-28 23:34:06 -05:00
BetaSteward
c8db6ba350 moved {this} and {source} replacement to server 2010-12-26 20:41:40 -05:00
maurer.it
f929d79b24 Fixes issue 19. 2010-12-26 14:06:25 -05: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
2e27a676ed [mage-tests] Added synchronization between steps. Updated bdd classes for step state handling. 2010-12-20 15:01:41 +03:00
magenoxx
1b6722f9b2 Added Mage.Tests project. Update server for test operations. Implemented bdd classes. 2010-12-20 01:03:12 +03:00
magenoxx
94d883b5ba New tooltips (support delayed displaying, mana and tap symbols, styled text). 2010-12-15 07:14:35 +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
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
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
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
BetaSteward
53d7e5623b send list of targets to client 2010-12-02 04:39:18 +00:00
magenoxx
770e5673f5 Now random decks contain non basic lands. 2010-12-01 21:55:37 +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
30b341f7d9 Mana symbols in ColorsChooser for deck generator. 2010-11-30 18:14:15 +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
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
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
BetaSteward
9c3ff863e8 fix for issue 22 + fix for planeswalker damage redirection 2010-11-28 04:31:48 +00:00
BetaSteward
ecd0281d81 added Summoning Sickness property 2010-11-27 17:55:51 +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
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
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
BetaSteward
20826e850c fixed EldraziSpawnToken and added ability selector for sacrifice only abilities 2010-11-20 03:51:30 +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
9c4fb8ed90 Now there plugin updates table dialog. Updated mage-theme-plugin.jar in Mage.Client. 2010-11-16 23:32:51 +00:00
magenoxx
2cb1136a52 Updated Theme plugin interface and implementation (still in progress). 2010-11-16 18:32:49 +00:00
magenoxx
b143a5a44d Done Issue 16: Games played counter plugin. 2010-11-14 17:01:12 +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
magenoxx
ad50277430 ... 2010-11-05 15:53:24 +00:00
magenoxx
278e6e52a5 cardNumber in CardView (copied from Mage/Card) 2010-11-05 14:10:09 +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
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
BetaSteward
ff33253646 fixes 2010-11-03 04:06:47 +00:00
magenoxx
34a0898fb0 reverted unnecessary change in CardView. 2010-11-02 09:12:57 +00:00
magenoxx
a779289ec2 Preparations for new card drawing in Mage.Card.Plugin. 2010-11-02 09:10:39 +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
875614b96c Added multitarget arrows (Fireball). 2010-10-28 11:52:54 +00:00
magenoxx
2fc9fc1301 [GUI] Displaying spell target with arrow. (at the moment only first target is displayed). 2010-10-22 07:10:05 +00:00
BetaSteward
904727e9dc ... 2010-10-06 02:02:06 +00:00
BetaSteward
e0b4388361 ... 2010-09-25 20:35:23 +00:00
BetaSteward
3fa0e8b8f4 ... 2010-09-01 03:01:43 +00:00
BetaSteward
1f53bb1995 ... 2010-06-29 01:13:37 +00:00
BetaSteward
313ff97119 changes to support multiplayer 2010-05-17 03:19:13 +00:00
BetaSteward
44bbc23388 ... 2010-05-04 02:25:16 +00:00
BetaSteward
e78bbcd4fe ... 2010-05-02 15:12:02 +00:00
BetaSteward
e1190077a2 latest 2010-04-11 20:28:38 +00:00
BetaSteward
8c01687bc2 ... 2010-03-27 02:07:11 +00:00
BetaSteward
ca44bbedfc Initial 2010-03-20 03:06:01 +00:00