github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-29 11:09:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
18630 commits 2 branches 0 tags 782 MiB
Commit graph

1080 commits

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