LevelX2
|
f76ee65bf5
|
Merge branch 'master' of https://github.com/magefree/mage.git
|
2013-07-21 22:55:45 +02:00 |
|
LevelX2
|
7d0cf3cd8c
|
Set version to 1.1.0 dev.
|
2013-07-21 22:52:25 +02:00 |
|
KholdFuzion
|
a6a09e0008
|
linux fixes (dox2unix) and basic lands added from LEA to 3ED
|
2013-07-21 03:18:23 -05:00 |
|
LevelX2
|
7ba3d451da
|
Small changes for Release 1.0.3
|
2013-07-21 09:46:45 +02:00 |
|
LevelX2
|
2e5fc5fc98
|
Some small changes for Release 1.0.3
|
2013-07-21 09:45:58 +02:00 |
|
LevelX2
|
ac23750310
|
* Fixed a bug that looked at cards were sometimes not shown (fixes #266 and fixes #264). Removed unused code.
|
2013-07-20 16:58:02 +02:00 |
|
LevelX2
|
a7a023b5c1
|
Fixed NPE if non tournament player submits a deck.
|
2013-07-19 19:14:33 +02:00 |
|
LevelX2
|
6098aa1d7c
|
Handling of players that cancel tournament improved.
|
2013-07-19 14:05:56 +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 |
|
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
|
26ca873eb6
|
[minor] Some text renaming.
|
2013-07-15 23:56:10 +02:00 |
|
LevelX2
|
ded726d2ef
|
Prevent that the tournament sub tables are deleted by expire check (delete logik must be added).
|
2013-07-15 15:03:38 +02:00 |
|
LevelX2
|
73fbfa1888
|
Deactivated call to replay because game savin is deactivated..
|
2013-07-15 01:06:53 +02:00 |
|
LevelX2
|
40c6ba2efc
|
Fixed some handling to possible NPEs.
|
2013-07-15 00:54:14 +02:00 |
|
Li REN
|
8612d17aaa
|
add a comment for the fix
|
2013-07-13 20:24:50 -04:00 |
|
Li REN
|
71909e8310
|
Add exclusion condition 'two player duel' to expire checker in TableManager. That fix the bug cause the table with AI player be removed in tournament temporarily
|
2013-07-13 20:19:04 -04:00 |
|
LevelX2
|
bb06591f53
|
Finished changes for priority timer, works now per match and match will be continiued after first game is finished.
|
2013-07-06 15:14:15 +02:00 |
|
LevelX2
|
0f32fc72de
|
Solution for the deck editor / sideboarding / construct - mockcards problem.
|
2013-07-06 00:44:13 +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
|
83ad29b0a9
|
Added missing change for quit match.
|
2013-07-02 23:49:07 +02:00 |
|
LevelX2
|
05b221fbbf
|
Added a check to TableController.
|
2013-07-02 23:42:33 +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
|
5e3970a0e0
|
added method for updating cards database
|
2013-07-02 22:29:06 +03:00 |
|
LevelX2
|
a71285a768
|
Remove table if a user disconnects only if state is waiting or starting.
|
2013-07-02 17:00:57 +02:00 |
|
North
|
e4ea8adf94
|
added method for updating expansions database
|
2013-07-02 00:32:25 +03:00 |
|
LevelX2
|
06163d6ac5
|
Adding Player state to TournamentPlayer and TournamentPanel.
|
2013-07-01 17:11:44 +02:00 |
|
LevelX2
|
ccc107f7ef
|
Added count for started tournaments.
|
2013-06-29 22:27:58 +02:00 |
|
LevelX2
|
c924ca8727
|
Posting a message to the tornament panel, if a player submits his deck.
|
2013-06-29 20:50:56 +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
|
6532aaffdf
|
Timers on client side. Refactored.
|
2013-06-20 00:17:06 +04:00 |
|
magenoxx
|
42dd9d81b4
|
Timers (In progress)
|
2013-06-19 17:12:31 +04:00 |
|
LevelX2
|
ef83ec2874
|
Set the server release log level property to warn.
|
2013-06-18 13:28:09 +02:00 |
|
North
|
0bb110be45
|
[refactor] moved enums from Constants class
|
2013-06-16 12:28:10 +03:00 |
|
LevelX2
|
aef53bc4ce
|
* The list of open tables shows now the codes of boosters selected for sealed or draft tournaments in the deck type column.
|
2013-06-10 12:38:38 +02:00 |
|
LevelX2
|
ef8d10a770
|
Some minor additions/changes to release assembly.
|
2013-06-08 16:56:23 +02:00 |
|
LevelX2
|
a734d604d5
|
Added mage-player-ai-draftbot to server dependencies to get it included in assembled release package.
|
2013-05-30 09:47:13 +02:00 |
|
LevelX2
|
449195daed
|
Added check for JRE7 directory to the windows start .bat files.
|
2013-05-20 17:02:58 +02:00 |
|
LevelX2
|
31da9dcdfd
|
[minor] Some formatting, remove unused code, changes to logging.
|
2013-05-19 08:29:38 +02:00 |
|
LevelX2
|
8c56231e15
|
[minor] some formatting
|
2013-05-18 14:55:50 +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
|
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
|
d00e953ad9
|
Added Levacy to the construced formats.
|
2013-05-03 08:37:30 +02:00 |
|
LevelX2
|
44d0df6bde
|
Small changes to user/chat/session handling (not finished yet).
|
2013-04-30 17:10:35 +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 |
|
North
|
a3411f2486
|
[cleanup] removed unused imports
|
2013-04-19 20:01:10 +03:00 |
|
LevelX2
|
6e4b06fc5b
|
Added server config values to check user name minimal and maximal length and allowed chars for user name. Set to 3-14 length and [^a-z0-9_] chars (ignoring case) .
|
2013-04-13 14:21:42 +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
|
a070c5a8e1
|
Fixed a bug that players were not removed properly from matches or tournaments they left before the match or tournament was started.
|
2013-04-06 02:09:04 +02:00 |
|
LevelX2
|
48f1560cb8
|
Added new AsThoughtEffectType to reveal face down cards (not a perfect solution I know, but better as using the cast type. If someone has a better idea to handle this, I'm open).
|
2013-04-06 00:04:21 +02:00 |
|