LevelX2
7f4291ac07
Fixed a problem of image download for OGW.
2016-01-10 22:13:30 +01:00
Me Car
a0ddd4fff0
Send an email on successful user registration. Use Gmail API for that. Add password confirmation and email to RegisterUserDialog.
2016-01-10 18:18:38 +09:00
Me Car
835f08c18f
Add a user registration dialog.
2016-01-09 06:43:10 +09:00
LevelX2
aadc253afa
Merge pull request #1442 from menocar/password
...
Add a password user authentication when connecting to servers.
2016-01-06 23:31:25 +01:00
LevelX2
2526dbd1c7
* Fixed null pointer exception of deck editor.
2016-01-06 22:18:35 +01:00
Me Car
32b4675f13
Integrate Shiro.
2016-01-05 03:48:43 +09:00
Me Car
33330e9345
change the type to password
2016-01-05 02:16:32 +09:00
Me Car
ea5abfe578
Add password input box
2016-01-05 02:16:32 +09:00
LevelX2
7c00e4b16d
* Graveyard window - Fixed that the displayed card order was sometimes mismatched.
2015-12-25 17:43:10 +01:00
fireshoes
3008b5ed14
[OGW] Added 18 cards. Cards with <> in their activation costs are untested.
2015-12-14 23:02:35 -06:00
fireshoes
a0f80b785c
Added 12/13 spoilers for OGW, EXP, and DDQ to mtg-cards-data.txt. Added Duel Decks: Blessed vs. Cursed set. Added reprints from the 12/13 spoilers.
2015-12-14 14:36:12 -06:00
LevelX2
207f486afc
* Xmage 1.4.6v0
2015-12-13 19:47:04 +01:00
LevelX2
ea0ba76736
* Deck editor - Fixed a bug that prevented users to add cards to deck or sideboard (was caused by creatures with negative toughness and it was sorted by p/t - fixes #1414 ).
2015-12-13 10:34:35 +01:00
LevelX2
d9b20298b7
* Bloodlord of Vaasgoth - Fixed that Vampires entering the battlefield did never bloodthirst from the Bloodlord.
2015-12-13 10:05:54 +01:00
LevelX2
81e67927a5
Minor change to download of card images.
2015-12-12 17:39:14 +01:00
LevelX2
af793c30fe
* Added a slider to the preferences to adjust the delay for the card tooltip window appearance.
2015-12-08 18:39:47 +01:00
fireshoes
7a102b2c35
Merge origin/master
2015-12-07 15:14:50 -06:00
fireshoes
f8ba0da7e5
[OGW] Added Mina and Denn, Wildborn. [EXP] Added filterlands. [CUBE] Renamed Holiday Cubes to Vintage Cubes. Add Vintage Cube 2016.
2015-12-07 15:13:31 -06:00
LevelX2
f7b8ab626d
* Added scroll ability for system messages panel.
2015-12-05 00:48:36 +01:00
LevelX2
af23795a7b
* Fixed wrong formated definition error of card-picture-tok.txt.
2015-12-03 16:53:06 +01:00
fireshoes
d0d9731da2
Added promo sets Arena League, Super Series, APAC Lands, Euro Lands, Commander's Arsenal, Champs, and Ugin's Fate. Added some Media Insert, Judge Promo, and FNM promos.Fixed a few collector numbers to match magiccards.info.
2015-12-01 20:19:28 -06:00
LevelX2
044c30b638
* Main lobby - Separated user talk from system messages by using two tabs in chat area to switch.
2015-11-29 20:01:40 +01:00
LevelX2
3a7983a0d0
* Main lobby - Separated user talk from system messages by using two tabs in chat area to switch.
2015-11-29 20:01:31 +01:00
Neil Gentleman
bfb428b13a
always use log4j
...
removed all references to mage.util.Logging, java.util.logging
transient static doesn't mean anything, since static fields are never
included in serialization
2015-11-28 21:11:25 -08:00
LevelX2
0a39b0568d
* Fixed that the selected avatar was not shown as avatar in the game ( fixes #1365 ).
2015-11-28 09:38:28 +01:00
fireshoes
ce3a443a65
Updated the card-pictures-tok.txt file with some additional tokens.
2015-11-25 11:22:27 -06:00
LevelX2
8957128b13
* Renamed "Historical Standard" format to "Historical Type 2" and "Super Standard" to "Super Type 2". Added Chronicles to the set lists.
2015-11-25 17:29:23 +01:00
Neil Gentleman
a90d0e5597
reuse shared code for picking basic land sets
2015-11-22 18:00:10 -08:00
LevelX2
05dd1daee6
* Added some information to the player tooltip in game (expericence counters, deck hash code, # of wins).
2015-11-22 11:07:48 +01:00
Neil Gentleman
702be67453
correct some dodgy sample deck names
2015-11-21 22:36:07 -08:00
LevelX2
b84a315780
[C15] Fixed not correct working Commander 2015 decklists.
2015-11-21 22:56:14 +01:00
LevelX2
0d86e8e063
Xmage 1.4.5v0
2015-11-21 10:33:43 +01:00
LevelX2
cd17436c4e
[C15] Added the C15 deck lists.
2015-11-19 17:25:38 +01:00
Neil Gentleman
68e850b8b8
remove old bundled mage-theme-plugin.jar
...
which causes plugin loading to consistently fail, so switch back to
directly instantiating ThemePluginImpl()
this is a little unfortunate, because these plugins don't get the same
lifecycle handling as external ones
re: c25e45095e
2015-11-15 15:28:03 -08:00
LevelX2
576a9ea74f
Updated mtg-cards-data.txt. Added a land deck for Mormir Basic format.
2015-11-15 10:25:02 +01:00
LevelX2
79c04eef47
* Added Momir Basic format to table filtering so Momir Basic games are shown.
2015-11-14 19:07:48 +01:00
Quercitron
a092f965fa
Add tokens.mtg.onl token images source
2015-11-13 02:54:22 +03:00
Neil Gentleman
02a6780766
add Momir Basic game type
...
- re-using Emblems as Vanguard cards; should probably give them their own
CommandObject class
- setting the timing on the Momir ability to TimingRule.SORCERY causes the
ability not to activate (?), so I've left it at INSTANT for now
- need to add a new card image source for vanguard cards
2015-11-11 12:31:30 -08:00
Neil Gentleman
c25e45095e
remove Mage.Theme.Plugin module
...
it has been a included in Mage.Client since 8ac58cfc
2015-11-11 00:31:31 -08:00
Neil Gentleman
deb4608c00
Don't try to play null audio
...
a message is already logged when loadClip fails; this avoids showing an error
dialog over and over afterwards.
2015-11-08 22:32:43 -08:00
Quercitron
e23fc13db0
Fix pictures for some tokens from recent sets
2015-11-08 20:16:47 +03:00
fireshoes
59cf816f32
[C15] Added 11/5 spoilers and Angel of Serenity reprint, corrected Meteor Blast's translated name, and updated tokens.
2015-11-05 10:26:40 -06:00
LevelX2
c71e89c441
Merge pull request #1346 from nigelzor/misc-fixes
...
Misc fixes
2015-10-29 09:19:23 +01:00
Winston Huang
0af814f3d0
Fix MageFrame title
2015-10-28 22:04:25 -07:00
Neil Gentleman
ff1b424caf
options passed to JOptionPane were backwards
...
they're both -1, so this doesn't change anything
2015-10-28 21:48:58 -07:00
fireshoes
bf2992fc42
Added Commander 2015 set; added Eternal Witness and Kalemne, Disciple of Iroas cards to C15.
2015-10-20 14:52:39 -05:00
Neil Gentleman
6c43858046
Deck Editor: Fix redraw after missing image
2015-10-19 00:27:59 -07:00
LevelX2
b3cadac4ea
* Image download - Fixed a bug of mythicspoiler source, that preveneted download of EXP images.
2015-10-04 22:58:09 +02:00
LevelX2
e2453abbb5
* Fixed a bug that some options in preferences were handled with the wrong state as long as never set manually.
2015-09-29 17:26:29 +02:00
LevelX2
b95d7ca705
* Fixed some problems with new avatar handling.
2015-09-27 14:50:44 +02:00
LevelX2
23cd772fea
* Fixed that using a previous internal avatar ID did create an exception while playing/watching a game.
2015-09-27 14:11:56 +02:00
LevelX2
9d3619b68c
* Some rework of preferences avatar panel.
2015-09-26 01:10:05 +02:00
LevelX2
2023686ee8
* Some minor changes.
2015-09-25 23:22:54 +02:00
LevelX2
044e8b70f0
Some minor changes for BFZ token image handling.
2015-09-23 19:53:25 +02:00
LevelX2
5bed5aeff7
* Fixed null pointer exception for download with mythicspoiler.
2015-09-21 19:21:23 +02:00
LevelX2
9ab323a89c
Deck editor - renamed sort type "Color Detailed" to "Color Identity" and compare for the sort also with mana symbols in casting cost and rules.
2015-09-21 08:11:58 +02:00
LevelX2
322eae2ec6
Deck editor - renamed sort type "Color Detailed" to "Color Identity" and compare for the sort also with mana symbols in casting cost and rules.
2015-09-21 00:31:42 +02:00
LevelX2
ed15f0b86b
Fixed that not BFZ images were downloaded from mysticspoliers source. Fixed that Zendikar Expeditions images were not downloaded from mysticspoliers source.
2015-09-20 20:23:36 +02:00
fireshoes
f2b7771d59
[BFZ] Implemented Prism Array, Sanctum of Ugin, Spawning Bed, Makindi Sliderunner , Snapping Gnarlid, Molten Nursery, Pilgrim's Eye
2015-09-17 20:35:14 -05:00
LevelX2
9a37bd28ad
Xmage 1.4.4v0
2015-09-05 12:51:07 +02:00
LevelX2
fe80d292ab
Some changes for token download.
2015-09-05 01:53:48 +02:00
LevelX2
707c1acf6b
* Added an option to auto order triggers with the same text. Added options to pass priority automatically after spell cast and ability activation. Fixed a problem of the tests with the new Scry mulligan.
2015-09-04 00:25:23 +02:00
Simown
1bdc54556a
Fixed a bug in random deck generation where generating a deck from a set
...
with too few cards caused an exception. Minor formatting fixes.
2015-09-03 21:30:15 +01:00
Simown
14148b25db
Fixed a bug in random generation where selecting a set which had no basic lands caused an error. Partially fixes #1242
2015-09-03 19:40:12 +01:00
fireshoes
cb01b0ee05
Implemented [BFZ] Omnath, Locus of Rage, [MRD] Dross Scorpion, and[SCG] Vengeful Dead. Changed some cards from using DiesCreatureTriggedAbility to DiesThisOrAnotherCreatureAbility.
2015-08-30 14:47:21 -05:00
fireshoes
9e1f67fa1a
[BFZ] Implemented Felidar Cub, Incubator Drone, Barrage Tyrant, Mist Intruder, Gideon's Reproach, Kozilek's Channeler, and Eldrazi Scion Token. [ONS] Implemented Airdrop Condor.
2015-08-30 02:52:11 -05:00
LevelX2
e32e7a4638
Added a fix for the serverlist URL setting to automatically switch xmage.info to xmage.de.
2015-08-29 09:42:17 +02:00
LevelX2
dfe1e2ef5a
Some minor changes.
2015-08-28 16:52:33 +02:00
LevelX2
b6c3355329
[BFZ] Added Devoid and Ingest keywords.
2015-08-28 16:51:37 +02:00
LevelX2
423e1fd368
* Triggered abilities order selection is applied immediately now.
2015-08-28 15:16:24 +02:00
LevelX2
39e62095e4
Fixed some dialogs for human players that were not shown after a reconnect to a game (e.g choose mulligan, any use Yes/No choice, amount choice, Pile choice).
2015-08-28 14:29:54 +02:00
LevelX2
758f56792e
* Added button popup menu to be able to automatically answer ability related "Yes" / "No" requests (related to #328 ).
2015-08-28 11:44:14 +02:00
LevelX2
b63cc121ef
Some minor changes.
2015-08-27 14:51:21 +02:00
LevelX2
97a8b351b4
Fixed a problem that show cards window was not closed (e.g. for libraray card selection).
2015-08-26 16:30:32 +02:00
LevelX2
0ee22d90ca
Allow hand card ordering by drag'n'drop only with left mouse button.
2015-08-26 16:29:57 +02:00
LevelX2
532d4e0af0
* Added automatic handling for order of triggered abilities going to stack ( fixes #701 / related to #328 ).
2015-08-22 19:29:57 +02:00
LevelX2
23039572f2
Xmage 1.4.3v3
2015-08-21 09:49:53 +02:00
LevelX2
386204c085
* Draft log - Fixed a bug that the last pick was logged twice.
2015-08-19 11:46:57 +02:00
LevelX2
e2625fd60e
* Show card pick dialog - Fixed a bug that the select window was hidden if you clicked and released the mouse button on the edges of the window.
2015-08-18 12:29:57 +02:00
fireshoes
1d86561dd3
Updated mtg-cards-data with 4 new BFZ cards and all DDP cards. Added DDP set and reprints. Implemented Retreat to Kazandu and Veteran Warleader for BFZ/DDP. Implemented Battle Squadron and Lithophage. Fixed Phage the Untouchable creature type.
2015-08-17 14:20:01 -05:00
LevelX2
917d576de2
Merge pull request #1192 from gerschulle/draft-log
...
Add option to log draft picks into a file for review after the game
2015-08-13 11:21:56 +01:00
jonhwoods
3addd1dd2a
Sounds Update
...
Made the sounds shorter, quieter and less agressive using normalization,
fade in and fade outs
2015-08-12 12:52:41 -04:00
Gerhardt Schulle
54c1e4f66c
Add option to log draft picks into a file for post review after the game.
2015-08-09 21:35:49 +02:00
LevelX2
c98577cc6a
Xmage 1.4.3v0
2015-08-06 22:18:01 +02:00
LevelX2
e7ecdefce2
Added example decks.
2015-08-06 16:22:52 +02:00
LevelX2
7a90db7995
* Fixed sluggishness of player selection. Reworked flag display in avatar image.
2015-08-06 00:31:50 +02:00
LevelX2
cbbc70d26b
* Made table filter more accurate and moved Historical and Super Standard format to Other filter.
2015-08-05 00:07:53 +02:00
LevelX2
8dca887fad
* Added tooltip to the flag in the player avatar.
2015-08-02 12:41:29 +02:00
LevelX2
768fd17d93
* Some spelling changes.
2015-07-26 09:19:46 +02:00
fireshoes
5897f1595a
Implemented Glissa Sunseeker, Phyrexian Furnace, Flickering Ward, Cho-Manno's Blessing, Meng Huo Barbarian King, Sword of the Chosen, Pentarch Ward, Order of the Stars, Ancestral Mask, Jedit Ojanen of Efrava, Krosan Restorer, & Nature's Kiss. Added set Battle for Zendikar and spoiled Evolving Wilds.
2015-07-24 00:21:32 -05:00
Simown
a6bab84c85
Generated deck name/path is now a timestamp.
...
Changed deck generator to use a timestamp of the current time to the millisecond as the generated deck name.
This gets rid of the random UUID filling up the deck path and generated deck name.
2015-07-19 13:39:38 +01:00
Simown
cedf16806e
Fix to #1128 Deck generation throws IndexOutOfBoundsException.
...
Reserve cards now counted correctly.
Fixed reserve card adding algorithm to stop trying to add cards out of range.
2015-07-19 12:12:10 +01:00
LevelX2
635c33fa87
Merge pull request #1117 from brodee/master
...
random draft bug fix and random draft ui improvements
2015-07-15 08:30:22 +02:00
brodee
c7a349f65f
random draft bug fix:
...
packs are forced to be 15 cards; weirdness occurs if the packs are uneven sizes including the draft ending early.
Random draft ui improvements:
only the sets that will be used are displayed in the lobby, and the number of characters is large but still greatly reduced.
the pack selector ui will prevent you from chosing fewer than 2 packs.
2015-07-14 22:34:58 -07:00
LevelX2
6cf0a59644
* Fixed possible null pointer exception in client.
2015-07-12 09:19:43 +02:00
LevelX2
c9cc7d7920
* Zurgo Helmsmasher - Fixed a bug that could happen if Zurgo is used as commander.
2015-07-12 09:03:04 +02:00
LevelX2
b38885b7bf
* Fixed a bug that prevented that the width of connection column in user list was restored.
2015-07-09 09:59:20 +02:00
Simown
6a5eb8ff83
Small fixes to constants, added header and standardised spelling
2015-07-09 01:58:45 +01:00
LevelX2
b80e27f3b3
* Fixed handling of Phyrexian mana.
2015-07-09 01:43:26 +02:00
Simown
a1fd4e91f0
Overhaul and fix of random deck generation.
2015-07-08 23:13:21 +01:00
LevelX2
d847fb7109
Some minor changes.
2015-07-08 22:51:31 +02:00
Nidhoegger
9be613beb9
Fixed Issue #1054 . Buttons in Feedback panel will only get focused, if the MageFrame has the focus thus preventing focus theft from other programs.
2015-07-06 10:51:06 +02:00
LevelX2
d33f85d04a
Fixed wrong name for download of Kothophed, Soul Hoarder image.
2015-07-04 19:26:48 +02:00
LevelX2
cd0cba6ec7
XMage Release 1.4.2v0
2015-07-04 01:28:19 +02:00
LevelX2
1c157a20ae
* Fixed a bug caused by now possible column order setting in tournament panel.
2015-07-03 22:44:08 +02:00
LevelX2
0f5f8493c7
Improved fix for #584 by Nidhoegger.
2015-07-03 12:34:13 +02:00
LevelX2
589b63c5b1
Fix for the "Modal Window bug under Linux (e.g. X value announcement) by Nidhoegger.
2015-07-02 20:48:32 +02:00
LevelX2
3eb1fd4047
Added a button to attack with all available cratures.
2015-07-02 17:03:14 +02:00
LevelX2
0cbe590cac
* Fixed that mana auto-payment settings were not correctly set from previous settings on game start.
2015-07-02 13:18:12 +02:00
LevelX2
0a0cb40783
* Fixed that creatures that have to pay costs to block were wrongly forced to block causing UI locks.
2015-07-01 23:00:22 +02:00
LoneFox
ca0793a5c1
Fix systematic misspelling of "hover"
2015-06-30 21:28:32 +03:00
LevelX2
df3e6db569
Please test! Some changes to the display of user choices, showing also a longer text in tooltip window.
2015-06-28 21:55:48 +02:00
LevelX2
d24777cd15
Merge pull request #1062 from brodee/master
...
random booster draft UI improvement
2015-06-28 18:37:27 +02:00
brodee
cd1352eb01
Switch to a separate window to chose the packs for random booster drafts.
2015-06-27 23:16:59 -07:00
LevelX2
87f3978589
Some changes to userData handling. Added country flag to some dialogs. Saved and restored some more table columns width and order information.
2015-06-28 00:10:38 +02:00
LevelX2
81934e32e3
* Revealing the top card of the library is now also shown by an extra window (no longer hiding life). Now Iconyfying and deiconifying does not change the postion of the reveal window. Iconifyed window width was a bit raised to be able to read more of the title in that state.
2015-06-25 01:07:34 +02:00
LoneFox
e139e4524f
Don't use a proprietary class. Fixes build on OpenJDK.
2015-06-24 19:31:15 +03:00
LevelX2
72408a7f52
Added card frame downloader.
2015-06-24 13:41:14 +02:00
LevelX2
ca9e52f99b
Merge pull request #1052 from brodee/master
...
code review comments for chaos/random booster draft:
2015-06-24 06:56:45 +02:00
brodee
38235d9023
Update NewTournamentDialog.java
...
removing commented code
2015-06-23 21:08:39 -07:00
brodee
4113976b7e
code review comments for chaos/random booster draft:
...
1. rename chaos booster draft to random booster draft
2. save packs selected in the user preferences
3. print "Random Boosters" in the player draft viewer during the draft
2015-06-23 21:04:59 -07:00
Brodee
ac0aa65aab
code review comments for chaos/random booster draft:
...
1. rename chaos booster draft to random booster draft
2. save packs selected in the user preferences
3. print "Random Boosters" in the player draft viewer during the draft
2015-06-23 20:59:05 -07:00
fireshoes
35d47229ea
Merge origin/master
2015-06-23 20:39:07 -05:00
fireshoes
0568f16788
Added 3 Premium Deck Series sets and all From the Vault sets, and added all existing cards for them.
2015-06-23 20:37:26 -05:00
LevelX2
0a3c081ded
Merge pull request #1048 from brodee/master
...
Chaos booster draft implementation
2015-06-23 21:59:46 +02:00
LevelX2
2547753dcb
Added Sen Triplets (Alara Reborn = 100%).
2015-06-23 16:15:14 +02:00
LevelX2
5b02b5b32c
Exile, Reveal, Looked At windows of a game are hidden now as you switch to another pane (e.g. other game, tables, deck editor) and shown again as you switch back.
2015-06-23 16:14:11 +02:00
LevelX2
6b2bfc5e19
Merge origin/master
2015-06-23 08:36:28 +02:00
LevelX2
ba9d616a27
Fixed two old URLs.
2015-06-23 08:35:23 +02:00
brodee
e3b84eaab5
chaos booster draft implementation first check-in
2015-06-22 21:55:43 -07:00
fireshoes
cda11b280c
Merge origin/master
2015-06-22 18:47:51 -05:00
fireshoes
00569c4047
Added 12 Clash Pack promos, 5 judge promos, 2 upcoming FNM promos, renamed MerfolkToken to MerfolkWizardToken, added collector's number that were missing for ORI in mtg-cards-data.txt, added other various cards.
2015-06-22 18:46:01 -05:00
LevelX2
67e9ee1fa9
* Changed graveyard window handling to a window that can stay open.
2015-06-23 00:46:27 +02:00
LevelX2
87f919ecac
* Reworked handling of revealed and look at windows. Windows can stay open now and moved to a position and stay there.
2015-06-21 23:49:16 +02:00
LevelX2
cd0f273122
Fixed a bug that if a human player had to discard more cards than he had on hand, the game UI was blocked.
2015-06-15 17:35:48 +02:00
LevelX2
0b2e61081a
Fixed a problem with the country flag resource name causing null pointer exceptions and graphical problems on the client side.
2015-06-14 14:53:23 +02:00
LevelX2
060a468d4b
Update to release 1.4.1.
2015-06-14 02:43:16 +02:00
LevelX2
6420666668
Some fixes to player handling.
2015-06-14 02:42:56 +02:00
LevelX2
526a93df7e
Some fixes to user table.
2015-06-14 02:42:32 +02:00
LevelX2
adefaf890a
[ORI] Added 47 cards.
2015-06-13 21:52:54 +02:00
LevelX2
ce26bc8ed0
Added option to deactivate to ask th eplayer in which order cards go to gaveyard.
2015-06-13 12:27:50 +02:00
LevelX2
0f37d0fcd0
Added country name to tooltip of country icon in user list.
2015-06-13 11:30:25 +02:00
LevelX2
d28a956754
Merge origin/master
2015-06-13 00:33:58 +02:00
LevelX2
4f6d3f3a1a
* Password join value is now distinct from password you set of for a new table.
2015-06-12 08:12:38 +02:00
LoneFox
90486afdbb
If saving a thumbnail image fails, delete the resulting file.
...
OpenJDK throws "javax.imageio.IIOException: Invalid argument to native writeImage", because it
does not support transparency, and that results in zero-sized thumbnail files being created.
2015-06-11 09:17:05 +03:00
LoneFox
658daa65e3
Fix typo
2015-06-11 08:43:12 +03:00
LevelX2
132ded19f6
Show country flag icon in user table. Save and restore column width and order.
2015-06-11 00:11:40 +02:00
LevelX2
8ae9293c98
* Added user country flag. View of image in user list is still missing.
2015-06-10 17:52:18 +02:00
LevelX2
21e2066bba
* Akron Legionnaire - Fixed not correct working restrict ability.
2015-06-08 22:51:48 +02:00
LevelX2
3b61a10237
Fixed some bugs and added a AI Test player class.
2015-06-08 18:31:54 +02:00
