LevelX2
76badb4186
Fixed problem with updating UserData.
2015-08-27 17:10:55 +02:00
LevelX2
ad9f325b72
Merge origin/master into Network_Upgrade
...
Conflicts:
Mage.Client/src/main/java/mage/client/MageFrame.java
Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
Mage.Common/src/mage/view/UserDataView.java
2015-08-27 15:23:31 +02:00
LevelX2
b63cc121ef
Some minor changes.
2015-08-27 14:51:21 +02:00
LevelX2
155b7fafd0
Merge origin/master into Network_Upgrade
2015-08-27 14:37:49 +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
betasteward
1e60605d84
Merge branch 'master' of https://github.com/magefree/mage into Network_Upgrade
...
Conflicts:
Mage.Client/src/main/java/mage/client/cards/Card.java
Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
Mage.Client/src/main/java/mage/client/game/GamePanel.java
Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
2015-08-25 14:07:31 -04:00
betasteward
2895a63b68
fixed attachments appearing in front
2015-08-25 11:16:03 -04: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
betasteward
a0f02fc8b7
moved MultiConnectTest to Mage.Servers.Tests project
2015-08-21 15:55:24 -04:00
betasteward
96b83e3387
fixed missing skill level values
2015-08-21 14:21:49 -04:00
betasteward
b3d739e2c0
Merge branch 'Network_Upgrade' of https://github.com/magefree/mage into Network_Upgrade
2015-08-21 10:41:31 -04:00
betasteward
aa5e0baeee
fixed title + NPE on DeckEditor
2015-08-21 09:03:35 -04:00
LevelX2
23039572f2
Xmage 1.4.3v3
2015-08-21 09:49:53 +02:00
betasteward
b9c8a2598d
Merge branch 'master' into Network_Upgrade
...
Conflicts:
Mage.Client/src/main/java/mage/client/draft/DraftPanel.java
2015-08-19 14:49:46 -04:00
betasteward
129b6d1e82
cleanUp
2015-08-19 11:05:33 -04:00
LevelX2
386204c085
* Draft log - Fixed a bug that the last pick was logged twice.
2015-08-19 11:46:57 +02:00
betasteward
b4edc1bda1
fixed EOL character for non-windows scripts
2015-08-18 21:08:09 -04:00
betasteward
d27513752d
fixed not running triggered actions in EDT
2015-08-18 20:59:20 -04:00
betasteward
db6fcadabe
fixed missing SSL setting
2015-08-18 08:06:50 -04: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
betasteward
d9f1d71d98
Merge branch 'master' into Network_Upgrade
...
Conflicts:
Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
Mage.Client/src/main/java/mage/client/table/TablesPanel.java
Mage.Common/src/mage/view/CardView.java
2015-08-17 09:20:44 -04: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
betasteward
5c829b79d5
Merge branch 'master' into Network_Upgrade
...
Conflicts:
Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
Mage.Client/src/main/java/mage/client/game/GamePanel.java
Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
Mage.Server/src/main/java/mage/server/Session.java
Mage.Server/src/main/java/mage/server/User.java
Mage.Server/src/main/java/mage/server/game/GameController.java
Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
2015-07-12 12:25:44 -04: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
betasteward
4bb7ffd452
added watch game methods
2015-07-11 07:40:06 -04: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
betasteward
8225a4080c
added draft and tournament methods + some refactoring
2015-07-05 08:57:14 -04: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
