Faxn
51ea9972e0
Merge branch 'master' into feature/momirFFA
2017-10-19 13:08:13 -04:00
LevelX2
bda8736b9e
Some minot fixes /changes.
2017-10-03 17:06:46 +02:00
Faxn
31d4be7a1c
Momir Multiplayer Might just work.
2017-09-28 18:21:47 -04:00
LevelX2
8221a68efe
Minor fix for user handling.
2017-09-05 17:53:03 +02:00
LevelX2
d5284ae226
Fixed that some user data was not cleared as a user was disconnected.
2017-09-05 16:58:06 +02:00
LevelX2
cd9827300d
Some minor changes.
2017-09-05 12:00:42 +02:00
LevelX2
abb2efa25c
Removed unused code.
2017-09-04 09:54:00 +02:00
LevelX2
720351c065
Some minor user handling changes.
2017-09-02 00:46:24 +02:00
LevelX2
4c5e5d1367
GamManager added lock handling.
2017-09-01 23:22:39 +02:00
LevelX2
7019db9479
TableManager added lock handling.
2017-09-01 21:14:45 +02:00
LevelX2
84fe04b92d
Replaced exception handling of invalid deck submitting by a user message.
2017-09-01 20:05:26 +02:00
LevelX2
a46538fc06
Removed some unused code.
2017-09-01 16:03:43 +02:00
LevelX2
d024d59626
* Some changes to chat and user handling.
2017-08-27 00:31:52 +02:00
LevelX2
52897094b3
* Some chnages to chat, user and player handling.
2017-08-26 18:26:55 +02:00
spjspj
95933c2edd
Merge pull request #3861 from spjspj/master
...
Update penny dreadful list (http://pdmtgo.com/legal_cards.txt )
2017-08-20 22:04:33 +10:00
spjspj
4687943176
Update penny dreadful list ( http://pdmtgo.com/legal_cards.txt )
2017-08-20 22:01:19 +10:00
LevelX2
d7ee6db923
Fixed condition for deck manipulation report.
2017-08-19 07:47:13 +02:00
LevelX2
fea9dfe8f8
Some more changes to the user handling.
2017-08-18 00:12:38 +02:00
LevelX2
a259fd3da8
Merge origin/master
2017-08-17 07:53:26 +02:00
LevelX2
351feb5a99
* Fixed that at match start if a player chooses who starts, the idle check was not started.
2017-08-17 00:36:59 +02:00
spjspj
dbe8e98d85
Fix(?) for penny dreadful edh
2017-08-16 23:08:38 +10:00
LevelX2
8ab9abb8e8
* Some more changes to user disconnect handling.
2017-08-16 07:51:48 +02:00
LevelX2
1fb24116ae
xmage 1.4.26V0
2017-08-15 01:27:06 +02:00
LevelX2
6244046330
* Some minor changes.
2017-08-14 16:48:48 +02:00
LevelX2
bae7f154df
Changed user disconnect handling. The user in the server is no longer deleted directly after connection problem, disconnect or quit. The user object remains now for 8 minutes so the rejoin not possible after disconnect problem should be solved (I hope so). We will see. Also fixed the problem, that the table panel was not shown, if a player disconected and reconected.
2017-08-13 16:22:18 +02:00
spjspj
6435b9950a
Add in Penny Dreadful EDH format (plus filter options for deck editor).
2017-08-04 17:13:25 +10:00
LevelX2
fe2ee5dfec
Xmage 1.4.25V0
2017-07-29 20:35:16 +02:00
LevelX2
0ef94a588c
* Fixed some null pointer or other exception bugs.
2017-07-29 19:13:42 +02:00
LevelX2
fbd90bb3e0
* Some minor reworks to prevent exceptions.
2017-07-23 23:16:27 +02:00
LevelX2
ee59ec80e2
* Fixed a problem that the table health check removed tables that were just created by adding 30 seconds check stop after table start to prevent checking while server still is initializing the table start.
2017-07-23 20:28:18 +02:00
LevelX2
4c33359fe2
* Some minor changes to logging and return code handling.
2017-07-23 11:06:23 +02:00
igoudt
905829561e
talk to interfaces rather than implementations
2017-07-16 11:08:09 +02:00
LevelX2
1fe841e6d9
Merge branch 'master' into master
2017-07-10 13:18:58 +02:00
fireshoes
48413a956a
Added MTGO 1v1 Commander and Amonkhet Block Constructed formats. Fixed a typo in the Duel Commander banlist.
2017-07-09 16:51:57 -05:00
Benjamin Maitland
8e16cf0bd6
Added the Old School 93/94 Format. Uses original rules.
2017-07-08 23:40:27 -04:00
LevelX2
7d911ae803
XMage 1.4.24V0
2017-07-08 16:33:09 +02:00
igoudt
a167122459
loop to streams
2017-07-08 10:58:47 +02:00
fireshoes
1d183736c8
Added Vintage Cube June 2017. Added some HOU and XLN spoilers to mtg-cards-data.txt.
2017-06-26 20:31:02 -05:00
LevelX2
0fd72c3010
* Added check if the deck was modified during sideboarding.
2017-06-05 20:23:09 +02:00
Anders Åstrand
ad0507e739
Ban ignored users from watching
...
This commit bans ignored users from watching
games where the creator has them on their ignore list.
2017-05-29 21:36:42 +02:00
spjspj
b467ff2080
Add emblems into the int.txt file 'emblem:Human:ElspethSunsChampionEmblem:1' for example
2017-05-21 12:42:50 +10:00
LevelX2
a068de8d18
* Rooftop Storm - Fixed wrong alternate cost handling ( fixes #3387 ).
2017-05-17 15:06:52 +02:00
magenoxx
2a366c4022
#3323 : New perspectives, fixed deadlock freeze
2017-05-13 18:57:33 +03:00
LevelX2
60cc3a7622
* Some minor fixed and log changes.
2017-04-25 17:37:38 +02:00
spjspj
be92bf9e41
Merge pull request #3231 from spjspj/master
...
Add in /card command for chat to get back card's: cost, type, text.
2017-04-25 10:20:09 +10:00
spjspj
1d46fec3ff
Add in /card command for chat to get back card's: cost, type, text.
2017-04-25 10:18:00 +10:00
LevelX2
c085ea148a
* Changed some logging messages.
2017-04-23 14:11:02 +02:00
spjspj
6ab4a94bd7
spjspj - Add in 'View Current Deck' option.
2017-04-23 13:06:09 +10:00
spjspj
94ea9b8ebd
spjspj - Add option of adding in Tokens from the init.txt file
...
token:Human:MerfolkWizardToken:1
token:Human:GermToken:1
are examples
2017-04-23 02:51:49 +10:00
spjspj
f73c30812e
Merge branch 'master' of https://github.com/spjspj/mage
2017-04-22 19:36:28 +10:00
spjspj
8845d77628
spjspj - Remove View Limited Deck option
2017-04-22 19:35:08 +10:00
spjspj
ca519894b5
spjspj - Add a View Limited Deck option to allow you to see your deck during matches.
2017-04-22 19:26:59 +10:00
spjspj
0cd4e06e22
spjspj - Add a View Limited Deck option to allow you to see your deck during matches.
2017-04-22 19:16:12 +10:00
fireshoes
399d589358
Added Sam Black's No Search Cube.
2017-04-20 09:59:51 -05:00
LevelX2
a4afdb8d3f
Removed some not needed error log messages.
2017-04-18 23:35:45 +02:00
magenoxx
fdf15262f9
Returned back my old old avatars
2017-04-18 19:56:35 +03:00
LevelX2
7e57c87f81
* Fixed a bug that prevented the 'Right Mouse Click' menu itmes 'Always Yes'/No' to show ( fixes #3128 ).
2017-04-17 23:40:28 +02:00
LevelX2
8ad957447e
Some minor changes to server connect handling and logging.
2017-04-17 18:28:35 +02:00
LevelX2
ef4cf90a0f
Release 1.4.23V0
2017-04-17 10:53:59 +02:00
LevelX2
35791ac6b7
Set SocketWriteTimeout to 10 seconds.
2017-04-17 00:01:39 +02:00
LevelX2
88d121f6e9
Fixed a problem that Ai players did no longer work in tournaments.
2017-04-15 18:15:07 +02:00
LevelX2
f90d49ae0a
Fixed a problem that general tournament messages (not send by a user) were no longer displayed.
2017-04-15 18:14:39 +02:00
ingmargoudt
8b44327312
wrong negation
2017-04-11 09:15:09 +02:00
ingmargoudt
c461d67d34
put disconnect reason message in enum
2017-04-04 21:59:26 +02:00
ingmargoudt
ff6d1541c3
clientcallbacks to enums
2017-04-04 21:52:15 +02:00
ingmargoudt
f04fecf7a6
broadcast fix
2017-04-04 20:40:37 +02:00
ingmargoudt
211d433ea9
playertype, enum singleton
2017-04-02 22:09:20 +02:00
LevelX2
4c35650b2b
* Fixed a problem that chat messages were no longer broadcast ( fixes #3050 ).
2017-04-02 10:51:00 +02:00
fireshoes
55b433ae36
[AKH] Added 3/27 spoilers to mtg-cards-data.txt. Implemented several of the new cards.
2017-03-28 22:25:29 -05:00
ingmargoudt
95869811ac
fixed scope issue when logging in
2017-03-25 09:38:08 +01:00
ingmargoudt
334ad729a8
remove usermap by name, introduced more optionals
2017-03-22 20:49:48 +01:00
ingmargoudt
ff6c6405aa
rewrites to optionals
2017-03-19 19:48:32 +01:00
ingmargoudt
234cfe9519
rewrote singleton to enum where applicable
2017-03-14 16:32:47 +01:00
LevelX2
9d8a8a33f1
Xmage 1.4.22V0
2017-03-11 13:38:55 +01:00
Derek Monturo
0ecf679c7f
if an empty email address is used, display a more specific message
2017-03-07 10:23:51 -05:00
ingmargoudt
372584f7ad
changed cardtype from list to enumset
2017-03-03 17:04:32 +01:00
fireshoes
010be2b53f
Added 3/2/17 MM3 reprints.
2017-03-02 21:39:14 -06:00
spjspj
4681232d18
Refactor color restriction in edh...
2017-03-01 09:11:29 +11:00
spjspj
faee8fb298
Refactor color restriction in edh. Change to look at commander color identity.
2017-03-01 08:56:52 +11:00
vraskulin
0bc9cf91a8
Minor improvements - StringBuilder now have initial value
2017-02-28 15:26:07 +03:00
vraskulin
eb58391fe2
Redundant StringBuilder creation.
2017-02-28 11:07:40 +03:00
ingmargoudt
afbf5ce2b6
Merge pull request #2891 from kubikrubikvkube/master
...
Nulls to optional. Also there was bug with AetherChaser
2017-02-27 17:51:35 +01:00
vraskulin
498c8cf60c
Made utility classes final to explicitly forbid it's inheritance
2017-02-27 17:03:38 +03:00
spjspj
aec46f366b
Merge pull request #2894 from spjspj/master
...
Allow limiting a colour in edh
2017-02-27 23:35:57 +11:00
spjspj
5365f9cac5
Allow limiting a colour in edh
2017-02-27 23:33:58 +11:00
doncarton
5eaaa67d1e
Nulls to optional. Also there was bug with AetherChaser "you may pay" was not set to optional
2017-02-26 15:15:54 +03:00
Anders Åstrand
f68460603a
Add client-side user ignore list
...
This commit adds a client-side per-server ignore list.
* Whispers and talk from an ignored user is hidden
* Ignored users cannot join your tables
* Ignored users tables are hidden
2017-02-22 22:16:09 +01:00
spjspj
a6e34c040b
Limit messages to 500 characters
2017-02-18 20:32:22 +11:00
vraskulin
a15220d51e
Bugfixes with != instead of equals and default toString calls
2017-02-15 19:52:20 +03:00
vraskulin
752392fc46
Functional interfaces should be annotated as functional interfaces
2017-02-15 19:23:12 +03:00
vraskulin
f1ef3bf68b
Narrowed variables scope.
2017-02-15 16:05:18 +03:00
ingmargoudt
3a152ab3d6
rewrote enum comparisons, iterator to removeIf, added some stream and filters
2017-02-11 22:37:00 +01:00
ingmargoudt
20b24e3360
Merge pull request #2846 from kubikrubikvkube/master
...
Singleton object should not have map with values that can't be GCed
2017-02-11 20:43:32 +01:00
spjspj
d30e959f43
Merge pull request #2854 from spjspj/master
...
Implement Parallax Nexus
2017-02-11 20:13:32 +11:00
spjspj
4f13d89849
In testmode, ok to not send an email.
2017-02-11 01:26:52 +11:00
vraskulin
f99cd21275
Mostly code format fixes.
2017-02-09 18:30:31 +03:00
vraskulin
7cf4ca3cae
Can be isEmpty
2017-02-09 17:44:14 +03:00
vraskulin
433b08238f
We're gonna use standart parameterised constructor, instead of addAll method.
2017-02-09 17:42:05 +03:00
vraskulin
192110cd68
There is no need to call simple getter from the same class.
2017-02-09 17:40:51 +03:00
LevelX2
b8cc0120cb
Merge origin/master
2017-02-06 21:21:16 +01:00