Commit graph

1006 commits

Author SHA1 Message Date
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