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
LevelX2
1dbd24cde6
Fixed a null pointer error in user.
2017-02-06 21:20:55 +01:00
vraskulin
0557b5e89c
list.size > 0 changed to !list.isEmpty
...
We care about if it's empty or not, not about it's size
2017-02-06 14:32:51 +03:00
vraskulin
f60ebfbb1f
All 1-character strings converted to primitives
...
"b" + "r" now changed to 'b' + 'w'. It's more straight-forward, and may cause perfomance improvements - character primitives allocation is faster and less expensive than string creation.
2017-02-06 14:32:51 +03:00
vraskulin
31589778ca
Try/finally refactored to try with resources
2017-02-06 14:32:11 +03:00
vraskulin
d8c4e60138
Removed outdated "main" method that prints few sanitized lines
2017-02-06 14:32:11 +03:00
spjspj
82ae76dbb8
Merge pull request #2838 from spjspj/master
...
Add Canadian Highlander Deck/Game implementation.
2017-02-05 23:34:21 +11:00
spjspj
2bfa83df19
Add Canadian Highlander Deck/Game implementation.
2017-02-05 23:33:28 +11:00
spjspj
72f4778506
Merge pull request #2837 from spjspj/master
...
Add Canadian Highlander Deck/Game implementation.
2017-02-05 23:25:53 +11:00
spjspj
c98bf163be
Add Canadian Highlander Deck/Game implementation. Also implements the double-mulligan-on-6,5,4,3,2,1 rule.
2017-02-05 23:23:51 +11:00
spjspj
9fe53e52c2
Merge pull request #2836 from spjspj/master
...
Add field for server console
2017-02-05 14:54:28 +11:00
spjspj
fa97e4647e
Add field for server console
2017-02-05 14:11:05 +11:00
LevelX2
5212c3c7dd
Fixed an Optional<> bug of GameController.
2017-02-04 14:27:03 +01:00
LevelX2
2a3e38f845
* Fixed a bug that prevented rollback request window to appear.
2017-02-03 21:00:49 +01:00
spjspj
4bad553249
Merge pull request #2824 from spjspj/master
...
Add Canadian Highlander format
2017-01-30 23:56:49 +11:00
spjspj
532eb3fdea
Add Canadian Highlander format
2017-01-30 23:48:16 +11:00
spjspj
676d2a54dc
Merge pull request #2820 from spjspj/master
...
Modify the profanity filter to push it back to client side only.
2017-01-27 18:21:04 +11:00
spjspj
70453f1ac3
Modify the profanity filter to push it back to client side only.
2017-01-27 18:19:45 +11:00
spjspj
c2e41640e8
Merge pull request #2819 from spjspj/master
...
Modify the profanity filter to push it back to client side only.
2017-01-27 12:39:37 +11:00
spjspj
f41d81f8e4
Modify the profanity filter to push it back to client side only.
2017-01-27 12:38:31 +11:00
LevelX2
fc6dba3da0
Added "MTGO Legacy Cube January 2017" to the server xml.
2017-01-25 00:13:51 +01:00
LevelX2
f5b5014b2d
Fixed a bug from addding new java Optionals constructs that prevented games to start.
2017-01-21 01:12:10 +01:00
Quercitron
c52637343c
Fix build.
2017-01-20 04:18:44 +03:00
Goudt
84081cbece
small fixes after comments
2017-01-18 23:59:19 +01:00
Goudt
a522930592
Merge branch 'master' of https://github.com/magefree/mage
2017-01-18 23:53:29 +01:00
LevelX2
6625bf86be
Xmage 1.4.21V0
2017-01-15 17:44:02 +01:00
spjspj
b397e2849c
Add missing field to userData
2017-01-15 23:33:20 +11:00
igoudt
f98afdf4ad
Introducing Optionals
2017-01-14 21:52:40 +01:00
spjspj
72e4df539b
spjspj - Send generated password in an email to new users.
2017-01-15 02:57:25 +11:00
spjspj
6ffa1dc146
Merge pull request #2796 from spjspj/master
...
spjspj - Add Set Active to server console
2017-01-14 16:52:48 +11:00
spjspj
51843474f0
spjspj - Add Set Active to server console
2017-01-14 16:46:27 +11:00
spjspj
ee285e36f6
Merge pull request #2793 from spjspj/master
...
spjspj - Add Set Active to server console
2017-01-14 15:30:02 +11:00
spjspj
6d3324378f
spjspj - Add Set Active to server console
2017-01-14 15:29:15 +11:00
igoudt
ac8962cb29
replaced enum comparison from equals to ==
2017-01-11 09:53:16 +01:00
vraskulin
46d369c8ed
Big refactoring (server)
...
I used Intellij IDEA to automatically refactor code to achive 3 goals.
1) get rid of anonymouse classes, and replace the with lamba to get more readeable and clean code (like in TableWaitingDialog).
2) make effectively final variables actually final to avoid inadvertent changes on it in further releases and keep objects as immutable, as possible.
3) Get rid of unused imports (most of the changes) in whole project classes.
2017-01-09 19:47:03 +03:00
spjspj
4a5dc3c67d
Chat Manager - Add [Card Name] for colour highlighting of implemented cards
2017-01-08 17:05:51 +11:00
spjspj
fcffb6fa7f
Merge pull request #2755 from spjspj/master
...
Some Chat Manager updates
2017-01-08 11:58:25 +11:00
spjspj
0de89ca5b7
Some Chat Manager updates
2017-01-08 11:57:16 +11:00
LevelX2
ee203cf981
Xmage Release 1.4.20V0
2017-01-08 01:36:05 +01:00
vraskulin
b4546a2ecb
Renamed method
...
According java naming convention methods should start from lowercase letter.
2016-12-29 14:13:23 +03:00
LevelX2
233096dc1b
Merge pull request #2715 from bhickey/bowdlerize
...
Censor the word "penis"
2016-12-25 10:57:36 +01:00
Brendan Hickey
3294e51d29
Censor the word "penis"
...
mage is censoring the word "vagina", so it should also censor "penis"
2016-12-24 11:36:04 -05:00
vraskulin
e22951c68e
Repository objects refactoring
...
SQL query is limited by 1, so there will be two cases - whether collection is empty or not. We should user convenient shortcut for checking emptiness of collection
2016-12-19 11:30:32 +03:00
vraskulin
3be7598ee1
SQL query perfomance improvements
...
There will be always 0 or 1 distinct result. If we don't limit this query it will find an item, and still will go through the whole table trying another one, which is unneccesary and have performance impact.
2016-12-16 17:27:19 +03:00
fireshoes
2b25440bd9
Merge origin/master
2016-12-07 09:44:56 -06:00
LevelX2
b62ca1ed1f
Xmage 1.4.19
2016-11-27 19:59:42 +01:00
spjspj
159d06477d
spjspj - Implement Australian 7pt Highlander
2016-11-26 09:40:05 +11:00
spjspj
c0be640c4a
spjspj - Implement Australian 7pt Highlander
2016-11-25 20:56:24 +11:00
spjspj
7fd2eeedcf
Add 'EDH power level' rating to Commander tables
2016-11-20 23:13:16 +11:00
spjspj
d7b1ae68ed
spjspj - Sorcery count was double
2016-11-18 00:14:59 +11:00
spjspj
a2b3d8825e
Add 'xmage.de', 'woogerworks', 'localhost' buttons to connection dialog to fill in appropriate password/username
2016-11-13 22:59:32 +11:00
spjspj
af725f8a6e
Fix spam filter on a per-user basis and implement rudimentary swear guard.
2016-11-12 22:39:18 +11:00
spjspj
08ffbb7d3c
Fix spam filter on a per-user basis and implement rudimentary swear guard.
2016-11-12 22:37:18 +11:00
spjspj
8a8ca87c8d
spjspj - Make test mode of server not care about password
2016-11-12 18:13:28 +11:00
fireshoes
4590c19b71
Update Adam Styborski's Cube through C16.
2016-11-08 12:09:48 -06:00
LevelX2
c9e1b415e2
Xmage 1.4.18V0
2016-11-06 18:11:19 +01:00
LevelX2
c98671282f
* Cursed Rack - Fixed that the hand size modification was applied to the controller of the cursed rack instead of the chosen opponent.
2016-11-01 23:36:42 +01:00
LevelX2
1791b809db
Added some more info to some logger and game messages. Removed unused method.
2016-11-01 23:02:11 +01:00
LevelX2
88af59697e
* Removed the LogServices (H2 DB file that logs actions).
2016-10-28 23:46:55 +02:00
LevelX2
e1ca3b5cc5
* Removed the LogServices (H2 DB file that logs actions).
2016-10-28 18:39:17 +02:00
LevelX2
450d850ab4
* Some minor changes.
2016-10-26 07:50:32 +02:00
LevelX2
c6826d19d4
* Some rework of ChatSession.
2016-10-24 23:55:50 +02:00
LevelX2
8b62eece68
XMage 1.4.17V0
2016-10-23 10:03:01 +02:00
fireshoes
a13dc33342
Fixed cube name.
2016-10-18 19:27:25 -05:00
fireshoes
1f4c0eb1d9
Added the four finalists from You Make the Cube.
2016-10-17 23:10:01 -05:00
LevelX2
157827addc
XMage 1.4.16v0
2016-10-08 11:14:13 +02:00
LevelX2
fae1cb8cce
Added chat mute and user (de)activation actions to the Mage server console.
2016-10-06 01:09:53 +02:00
LevelX2
c46f75ac28
Added chat mute and user (de)activation actions to the Mage server console.
2016-10-05 00:59:51 +02:00
LevelX2
db31264538
Some changes to the server console.
2016-10-04 17:40:37 +02:00
LevelX2
9a00dd20ca
Fixed some problems with constructed formats definition and custom sets.
2016-10-03 20:25:08 +02:00
LevelX2
bdaa78e144
Some minor changes.
2016-10-03 10:00:48 +02:00
LevelX2
31e92fbfcb
Fixed that preventing identical chat messages is not active for game log ( fixes #2274 ).
2016-10-02 23:46:32 +02:00
LevelX2
5d94ed8dd0
Some clean up changes.
2016-10-02 17:27:05 +02:00
LevelX2
ca39289a3a
Fixed a possible null pointer exception.
2016-09-29 16:20:29 +02:00
fireshoes
783a278fca
Added Frontier format (M15 forward). Added Kaladesh block constructed.
2016-09-27 01:54:49 -05:00
Lymia Aluysia
48e14a1765
Rename stuff. Names are hard.
2016-09-25 14:45:06 -05:00
Lymia Aluysia
2fec14f8fa
Minor error message fix.
2016-09-25 12:36:59 -05:00
Lymia Aluysia
51b9d5ba38
Improved debug output slightly.
2016-09-24 17:34:30 -05:00
Lymia Aluysia
d678fc1a59
Add custom set loader code.
2016-09-24 15:16:20 -05:00
spjspj
16bb17e5bb
spjspj - Add option of 'Number of Seats'. This is for Tournaments so that you can draft say a 4 way draft and then have a 4 way game at the end of it.
2016-09-25 00:46:16 +10:00
fireshoes
274dbc2dbb
Added Legacy Cube Sept 16 to the menu...
2016-09-22 10:52:28 -05:00
LevelX2
c82d6b5566
* Fixed some possible null pointer exceptions.
2016-09-20 23:40:25 +02:00
LevelX2
d3d1402fbb
[KLD] Added 9 white cards.
2016-09-17 00:45:33 +02:00
LevelX2
d7dd635bca
Revert "introduced StringUtil class with .isEmpty(String input) and .isNotEmp…"
2016-09-16 23:55:54 +02:00
ingmargoudt
f1cf9e7adb
introduced StringUtil class with .isEmpty(String input) and .isNotEmpty(String input), to replace str != null && str.length()>0 statements
2016-09-16 21:23:31 +02:00
Samuel Sandeen
377a0edec9
Fix a bug in the cheat system for manual testing.
2016-09-15 19:20:04 -04:00
ingmargoudt
3128bd2b4b
replace [list].size() == 0 and [string].length() == 0 to use .isEmpty() instead
2016-09-14 15:27:31 +02:00
LevelX2
bb8326d46b
XMage 1.4.15v0
2016-09-10 12:31:18 +02:00
Samuel Sandeen
d53f751711
Update the cheat testing code
...
The new Zone change code is more strict so the cheat code needs to
trick it.
2016-09-08 19:56:40 -04:00
ingmargoudt
e2a479255a
refactor : removed all instances of new Random() and replaced with RandomUtil for a ThreadLocal randomizer
2016-09-05 15:03:47 +02:00
LevelX2
539b03bd1d
Xmage 1.4.14v0
2016-08-13 10:14:38 +02:00
fwannmacher
a052830628
- Removed "CARD ZONE" from tooltip when it is not necessary
2016-08-08 18:30:42 -03:00
Will Hall
e2fdcb8aa3
Use "his or her" rather than "his"
2016-08-05 22:34:46 -07:00
spjspj
883b63a01d
spjspj - Update to push deck List across from Client to Server for Custom Cube
2016-07-25 22:44:21 +10:00
spjspj
5e6836a8f6
spjspj - Prevent some types of spam in the main chat
2016-07-24 01:56:05 +10:00
fireshoes
99dbdef5ce
Added Vintage Cube June 2016 to the cube menu. Fixed that Permeating Mass did not use LKI for creating the copy.
2016-07-22 11:52:04 -05:00
Quercitron
cba91dc1d1
Add \me chat command.
2016-07-14 02:35:21 +03:00
LevelX2
d0ecb473da
Xmage 1.4.13v0
2016-07-11 22:54:43 +02:00
spjspj
26d38f0773
spjspj - Add the option of having a .dck file as a cube
2016-07-04 00:20:31 +10:00
spjspj
2eb68403cf
spjspj - Add Rich Man Cube draft. This is a variation on the Rich Man set draft. It still (like cube) shouldn't let there be more than one copy of a card in the draft but will give each player a new pack from the cards that haven't been picked already each time. Allows 2 player cube drafts to be playable.
2016-06-26 12:54:59 +10:00
LevelX2
663c6fe1e9
Try to fix "Comparison method violates its general contract" error.
2016-06-18 12:55:54 +02:00
LevelX2
266a0870ca
Xmage 1.4.12v0
2016-05-29 10:59:39 +02:00
Quercitron
608cab21a9
Fix that incorrect UserStats endTime can be set when rating is updated.
2016-05-21 01:55:29 +03:00
Quercitron
c781728b97
Add rating to the client ( #1498 )
2016-05-17 17:27:43 +03:00
Quercitron
972d59aa37
Add user rating using Glicko rating system ( #1498 )
2016-05-17 17:22:14 +03:00
Nathaniel Brandes
43205b6f46
Fix Angel of Jubilation.
...
The Angel now properly only restricts the sacrifice of creatures.
2016-05-09 00:26:02 -07:00
LevelX2
eb98568b8c
Added Rich Man Draft to the default config.xml used by the local xmage server.
2016-04-27 15:42:45 +02:00
LevelX2
e2a8ddef0f
Merge pull request #1905 from KWottrich/clean-up-java-imports
...
Clean up java imports
2016-04-26 11:37:35 +02:00
LevelX2
1fcd26fc60
xmage 1.4.11v0
2016-04-26 00:59:03 +02:00
Kenny Wottrich
f3c83d54f5
Remove Unused Imports
...
Delete unused java imports that cause compiler warnings
2016-04-24 19:50:29 -05:00
fireshoes
a4e1444d63
Added Freeform constructed format (same requirements as limited), Shadows over Innistrad block constructed format, and added Wastes as a valid basic land for Momir Basic.
2016-04-18 20:16:44 -05:00
emerald000
b9ab16d945
Remove use of maven-shade-plugin causing some Netbeans bug.
...
It shouldn't be necessary anyway.
2016-04-17 19:23:38 -04:00
LevelX2
5770dd6014
Added some lost and reconnect statistics to footer data.
2016-04-14 23:43:08 +02:00
Fenhl
430ae503c7
Change all line endings to LF
2016-04-14 16:18:01 +00:00
spjspj
bd12d17d44
spjspj - Implement new form of draft in which you simulate opening a full booster box (36 boosters) and take one at a time. Known (to me at least) colloquially as 'Rich Man's Draft' as it requires you to buy a full booster box.
2016-04-14 22:48:54 +10:00
LevelX2
41ba4c9540
Some changes to logged data and a NPE prevention.
2016-04-14 08:28:28 +02:00
fireshoes
2778ae2381
Added Legendary Cube April 2016.
2016-04-06 22:41:15 -05:00
LevelX2
bcdde0a945
XMage version 1.4.10v0
2016-04-06 22:56:02 +02:00
LevelX2
74c310de3e
Fixed some more possible exception bugs.
2016-04-06 20:45:33 +02:00
spjspj
e5ca1bd6d2
spjspj - Implement a 'Use the first available mana ability for a land mode'.
...
This allows people to float mana more easily and to not have to get the popup forcing them to select which mana ability they would like to activate.
There's a new option in the menu system under the Mana Payment section which is set via pressing 'Alt' and the number '1' key (aka Alt+1) (and is unset by releasing Alt+1).
Or they can set it from the right click menu as well.
2016-04-04 20:30:28 +10:00
LevelX2
fa5dd387b4
Added check to limit the number of waiting tables a player can create at the same time.
2016-03-26 10:42:02 +01:00
spjspj
81e5c2b50e
spjspj - Fix with error message.
2016-03-07 00:13:31 +11:00
spjspj
2aceb3fcef
And again.
2016-03-06 23:59:00 +11:00
spjspj
6116320591
spjspj - Make mistakes in using user-chat commands less visible to the whole chat
2016-03-06 22:46:13 +11:00
LevelX2
619856c8f5
Some minor changes.
2016-03-06 10:25:11 +01:00
LevelX2
3f57012c85
Merge origin/master
...
Conflicts:
Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java
2016-03-03 23:22:06 +01:00
rkfg
b9dc5036ef
Assembly fix.
2016-02-26 21:05:21 +03:00
benjamin
d2fec6c61d
Added Eternal format (Legacy without reserve list cards). Fixed Issues 1133 and 1521 (Pauper Deck legality check).
2016-02-24 21:33:10 -05:00
LevelX2
e9638bcc4d
Release 1.4.9v0
2016-02-21 12:58:58 +01:00
LevelX2
1835671f3d
Some more changes to GUI to better support high screen resolutions.
2016-02-14 13:41:43 +01:00
LevelX2
687ab7ec6b
Added some tooltips to user table headers. History is shown in tournament player table now. Changed ratio column to numberic format.
2016-02-06 21:22:51 +01:00
LevelX2
d2eb6151f1
Fixed some possible exceptions.
2016-02-06 02:12:51 +01:00
LevelX2
81af372bc1
Fixed some problems with possible ConcurrentModificationExceptions and some minor changes.
2016-01-31 23:23:09 +01:00
Me Car
284c36b756
Add allowed quit ratio option to match option and tourney option.
2016-02-01 02:25:44 +09:00
Me Car
a33aa5d2df
Re-add the getHistory method.
2016-01-31 23:59:45 +09:00
LevelX2
1945e8eaa6
Fix for UserManager build error.
2016-01-31 15:46:55 +01:00
LevelX2
75f5a17135
Merge pull request #1505 from menocar/user-pane
...
Split History column into Matches and Tourneys columns.
2016-01-31 12:49:00 +01:00
LevelX2
78ac6688ea
Some tests and minor changes.
2016-01-31 09:51:23 +01:00
Me Car
574e3cfd36
Split History column into Matches and Tourneys column.
2016-01-30 16:01:04 +09:00
LevelX2
0a5a571141
Fixed a problem with the history chat command for user without matches.
2016-01-26 17:09:13 +01:00
LevelX2
dc04058b00
Added missing attributes to config.cml for release.
2016-01-25 20:20:50 +01:00
Me Car
240d548c90
Suggest user registration on login failures.
2016-01-25 21:27:57 +09:00
Me Car
665601b355
Fix HISTORY command.
2016-01-24 17:59:09 +09:00
Me Car
5029806baa
Update user stats DB on every table completion.
2016-01-24 14:55:19 +09:00
LevelX2
e82d6481df
changed command to show history from /info to /history (or /h).
2016-01-23 17:37:25 +01:00
LevelX2
e31b12325e
Added "info [username]" command to get history for offline players. Remove user info column.
2016-01-23 16:59:15 +01:00
LevelX2
151e678e84
Changed history handling for user a bit. Added history to table waiting dialog and user avatar tooltip.
2016-01-23 13:37:34 +01:00
LevelX2
24dddd3e06
Changed that player history string of all players were recreated every time the player list is updated (every 2 seconds).
2016-01-23 12:33:12 +01:00
LevelX2
5981816a4b
Switch to 1.4.8 for upcoming realease.
2016-01-22 22:33:58 +01:00
LevelX2
75edce2295
Changed that mailgun or smtp server can be used to send mails from server.
2016-01-22 17:47:05 +01:00
LevelX2
dcbe2da0e6
Changed that mailgun or smtp server can be used to send mails from server.
2016-01-22 17:46:57 +01:00
Me Car
9ca8342e34
Add MailClient that uses Java Mail API to send emails. Use it instead of Mailgun client.
2016-01-22 21:40:08 +09:00
LevelX2
c38b4b9b86
Some minor syntax formatting.
2016-01-21 16:40:46 +01:00
Me Car
8a5461d73b
Cache UserStats to User.
2016-01-21 00:44:50 +09:00
Me Car
46e560bd94
Removed unuseful proto fields. Added a better pom.xml documentation. Removed an unuseful logging.
2016-01-20 14:39:11 +09:00
Me Car
550648ccbe
Record game histories. Compute user stats and show them in the user panel.
2016-01-20 12:47:58 +09:00
LevelX2
90322d2846
Merge origin/master
2016-01-13 23:45:08 +01:00
LevelX2
45b8a254e6
Updated server start log info.
2016-01-13 23:44:16 +01:00
Me Car
4b25e32caf
Do not proceed to password reset flow when authentication is not enabled.
2016-01-14 07:12:03 +09:00
Me Car
99929b9679
Do not do IP address based user identity check when authentication is activated.
2016-01-13 22:11:23 +09:00
Me Car
7d3a9d076d
Use mailgun for sending emails.
2016-01-13 00:40:44 +09:00
LevelX2
300ac022cb
Fixed problem with static Pattern object.
2016-01-12 00:57:59 +01:00
Me Car
746d034461
Implement a password reset flow.
2016-01-11 21:49:02 +09:00
Me Car
f99660a451
Add some password validation.
2016-01-11 11:15:01 +09:00
Me Car
8dd1e21dba
Exit early for less indentation.
2016-01-11 10:20:38 +09:00
Me Car
3bc8f4bec2
Do not register users and connect users without passwords when authentication is not activated.
2016-01-11 10:17:30 +09:00
LevelX2
121f40c019
Prepared 1.4.7.
2016-01-10 22:13:59 +01:00
LevelX2
a5b10b7efd
Some default settings for config.xml
2016-01-10 20:58:58 +01:00
LevelX2
bc822c9677
Some minor changes for user registration.
2016-01-10 20:56:09 +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
Me Car
787f4f010a
Keep registerClient for older clients. Rename the new version to registerClientWithPassword. Add an error message on NoSuchMethodException so that this kind of version incompatibility can be handled and informed to user.
2016-01-07 23:43:28 +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
fireshoes
9a31402e9d
Added Legacy Cube 2016. [OGW] Added additional 1/4 spoilers to mtg-card-data.txt.Added Bone Saw reprint, Boulder Salvo, and Overwhelming Denial. Fixed translation on Corrupted Crossroads and Eldrazi Obligator and activation cost on General Tazri.
2016-01-05 00:30:59 -06:00
Me Car
32b4675f13
Integrate Shiro.
2016-01-05 03:48:43 +09:00
Me Car
d0ea7d9c37
Transfer password.
2016-01-05 02:40:05 +09:00
LevelX2
aecb2c8829
[OGW] Added surge and Crush of Tentacles.
2015-12-24 10:02:11 +01:00
LevelX2
207f486afc
* Xmage 1.4.6v0
2015-12-13 19:47:04 +01: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
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
LevelX2
0d86e8e063
Xmage 1.4.5v0
2015-11-21 10:33:43 +01: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
fireshoes
6a86a19408
[C15] ImplementedFiery, Mystic, Verdant, and Wretched Confluences. Added Legendary Cube.
2015-11-09 14:09:39 -06:00
LevelX2
a5d7ca83d7
Checked objects possible to cause null pointer exceptions. Added some logging.
2015-10-31 11:55:20 +01:00
LevelX2
e88c60eb85
* Scroll Rack - Fixed that the cards were shown face down if setting the order they go to library.
2015-10-31 10:33:37 +01:00
fireshoes
ff71654a5f
Added Adam Styborski's Pauper Cube and Army of Allah card.
2015-10-22 15:24:23 -05:00
fireshoes
3203df54c5
Merge origin/master
2015-09-29 17:19:47 -05: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
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
fireshoes
192fa87e58
Corrected the card list for Legacy Cube 2015 and renamed to Legacy Cube March 2015. Added Legacy Cube September 2015. [BFZ] Updated mtg-cards-data.txt for 9/14 spoilers and correct some translations. Implemented Noyan Dar, Roil Shaper; Transgress the Mind; Crumble to Dust; From Beyond; Dragonmaster Outcast reprint; Endless One; and Sylvan Scrying reprint.
2015-09-15 00:18:53 -05:00
LevelX2
9a37bd28ad
Xmage 1.4.4v0
2015-09-05 12:51:07 +02:00
fireshoes
84163dd356
Added Jim Davis's Cube
2015-09-03 17:12:15 -05: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
78071ce0a3
* Fixed a bug that order of triggered abilities of tokens were not shown to human player and the UI was locked ( fixes #910 ).
2015-08-25 23:34:15 +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
5dbc929367
Xmage 1.4.3v0
2015-08-06 23:11:36 +02:00
LevelX2
c98577cc6a
Xmage 1.4.3v0
2015-08-06 22:18:01 +02:00
LevelX2
aa67721804
Changed config.xml according Historical/Super Standard Format.
2015-08-06 15:35:14 +02:00
LevelX2
662ee7ca10
* Fixed handling of face down card selection (e.g. for Scroll Rack).
2015-08-05 17:45:45 +02:00
LevelX2
efb5e06e57
* Rollback - Fixed that UI is locked after a accepted rollback request ( fixes #1158 ).
2015-08-02 12:39:02 +02:00
benjamin
409edab4ec
Added Historical and Super Standard Validators to default configs
2015-07-27 21:46:12 -04:00
glerman
1567c4efe9
Adding Chronozoa card impl
2015-07-15 22:05:59 +03: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
b80e27f3b3
* Fixed handling of Phyrexian mana.
2015-07-09 01:43:26 +02:00
LevelX2
d847fb7109
Some minor changes.
2015-07-08 22:51:31 +02:00
LevelX2
6e2b4793f8
Fixed wrong type name in config.xml
2015-07-07 07:55:16 +02:00
Wehk
6e5acee2dc
Avatar test
...
Testing access to a "normal" avatar that is not added to "available_avatars". Can't test name cases in local build.
2015-07-06 21:53:22 +02:00
LevelX2
cd0cba6ec7
XMage Release 1.4.2v0
2015-07-04 01:28:19 +02:00
LevelX2
5ba94a7ec9
* Fixed exile and return back under owner control handling (e.g. Norin the Wary did not return from command zone when commander replacement effect was used).
2015-07-03 21:08:06 +02:00
LevelX2
946af6913d
Fixed NPE handling.
2015-07-03 21:05:05 +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
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
c774e95335
* Fixed some possible java exception causes.
2015-06-27 09:32:50 +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
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
LevelX2
0a3c081ded
Merge pull request #1048 from brodee/master
...
Chaos booster draft implementation
2015-06-23 21:59:46 +02:00
fireshoes
f13c1a5794
Added Holiday Cube 2015
2015-06-23 00:50:14 -05:00
brodee
e3b84eaab5
chaos booster draft implementation first check-in
2015-06-22 21:55:43 -07: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
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
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
8ae9293c98
* Added user country flag. View of image in user list is still missing.
2015-06-10 17:52:18 +02:00
LevelX2
9da44a547d
Added an option that player has to confirm if he passes priority with empty stack and has mana in his pool. Implements #707 .
2015-06-07 22:37:12 +02:00
LevelX2
907ec7abb0
Added new option for mana payment handling of mana already in the mana pool. Reworked the battlefield context menu a bit.
2015-06-07 17:14:43 +02:00
LevelX2
8acf28eed1
* Added optional rollback current turn and up to 3 previous turns to the battlefield menu. All other players have to agree to the rollback to let it happen.
2015-06-07 00:53:08 +02:00
LevelX2
bafd27f5b3
Identifier are shown for Looked at and revealed cards view
2015-06-03 17:05:59 +02:00
LevelX2
64ea893ea0
Some changes to logging.
2015-05-22 22:33:01 +02:00
LevelX2
fa847e8feb
* Update to version 1.4.0v0.
2015-05-12 23:11:25 +02:00
LevelX2
ed501cad21
* Some minor adjustements/changes.
2015-05-12 23:00:34 +02:00
LevelX2
9c97953b6b
Added some font color to object and player names output to game logging and feedback area.
2015-05-09 21:18:00 +02:00
North
c323c5b0b8
replaced jboss Logger usage with log4j
2015-05-06 00:38:29 +02:00
LevelX2
89f7a542a3
* Some more fixes to the name Shadowmoor.
2015-05-04 11:12:47 +02:00
LevelX2
c2fb2de67a
Fixed a bunch of NPE and other possible exceptions.
2015-04-20 23:37:28 +02:00
LevelX2
ed9d0a5fc1
Fixed a bug that user data was not set for players of tournaments ( fixes #903 ).
2015-04-12 08:34:23 +02:00
LevelX2
c65adebc57
Fixed that to allow watchers of a game to see the hand cards of players did not work correctly.
2015-04-10 12:36:22 +02:00
LevelX2
78df43fd30
Fixed a sideboarding bug of Tiny Leaders Format ( fixes #807 ).
2015-03-19 00:54:04 +01:00
LevelX2
b4b8135e4c
Some minor changes.
2015-03-14 22:38:15 +01:00
fireshoes
b1a88011ab
[DTK] Updated mtg-cards-data.txt for 3/3 spoilers and added Dragon Fodder, Evolving Wilds, and Dragonlord's Servant. [CUBE] Added Legacy Cube 2015
2015-03-04 12:09:03 -06:00
JRHerlehy
07db858f34
Implement Tiny Leaders for XMage
...
Initial implementation of Tiny Leaders for XMage
2015-02-28 16:16:10 -08:00
LevelX2
6f6b35d40f
Some minor changes.
2015-02-27 01:07:49 +01:00
LevelX2
79e9312893
* Fixed the annoying SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder" on client start. Updated a lot of POM references. Fixed warnings of Test Project. Some changes to logging.
2015-02-20 13:58:13 +01:00
LevelX2
38f9bb90b2
* Set the game thread name to the game id.
2015-02-12 13:51:27 +01:00
LevelX2
5727791526
* Fixed table health checking of tournament tables (waiting tournament tables were accidently removed).
2015-02-08 14:01:20 +01:00
LevelX2
adbd1bca94
* Imporoved release of draft object during draft tournament.
2015-02-06 00:23:01 +01:00
LevelX2
4e56e584b6
* Fixed that PriorityTimer was not canceled. Added gaeId to Timer name.
2015-02-05 22:43:51 +01:00
LevelX2
dd54269216
* Fixed handling of Split cards ( fixes #670 ).
2015-02-03 00:05:30 +01:00
LevelX2
2425704305
Reset table check intervall back to 10 minutes (was accidently commited with 1 minute).
2015-02-02 12:00:44 +01:00
LevelX2
00801e3ecf
* Some chnages to logging, added changes to table health check.
2015-02-02 08:40:30 +01:00
LevelX2
2544c12d48
* Some minor changes.
2015-02-01 16:47:21 +01:00
LevelX2
5701c36446
* Fixed possible null pointer exception.
2015-01-26 19:26:49 +01:00
LevelX2
6ef8b4f976
* Reworked DB comparison between client and server.
2015-01-25 19:21:50 +01:00
LevelX2
b12b044e36
* Added some basic logging for deck format validation
2015-01-21 14:40:05 +01:00
LevelX2
148994c9e5
* Fixed a bug that for players was not shown, that they play a tournament after round 1.
2015-01-07 23:43:58 +01:00
LevelX2
dd8a11ba5c
* Redesigned idle timeout handling to prevent selecting wrong player for timeout.
2014-12-27 17:31:52 +01:00
fireshoes
086f860396
Added Fate Reforged set, Valorous Stance FRF card, KTK Block Constructed option, added missing card to Holiday 2014 Cube
2014-12-21 19:57:23 -06:00
LevelX2
0ef340d108
* Some rework of User/Tournament/Quit handling.
2014-12-20 17:54:02 +01:00
LevelX2
43a90c6805
Added logging statement.
2014-12-14 22:56:50 +01:00
fireshoes
218e044804
Added Holiday Cube 2014 and some new cards
2014-12-12 13:58:03 -06:00
LevelX2
6434df04b2
* Some minor changes to server logging.
2014-12-11 02:06:34 +01:00
LevelX2
b3f1cc002e
* Changes to server lock handling and logging.
2014-12-10 15:00:55 +01:00
LevelX2
30869beca0
* Some changes to game start logic (better handling for disconnected users). Changes to server logging.
2014-12-08 01:30:18 +01:00
LevelX2
c5bc99b8de
* Changes to session lock handling.
2014-12-05 20:14:28 +01:00
LevelX2
896793b93d
* Session locking - Fixed some problems with the reentrant lock.
2014-12-01 17:00:26 +01:00
LevelX2
f85f477b90
Fixed a bug that a tournament match did not end, if a player left during sideboarding.
2014-11-27 18:41:33 +01:00
LevelX2
67479bb5a4
* Fixed wrong timer handling while other player controlled a player's turn. Attackers now marked with blue frame. Playable cards have a violet frame. If a player has to select cards from hand, the possible cards are marked yellow now. Discard of multiple cards now marks already selected cards and happens in one selection.
2014-11-26 01:48:00 +01:00
LevelX2
7e145d2cfd
* Added possibility to allow other players to see hand cards of player.
2014-11-24 23:03:21 +01:00
LevelX2
c22b54d262
*Draft - Non hidden picked cards go to the deck. Hidden cards to sideboard.
2014-11-23 18:43:31 +01:00
LevelX2
b0238b402e
*Changed lock handling of session to prevent continuous locking.
2014-11-23 18:42:22 +01:00
LevelX2
a82e9bfa64
* Admin console - Forced cancel user session .
2014-11-21 18:54:04 +01:00
LevelX2
04ba280be1
* Cube - Added The Peasant's Toolbox cube.
2014-11-08 17:20:36 +01:00
LevelX2
d7f100b24b
* Added "Duel Commander" format ( fixes #436 ).
2014-11-08 01:33:29 +01:00
LevelX2
751365124e
* Commander - Players no longer go to a sideboarding phase during caommander matches.
2014-11-07 14:24:07 +01:00
LevelX2
9b6bc80f34
Added MTGO Legacy Cube.
2014-11-03 22:31:13 +01:00
LevelX2
65c9ca845e
* Fixed a bug in table view sort.
2014-11-02 17:07:21 +01:00
LevelX2
8f642df60e
Added workaround for "Comparison method violates its general contract!" message of table sort.
2014-11-02 12:09:52 +01:00
LevelX2
8426816b09
* Some changes to table and match view.
2014-11-01 14:24:23 +01:00
LevelX2
e6c7fa5f96
* Draft - Added possibility to mark a card to draft on timeout. Added sounds to draft. Changed compression of some sound files.
2014-10-31 16:22:10 +01:00
LevelX2
2ac1340af7
* Some changes to version handling. Added display of server version (incl. minor server version) in client window titel.
2014-10-31 10:35:53 +01:00
LevelX2
df71237f46
* Added logic to auto select replacement effects. Some changes to counter size and font size handling.
2014-10-30 20:40:23 +01:00
