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
