LevelX2
|
6c54812068
|
* User list added info about games and tournaments. Fixed a logging NPE.
|
2013-10-21 23:58:11 +02:00 |
|
LevelX2
|
c22a75a6c3
|
* PopUp Menus -Added F2/F3/F4/F9 to menu. Set correct popup menu for watcher.
|
2013-10-19 18:40:20 +02:00 |
|
LevelX2
|
d6c1075125
|
* Release Mage 1.1.0 final
|
2013-10-12 11:22:06 +02:00 |
|
LevelX2
|
cddff5fbac
|
* Chnaged intervall for getting tables and macthes from server to 3000 milliseconds instead of 1000.
|
2013-10-09 17:11:13 +02:00 |
|
LevelX2
|
d34779fa68
|
* Changed logging level back to info, changed level of a lot of messages to debug from info. Added check that certain AI players can't join a table with no appropriate format.
|
2013-10-09 15:22:40 +02:00 |
|
LevelX2
|
21f101c5fa
|
* Player list - Sorting of player names is now case unsensitive.
|
2013-10-08 23:21:17 +02:00 |
|
LevelX2
|
360a62917b
|
Added optional server config parameter to limit the number of AI players when creating tournaments.
|
2013-10-07 18:14:27 +02:00 |
|
LevelX2
|
628569fbc9
|
* Players panel - The number of player online is appended to the heading text "Players (xx)".
|
2013-10-05 19:34:12 +02:00 |
|
magenoxx
|
38d5a50b23
|
Issue #329: displaying a token image only from the same set, displaying magic card back image otherwise.
|
2013-10-04 12:35:53 +04:00 |
|
magenoxx
|
48445a4b87
|
Downloading backside image.
|
2013-10-04 11:34:21 +04:00 |
|
magenoxx
|
7800f62b70
|
Downloading all token images even if Type 2 only is chosen.
|
2013-10-04 11:34:04 +04:00 |
|
magenoxx
|
006d3b5a87
|
Forgot to commit in previous commit
|
2013-10-02 18:26:08 +04:00 |
|
magenoxx
|
9d5e1dee69
|
Possible fix for Issue #204: The [Done] button does not appear some times
|
2013-10-02 18:11:05 +04:00 |
|
magenoxx
|
9230acffaf
|
[images] Added the ability to download Type 2 images only (80 Mb instead of 700 Mb)
|
2013-10-02 12:27:26 +04:00 |
|
magenoxx
|
c4b1105dd4
|
Updated list of sets included into Type 2 format
|
2013-10-02 12:26:25 +04:00 |
|
magenoxx
|
591547d878
|
formatting
|
2013-10-02 12:25:46 +04:00 |
|
LevelX2
|
44ccb830b7
|
* Added missing function for the auto save game log function.
|
2013-09-30 11:21:32 +02:00 |
|
LevelX2
|
49db840d77
|
* Heroes vs. Monsters - Added duel set.
|
2013-09-30 08:38:18 +02:00 |
|
LevelX2
|
842c07e093
|
* Game log - Added an option to the preferences to auto save the game logs as txt files.
|
2013-09-30 00:18:12 +02:00 |
|
LevelX2
|
b6e1497b5c
|
Minor formatting.
|
2013-09-28 19:13:33 +02:00 |
|
LevelX2
|
fe82b49930
|
* Join Table - Changed handling of messages while creating or joining a table.
|
2013-09-28 16:59:43 +02:00 |
|
LevelX2
|
3c695f09a9
|
Added Theros token download URL's.
|
2013-09-27 16:12:48 +02:00 |
|
LevelX2
|
0d6853bd8f
|
* MageBook - Won't be loaded by default if the client starts (now the change is included).
|
2013-09-27 08:26:22 +02:00 |
|
LevelX2
|
3af0532623
|
* MageBook - Won't be loaded by default if the client starts.
|
2013-09-27 00:16:20 +02:00 |
|
LevelX2
|
893a3acb65
|
* Card editor - Done some code cleanup, done some speed up for card loading time.
|
2013-09-26 17:26:23 +02:00 |
|
LevelX2
|
0468fe7299
|
Show info in card tooltip of permanents if controller not equal owner.
|
2013-09-23 14:58:21 +02:00 |
|
LevelX2
|
825277bad9
|
Load and save setting of deck generator.
|
2013-09-23 14:57:50 +02:00 |
|
LevelX2
|
4b15dafda3
|
Save and load tournament settings.
|
2013-09-23 08:39:34 +02:00 |
|
LevelX2
|
70899ec4f8
|
[THS] Added Gift of Immortality, fixed some wrong names, minor formatting. Allow download of THS images.
|
2013-09-18 08:27:30 +02:00 |
|
LevelX2
|
6066cc2308
|
Removed unused Constants class.
|
2013-09-05 16:27:12 +02:00 |
|
LevelX2
|
7f6eca171e
|
Redesigned handling of chat start message.
|
2013-09-05 16:25:14 +02:00 |
|
LevelX2
|
5496cb4afd
|
Added the Theros set.
|
2013-09-02 17:10:38 +02:00 |
|
LevelX2
|
182839d41a
|
Added some new sound files (PlayerLost, PlayerWon, PlayerSubmittedDeck, PlayerLeft).
|
2013-08-31 19:00:38 +02:00 |
|
LevelX2
|
ae697db2d8
|
* Fixed possible NPE in CardView (fixes #278).
|
2013-08-28 16:23:04 +02:00 |
|
LevelX2
|
68333a2eff
|
Added names to download the Modern Masters token images.
|
2013-08-19 12:49:35 +02:00 |
|
LevelX2
|
ae44981cfa
|
Added a game end dialog, that shows the result of the finished game.
|
2013-08-07 16:50:25 +02:00 |
|
LevelX2
|
2225c6f988
|
[Minor] Formatting.
|
2013-08-05 18:03:38 +02:00 |
|
LevelX2
|
78dc712944
|
Allow to generate 40 or 60 cars decks.
|
2013-07-30 13:42:20 +02:00 |
|
LevelX2
|
3d2f262ff4
|
Field alignment in new table dialog.
|
2013-07-30 13:41:40 +02:00 |
|
LevelX2
|
0ba83a7d5d
|
[minor] Formatting.
|
2013-07-30 13:41:07 +02:00 |
|
LevelX2
|
a0c3f32b9b
|
Added tip to tips shown at chatpanel at game start.
|
2013-07-23 17:21:03 +02:00 |
|
LevelX2
|
7d0cf3cd8c
|
Set version to 1.1.0 dev.
|
2013-07-21 22:52:25 +02:00 |
|
LevelX2
|
2e5fc5fc98
|
Some small changes for Release 1.0.3
|
2013-07-21 09:45:58 +02:00 |
|
LevelX2
|
57bec7a0c1
|
Fixed that the chat text input area's high was to small to show the descender of letters completely.
|
2013-07-19 14:20:16 +02:00 |
|
LevelX2
|
41034ccdd8
|
Split pane divider positions of table panel and tournament panel are saved and restored now.
|
2013-07-19 14:04:59 +02:00 |
|
LevelX2
|
85b8edf630
|
Improved player quits / leaves mage handling for tournaments (not perfect yet, will more improve it).
|
2013-07-18 17:40:06 +02:00 |
|
Li REN
|
dcce8c30a1
|
[minor] fix a bug causes assembly plugin error
|
2013-07-18 04:36:21 -04:00 |
|
Plopman
|
e6847a472d
|
[Commander] Display Commander in client
|
2013-07-17 20:35:52 +02:00 |
|
Li REN
|
1cea80fd5d
|
fix error of audioManager when start client from IDE.
|
2013-07-17 13:51:59 -04:00 |
|
LevelX2
|
10fd7c6f6a
|
Removed old debug messges.
|
2013-07-17 17:31:49 +02:00 |
|
LevelX2
|
9838dea551
|
Added possibility to show tournament panel and watch tournament games (if allowed at tournament start) for spectators .
|
2013-07-16 17:39:02 +02:00 |
|
LevelX2
|
178b4cb158
|
Fixed random set for basic land definition. (Fixed issue #274)
|
2013-07-15 13:27:12 +02:00 |
|
Li REN
|
60d81ffb37
|
fix a bug that cause incomplete multimedia files released
|
2013-07-13 17:18:00 -04:00 |
|
Li REN
|
ec1ee245f8
|
adjust path of sounds and music
add sample BGM
delete a sample deck that cause error in release
|
2013-07-12 16:57:58 -04:00 |
|
LevelX2
|
c4f6d95f5a
|
Fixed deck generator for client decoupling.
|
2013-07-10 20:07:33 +02:00 |
|
LevelX2
|
68b2f589f0
|
Added some missing configurations for M14.
|
2013-07-10 14:11:11 +02:00 |
|
LevelX2
|
034f71cead
|
Fixed NPE for picking order of triggered abilities.
|
2013-07-09 22:52:17 +02:00 |
|
LevelX2
|
5a8a7b19de
|
Client add land set search uses now ExpansionRepository.
|
2013-07-07 18:23:31 +02:00 |
|
LevelX2
|
ec3565e5f7
|
Using now ExpansionRepository or tournament booster selection in client.
|
2013-07-07 18:22:13 +02:00 |
|
LevelX2
|
a3e041e364
|
Cleaned up PhaseManager.
|
2013-07-07 18:18:40 +02:00 |
|
LevelX2
|
51e4caca19
|
Tables panel - check for null value of date finished.
|
2013-07-06 15:15:20 +02:00 |
|
North
|
4657268476
|
fixed bug where one couldn't create a sideboard in the deck editor
|
2013-07-06 10:46:18 +03:00 |
|
Nicolas
|
ff5d16e132
|
Merge branch 'master' of https://github.com/magefree/mage.git
|
2013-07-05 18:51:20 +02:00 |
|
LevelX2
|
f540e78045
|
Fixed some display problems with emblems and there abilities on the stack.
|
2013-07-05 18:49:42 +02:00 |
|
Plopman
|
e3ab68bb37
|
Added M14 in ConstructedFormats
|
2013-07-05 18:48:40 +02:00 |
|
LevelX2
|
42dc0d142c
|
Improved Emblem handling. Added a MageObjectType to CardView (in progress).
|
2013-07-05 15:29:55 +02:00 |
|
LevelX2
|
5897f764e5
|
Fixed a NPE bug when calling the test.dck.
|
2013-07-04 23:36:51 +02:00 |
|
North
|
96ff08dc9a
|
Merge branch 'decouple-client'
Conflicts:
Mage/src/mage/cards/repository/CardRepository.java
|
2013-07-03 21:42:40 +03:00 |
|
LevelX2
|
c28bdf8a02
|
Added alternate part as commets to get UI editor to run.
|
2013-07-02 23:48:02 +02:00 |
|
LevelX2
|
7b260c960b
|
Added a quit match option. FFA game gets no more killed if host left mage or quitted match.
|
2013-07-02 22:15:49 +02:00 |
|
North
|
ae86414658
|
Removed getAllCards method from CardRepository
|
2013-07-01 23:46:27 +03:00 |
|
LevelX2
|
06163d6ac5
|
Adding Player state to TournamentPlayer and TournamentPanel.
|
2013-07-01 17:11:44 +02:00 |
|
LevelX2
|
319135b8ed
|
Cleanup preferences dialog.
|
2013-07-01 12:41:13 +02:00 |
|
LevelX2
|
7ef8753183
|
Cleanup wrong includes in TournamentPanel.
|
2013-07-01 10:13:31 +02:00 |
|
LevelX2
|
4c129706ca
|
Cleanup layout of preferences dialog.
|
2013-07-01 08:27:33 +02:00 |
|
Li REN
|
df6f43761e
|
Merge pull request #257 from Noahsark/master
update
|
2013-06-30 12:07:20 -07:00 |
|
Li REN
|
70ebb6bfbc
|
add UI to adjust BGM path
|
2013-06-30 15:05:30 -04:00 |
|
LevelX2
|
eaf55be919
|
* Draft tournament - NPE on draft construct deck start.
|
2013-06-30 16:40:11 +02:00 |
|
North
|
1fccbd6b87
|
Merge remote-tracking branch 'origin/master' into decouple-client
Conflicts:
Mage/src/mage/cards/repository/CardRepository.java
|
2013-06-30 11:26:40 +03:00 |
|
LevelX2
|
17c893799f
|
Added a close button, tournament header infos, name in window item and movable divider bars to the tournament panel.
|
2013-06-29 22:30:43 +02:00 |
|
LevelX2
|
4cb4a377d2
|
Changed message of the day panel to full width.
|
2013-06-29 22:28:52 +02:00 |
|
LevelX2
|
55a6de849e
|
Ignoring M14 cards for download.
|
2013-06-29 20:51:54 +02:00 |
|
LevelX2
|
63783d9fe2
|
* Tornament construction time - Fixed that the selected value was not used.
|
2013-06-29 17:52:19 +02:00 |
|
North
|
dc0db40428
|
removed planechase from wizards image source (doesn't exist)
|
2013-06-29 18:00:18 +03:00 |
|
North
|
3558a67f77
|
added M14 to wizards download source
|
2013-06-29 17:26:09 +03:00 |
|
North
|
619b7222e7
|
refactoring to cards downloading and image path generation
|
2013-06-29 16:59:23 +03:00 |
|
North
|
6c51bcd599
|
fix for lands download (wizards source)
|
2013-06-29 16:58:53 +03:00 |
|
North
|
a43bc8bed6
|
fixed issue where second face was considered a card
|
2013-06-29 12:52:43 +03:00 |
|
North
|
4c83fd7d6a
|
fix for downloading cards from wizards spoilers
|
2013-06-29 00:08:10 +03:00 |
|
North
|
a5eebbbf12
|
fixed NPE at downloading card images
|
2013-06-27 23:57:38 +03:00 |
|
LevelX2
|
e1ae922214
|
Some match time options added. Set the deafult macth time to 25 minutes per player.
|
2013-06-24 17:09:21 +02:00 |
|
LevelX2
|
5898f8a798
|
[minor] Changed layout of create tournament table dialog.
|
2013-06-23 02:45:30 +02:00 |
|
LevelX2
|
738efcc47f
|
Added option to select time limit (also none) on match or tournament creation.
|
2013-06-21 21:34:06 +02:00 |
|
magenoxx
|
66d1a66967
|
[Timers] Removed debug logging.
|
2013-06-20 18:09:30 +04:00 |
|
magenoxx
|
7c187a1d2a
|
Fixes for timers.
|
2013-06-20 15:50:06 +04:00 |
|
Li REN
|
64f2452089
|
simplify image file filter for background
|
2013-06-20 01:24:16 -04:00 |
|
Li REN
|
7a6f42556e
|
simplify image file filter for background
|
2013-06-20 01:21:36 -04:00 |
|
magenoxx
|
b6fddc301c
|
Merge branch 'master' of https://github.com/magefree/mage
|
2013-06-20 00:20:42 +04:00 |
|
magenoxx
|
6532aaffdf
|
Timers on client side. Refactored.
|
2013-06-20 00:17:06 +04:00 |
|
North
|
1b3a51484e
|
replaced Card instances in client with MockCard
|
2013-06-19 22:53:53 +03:00 |
|
North
|
462992e838
|
removed dependency to Mage.Sets and Mage.Server
|
2013-06-19 21:21:35 +03:00 |
|
magenoxx
|
42dd9d81b4
|
Timers (In progress)
|
2013-06-19 17:12:31 +04:00 |
|
North
|
fb2ea95f55
|
removed card scanning from the client
|
2013-06-18 22:47:01 +03:00 |
|
North
|
0166975e83
|
refactored getSetCodes to be used from ExpansionReposiitory
|
2013-06-18 22:46:09 +03:00 |
|
LevelX2
|
e1db02baec
|
Added a sound playing if human player joins a match.
|
2013-06-17 21:38:30 +02:00 |
|
Li REN
|
b8e7a50415
|
Merge pull request #11 from magefree/master
update
|
2013-06-17 11:28:58 -07:00 |
|
Li REN
|
200c791eed
|
fix a bug causes npe.
|
2013-06-17 14:27:54 -04:00 |
|
LevelX2
|
95a12028e6
|
Added small icon for tokens on token permanents. Token copied from permanents (Giant Adephage) show now the image of the permanent.
|
2013-06-17 17:00:17 +02:00 |
|
LevelX2
|
5216eddb71
|
In the card info (tooltip) tokens have now the work "Token" written below the expansion symbol. Some code cleaning concering handling of counters.
|
2013-06-17 13:59:23 +02:00 |
|
Li REN
|
848e542ee4
|
clean
|
2013-06-17 00:01:37 -04:00 |
|
Li REN
|
b057857485
|
Transfer timeout counter to clock format (minute:second, for example, 100 -> 01:40)
|
2013-06-16 23:53:25 -04:00 |
|
North
|
d91813b08a
|
removed Card dependency for image downloading
|
2013-06-16 18:13:51 +03:00 |
|
North
|
b13394f03c
|
refactoring to CardImageSource
|
2013-06-16 17:19:10 +03:00 |
|
North
|
467d246a12
|
renamed CardInfo to CardDownloadData
|
2013-06-16 16:14:40 +03:00 |
|
North
|
1d4b3a2be6
|
Merge branch 'constants-refactor'
|
2013-06-16 15:25:35 +03:00 |
|
North
|
0bb110be45
|
[refactor] moved enums from Constants class
|
2013-06-16 12:28:10 +03:00 |
|
Li REN
|
2424c80718
|
Set default view of Sideboard to cardGrid. Make it similar to MTGO setting.
|
2013-06-16 04:06:28 -04:00 |
|
Li REN
|
1749eb7ded
|
Add a feature to addlandDialog. Now it can help player calculate lands they need as the same function on MTGO.
|
2013-06-16 03:29:56 -04:00 |
|
Li REN
|
fab2759579
|
update and adjustment
|
2013-06-15 04:12:26 -04:00 |
|
Li REN
|
11ed1f57d4
|
fix a bug of package importation that cause code not be able to compiled
|
2013-06-15 02:50:02 -04:00 |
|
Li REN
|
8ac58cfc41
|
Combine ThemePluginImpl into Mage Client project to avoid cycling dependency.
|
2013-06-15 02:01:58 -04:00 |
|
Li REN
|
c5873fdc2a
|
Add UI for background image selection - selection, random, default
|
2013-06-15 00:53:18 -04:00 |
|
LevelX2
|
84df0f2c43
|
* Added tournament options for adjustable construction time and free mulligans
* Added duel options for free mulligans
|
2013-06-14 23:45:30 +02:00 |
|
Li REN
|
7ce050641d
|
fix a bug of MusicPlayer that cause nullpointer exception
|
2013-06-14 13:04:48 -04:00 |
|
Li REN
|
cc49f71b3c
|
Clean the code
|
2013-06-13 20:24:26 -04:00 |
|
Li REN
|
c41a2df3ac
|
Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well.
|
2013-06-12 23:34:43 -04:00 |
|
Li REN
|
6bbaa9fda1
|
Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well.
|
2013-06-12 22:55:25 -04:00 |
|
Li REN
|
7102d08637
|
Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well.
|
2013-06-12 22:27:08 -04:00 |
|
Li REN
|
3eef0b1080
|
Add a background music player to Mage Client. Music support .mp3 or .wav files. Put the audio files under plugins\sounds\music, random song will be played sequentially when GamePane is activited. the UI to adjust background music is add to preference dialog as well.
|
2013-06-12 22:18:49 -04:00 |
|
LevelX2
|
3dbdba32e9
|
* Number of wins can be set for tournaments. * Current score of running matches is shown in the table list.
|
2013-06-10 16:25:31 +02:00 |
|
LevelX2
|
dec8f24c68
|
* The list of completed matches and tournaments shows now also columns with start and end time.
|
2013-06-10 14:12:24 +02:00 |
|
LevelX2
|
00f22afdf0
|
Added Modern Masters set and already implemented cards.
|
2013-06-06 21:44:16 +02:00 |
|
magenoxx
|
b25b91b325
|
Issue#232: Avatar pictures sometimes missing
|
2013-06-05 10:39:48 +04:00 |
|
LevelX2
|
5cb438f701
|
Added the one token image of DGM.
|
2013-06-03 08:28:49 +02:00 |
|
LevelX2
|
010645b406
|
Fixed that PC2 mythic expansion symbol was not loaded.
|
2013-06-03 08:28:28 +02:00 |
|
LevelX2
|
6718332f6a
|
Workaround for issue #213, removing object from the stack that wasn't correctly removed.
|
2013-05-23 20:28:30 +02:00 |
|
LevelX2
|
5336d4c0f9
|
Pushed version to 1.0.3 dev.
|
2013-05-12 16:00:25 +02:00 |
|
LevelX2
|
6b38cd5b18
|
Mage Version 1.0.2
|
2013-05-11 23:06:30 +02:00 |
|
LevelX2
|
101194acf7
|
Many changes to split cards handling (showing arrows and log text for fused spells., handling protection and other things correctly).
|
2013-05-11 20:11:58 +02:00 |
|
LevelX2
|
b352217e17
|
Some improvements to split card handling. Better display of tooltip of split cards, also added handling if not cast from hand.
|
2013-05-09 21:26:15 +02:00 |
|
LevelX2
|
a29dc6cb18
|
Changed split card name using " // " as separator to be more conform with elsewere used name. But image save name uses " - ".
|
2013-05-09 14:02:15 +02:00 |
|
LevelX2
|
25948e089e
|
Implemented Split cards, not yet finished. Fuse does not work. Comparation for e.g. converterted mana (708.6a) does also not work correctly.
|
2013-05-01 21:41:56 +02:00 |
|
LevelX2
|
b6ddaabe44
|
Show user name in title bar of MAGE. Clear table chat after disconnect. Remove user from chat after disconnect. Some tweaking about the messages if a user disconnected/session expired.
|
2013-04-29 17:18:43 +02:00 |
|
LevelX2
|
4647221868
|
Open DGM image download. New PreventAllDamageToControllerEffect. Rule text formating to DetainTargetEffect.
|
2013-04-27 02:04:47 +02:00 |
|
LevelX2
|
a37a5e0e1c
|
Display life > 99 and cards in graveyard > 99 with smaller font.
|
2013-04-15 18:50:05 +02:00 |
|
LevelX2
|
8fc9ca7a94
|
Fixed a bug that the sets Shards of Alara and Alara Reborn were swapt in client logic.
|
2013-04-11 16:38:12 +02:00 |
|
LevelX2
|
2fc53fa71e
|
Added Commander and Dragon's Maze set objects to MAGE.
|
2013-04-10 16:55:31 +02:00 |
|
LevelX2
|
f644ffe041
|
Changed color of frame of avatar for active player to green again. Checked that a player of a game can't also watch his own game. Added a match score to the start of the game log. Changed the color of the Turn [X] message. Tips and join messages during a game are displayed in the chat panel instead the game log panel. Display of the player name when hovering over the avatar is more vertical centered.
|
2013-04-07 21:29:27 +02:00 |
|
LevelX2
|
cb6ac8e619
|
Some spelling changes to reminder text of shortcut keys.
|
2013-04-05 23:44:59 +02:00 |
|
LevelX2
|
b4f424a9a9
|
Send now also event to server if you click on a face down card.
|
2013-04-04 00:07:11 +02:00 |
|