Shaun Bennett
043f67f78c
Fix for max players not displaying properly (MPS)
2014-12-23 17:48:38 -06:00
Shaun Bennett
d83b586a3a
Merge remote-tracking branch 'origin/master'
2014-12-23 08:08:00 -06:00
Shaun Bennett
cff63ca3e3
Phinary needs some sleep!
2014-12-23 08:07:46 -06:00
Jonathan Williams
a1dd1b8753
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 08:08:48 -05:00
Jonathan Williams
5dcda626e7
Fixed port stuff for MPS
2014-12-23 08:08:41 -05:00
Chiss
1a3920d04a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 23:45:11 +11:00
Chiss
35bcf28c83
champions builds will now load in MPS, even if the current game isnt champs.
2014-12-23 23:44:59 +11:00
Shaun Bennett
9c1e3aa7aa
Ignore full or dead servers
2014-12-23 06:26:51 -06:00
Shaun Bennett
d40b154902
Merge remote-tracking branch 'origin/master'
2014-12-23 06:20:43 -06:00
Shaun Bennett
c40a5a8eac
Another bugfix
2014-12-23 06:20:36 -06:00
Chiss
78977788a1
fixed bug
2014-12-23 23:18:29 +11:00
Chiss
f4c5922b05
added messages for when server is expired
2014-12-23 23:17:21 +11:00
Chiss
78d94320a8
fixed reciptient of message
2014-12-23 22:55:07 +11:00
Shaun Bennett
ea6214b2ad
Merge remote-tracking branch 'origin/master'
2014-12-23 05:49:08 -06:00
Shaun Bennett
582ed34d21
Fix for staff hosted
2014-12-23 05:48:45 -06:00
Jonathan Williams
07cca7a1d4
Fixed NPE in GameHostManager
...
Fixed CD for creating server.
2014-12-23 06:46:05 -05:00
Chiss
4bfd34034b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 22:19:50 +11:00
Chiss
8c2d879036
added ownership of legend particle for legends.
2014-12-23 22:17:39 +11:00
Jonathan Williams
50993d19f3
Added Legend for Enjin
2014-12-23 06:07:14 -05:00
Jonathan Williams
d2e078f890
Fixed ranks for MPS
2014-12-23 06:04:42 -05:00
Jonathan Williams
fb841c3831
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
2014-12-23 05:57:45 -05:00
Jonathan Williams
bb8b1d60f9
30 seconds recharge on ability to host locally.
2014-12-23 05:56:17 -05:00
Shaun Bennett
5f509ca488
Rank fixes, visual fixes, lets hope things work!
2014-12-23 04:55:00 -06:00
Shaun Bennett
d8311d860e
Ignore private servers
2014-12-23 04:21:37 -06:00
Shaun Bennett
21d255fcd1
Merge remote-tracking branch 'origin/master'
2014-12-23 04:15:55 -06:00
Shaun Bennett
c41b5b0cfb
private server gui, i think?
2014-12-23 04:15:33 -06:00
Chiss
6d2bd84b5b
disabled always joinable motd for minestrike
2014-12-23 20:39:49 +11:00
Jonathan Williams
7ef2edd498
Removed extra enjin message.
...
Added retrieval of servergroups to identify if server is a player server or not.
2014-12-23 04:19:24 -05:00
Jonathan Williams
9a767af018
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 03:44:05 -05:00
Jonathan Williams
f00854ee4c
Removed bad code thats bad from the bad birdy.
...
Hooked in PersonalServer item click and command.
Re-enabled redis transport commands.
Added transfer command sending on personal server start.
Updated Enjin to handle more versatile inventory purchases.
2014-12-23 03:43:56 -05:00
Chiss
521b61c624
disabled free evolutions
2014-12-23 19:42:13 +11:00
Chiss
6b5b072ae8
missing file
2014-12-23 19:36:23 +11:00
Chiss
7496f64d58
benefit
2014-12-23 19:36:10 +11:00
Chiss
a15256da88
update
2014-12-23 19:04:10 +11:00
Jonathan Williams
103ff0e6b0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 02:57:24 -05:00
Chiss
07d82b8206
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 18:39:22 +11:00
Chiss
39745913ac
re-enabled roggue
2014-12-23 18:39:05 +11:00
Shaun Bennett
2a585936b7
Maybe I should test before I commit!
2014-12-23 00:37:29 -06:00
Shaun Bennett
2848ec2751
Use the correct data value this time!
2014-12-23 00:33:47 -06:00
Shaun Bennett
48fdfbb8f0
Hub changes for private servers
2014-12-23 00:30:15 -06:00
Shaun Bennett
eb0f23318f
Fix my fix for scoreboard - mine broke when new players joined
2014-12-23 00:06:30 -06:00
Shaun Bennett
4b4ebd0e36
Change admin item to sparkling melon
2014-12-23 00:06:04 -06:00
Shaun Bennett
8f9794a5f7
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
2014-12-22 23:56:18 -06:00
Shaun Bennett
706b3e25ef
Fix broken player count when changing max players
2014-12-22 23:54:51 -06:00
Chiss
64d37d1886
minor snd changes
2014-12-23 16:50:31 +11:00
Jonathan Williams
4cac65a81f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 00:50:20 -05:00
Jonathan Williams
0e85b7e6cc
Added HostName to server groups.
...
Added handling of private server groups in server monitor.
Optimized server group/server status load.
Added ability to add/remove server group.
2014-12-23 00:49:52 -05:00
Shaun Bennett
1957db25d9
Add player head button
2014-12-22 23:20:20 -06:00
Shaun Bennett
befc2cff7c
messing with jedis subpub
2014-12-22 22:49:28 -06:00
Chiss
e8953b0c96
fixed merge errors
2014-12-23 15:14:03 +11:00
