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

3351 commits

Author SHA1 Message Date
magenoxx
10799024be Phase stops dialog (not finished yet). 2010-12-11 10:57:27 +03:00
BetaSteward
7aadc8ed9d fixes 2010-12-10 04:23:09 +00: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
Loki
13e7826239 fix double included plugins 2010-12-03 13:06:18 +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
d97286b5d8 fixes 2010-12-03 04:37:09 +00:00
magenoxx
c602f63e8c [card.plugin] Now supports downloading and displaying token images. 2010-12-02 21:41:24 +00:00
Loki
bdaf26f1a4 fix mage.counter.plugin version for mage.client 2010-12-02 20:30:37 +00:00
Loki
1cbd75b3cb now plugins for client are rebuilded when assembly is created 2010-12-02 20:25:37 +00:00
magenoxx
df3d7e564d reuploaded mage-theme-plugin.jar (without .svn folder within) 2010-12-02 20:10:07 +00:00
BetaSteward
81c080fe5f changed startup scripts to match artifact ids 2010-12-02 16:47:42 +00:00
Loki
592ba955f0 cleaning pom.xml, version bump to 0.5 2010-12-02 09:14:18 +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
7e95b78308 Removed start multi game test running on every mvn package. 2010-12-01 09:05:06 +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
2e86ffa300 since now mage-card-plugin goes with mage.client in /plugins directory 2010-11-30 17:11:57 +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
BetaSteward
d6dd2a22cc fixed issue 19 (again) + added some new sample decks 2010-11-29 04:27:11 +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
be707b3b52 Fixed initializationError(mage.client.game.StartMultiGamesTest) 2010-11-28 20:23:40 +00:00
magenoxx
8c2d5fcafb Replaced nimbus standard desktop pane background image by background.jpg. 2010-11-28 19:22:34 +00:00
magenoxx
604249ad6f [test] Replaced StartMultiGamesTest junit test by main method (as it fails in mtg test that breaks packaing). Not this test should be run manually. 2010-11-28 12:26:00 +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
Loki
ea3c40743b add card class generator script 2010-11-24 13:54:31 +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
fa99548105 fixed game table bg texture (had dark line on bottom). 2010-11-22 04:08:08 +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
120de78d97 return tables background 2010-11-20 05:49:06 +00:00
magenoxx
20df4b0ba7 updated theme plugin: displaying the same image for tables. 2010-11-19 16:57:03 +00:00
magenoxx
1d24e402cf Update background in theme plugin (changed saturation). Looks better. 2010-11-19 16:23:13 +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
c9296c49a5 fixed jar scope. 2010-11-06 22:12:47 +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
c346276b0d now plugins are not shaded with log4j, so take 10 times less place (about 40k each) 2010-11-05 14:20:29 +00:00
magenoxx
80ce52bd24 updated theme plugin with gray texture 2010-11-05 14:10:41 +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
Loki
d9e61a1e59 using internal repository for jspf, now works good 2010-11-02 09:19:45 +00:00
magenoxx
296faad0fa reverted system scope as it causes problems in net beans. 2010-11-02 06:42:25 +00:00
magenoxx
3333edcd37 fixed versions in poms. 2010-11-01 13:58:07 +00:00
magenoxx
1d1ce3b55d No need to install jar to local repository anymore. jar has system scope in dependencies now. 2010-11-01 10:44:47 +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
magenoxx
b0e4549959 Reverted r270 changes for all pom files. Added some files to svn:ignore. 2010-10-28 09:16:36 +00:00
BetaSteward
3a784f59ee ... 2010-10-28 03:19:26 +00:00
Loki
78e640487b small fixes 2010-10-27 11:20:59 +00:00
Loki
83b67cb460 add possibility to make distribution for mage client via mvn assembly:assembly 2010-10-27 11:16:06 +00:00
Loki
784eb17456 removing all nb stuff 2010-10-26 09:03:18 +00:00
magenoxx
a60d7d383b changed maven artifactIds for all projects : now starts with capital letter 2010-10-24 09:56:15 +00:00
Loki
b6a42d77ad fix new srcdir layout 2010-10-22 15:36:56 +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
magenoxx
b45cc23d72 Previous commit: Added texture for background. Project should be rebuild as resources were added (for Eclipse: mvn eclipse:clean eclipse:eclipse). 2010-10-22 11:57:27 +00:00
magenoxx
5392b92c38 ... 2010-10-22 11:54:23 +00:00
magenoxx
6abd8230a7 removed unnecessary import. 2010-10-22 11:12:04 +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
magenoxx
c82d3c6dd9 Mage.Server/config/init.txt for adding cards to any zone in testMode. Fix for icon being null. Temporary fix for expansionSetCode being null for BasicLands. 2010-10-22 07:08:41 +00:00
magenoxx
17f2e7dab5 Added maven project object models (pom) to all projects with the root pom that coordinates build order. Added target directories to svn ignore list. 2010-10-22 07:03:17 +00:00
BetaSteward
e9249bfcf6 ... 2010-10-06 01:59:06 +00:00
BetaSteward
e0b4388361 ... 2010-09-25 20:35:23 +00:00
BetaSteward
460ee77e4e ... 2010-09-02 01:38:14 +00:00
BetaSteward
3fa0e8b8f4 ... 2010-09-01 03:01:43 +00:00
BetaSteward
e4c8c5db4c ... 2010-06-29 01:16:58 +00:00
BetaSteward
4d5c30d06c ... 2010-06-29 01:15:15 +00:00
BetaSteward
805f20264e changes to support multiplayer 2010-05-17 03:19:06 +00:00
BetaSteward
f194288c0b load client player last so that their battlefield appears at the bottom 2010-05-07 03:58:17 +00:00
BetaSteward
08cc793053 ... 2010-05-04 02:39:14 +00:00
BetaSteward
c3b427ee16 ... 2010-05-04 02:24:34 +00:00
BetaSteward
0f69569491 ... 2010-05-04 02:20:45 +00:00
BetaSteward
5b16ec2771 ... 2010-05-02 15:17:29 +00:00
BetaSteward
cefc8a5963 ... 2010-05-02 15:07:05 +00:00
BetaSteward
1e292afb69 latest 2010-04-16 03:50:37 +00:00
BetaSteward
d151f99f4f latest 2010-04-11 20:02:08 +00:00
BetaSteward
dd402b3ab1 changed version to 0.2 2010-04-11 19:58:21 +00:00
BetaSteward
14de10fd72 ... 2010-03-27 02:19:06 +00:00
BetaSteward
aa2efd035d ... 2010-03-22 01:33:52 +00:00
BetaSteward
370343e004 ... 2010-03-22 01:23:33 +00:00
BetaSteward
03c6d29d25 ... 2010-03-22 01:05:35 +00:00
BetaSteward
a6b4f00aab ... 2010-03-21 03:53:07 +00:00
BetaSteward
f6a09b58a4 Initial 2010-03-20 03:50:27 +00:00