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
bb8b1d60f9
30 seconds recharge on ability to host locally.
2014-12-23 05:56:17 -05:00
5f509ca488
Rank fixes, visual fixes, lets hope things work!
2014-12-23 04:55:00 -06:00
d8311d860e
Ignore private servers
2014-12-23 04:21:37 -06:00
21d255fcd1
Merge remote-tracking branch 'origin/master'
2014-12-23 04:15:55 -06:00
c41b5b0cfb
private server gui, i think?
2014-12-23 04:15:33 -06:00
6d2bd84b5b
disabled always joinable motd for minestrike
2014-12-23 20:39:49 +11:00
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
9a767af018
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 03:44:05 -05:00
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
521b61c624
disabled free evolutions
2014-12-23 19:42:13 +11:00
6b5b072ae8
missing file
2014-12-23 19:36:23 +11:00
7496f64d58
benefit
2014-12-23 19:36:10 +11:00
a15e704f06
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
2014-12-23 19:04:53 +11:00
a15256da88
update
2014-12-23 19:04:10 +11:00
6843901ef3
fix join message
2014-12-23 02:02:59 -06:00
103ff0e6b0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 02:57:24 -05:00
07d82b8206
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2014-12-23 18:39:22 +11:00
39745913ac
re-enabled roggue
2014-12-23 18:39:05 +11:00
2a585936b7
Maybe I should test before I commit!
2014-12-23 00:37:29 -06:00
2848ec2751
Use the correct data value this time!
2014-12-23 00:33:47 -06:00
48fdfbb8f0
Hub changes for private servers
2014-12-23 00:30:15 -06:00
eb0f23318f
Fix my fix for scoreboard - mine broke when new players joined
2014-12-23 00:06:30 -06:00
4b4ebd0e36
Change admin item to sparkling melon
2014-12-23 00:06:04 -06:00
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
706b3e25ef
Fix broken player count when changing max players
2014-12-22 23:54:51 -06:00
64d37d1886
minor snd changes
2014-12-23 16:50:31 +11:00
4cac65a81f
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-23 00:50:20 -05:00
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
1957db25d9
Add player head button
2014-12-22 23:20:20 -06:00
befc2cff7c
messing with jedis subpub
2014-12-22 22:49:28 -06:00
e8953b0c96
fixed merge errors
2014-12-23 15:14:03 +11:00
f961fd0233
Merge remote-tracking branch 'remotes/origin/searchanddestroy'
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
2014-12-23 15:09:58 +11:00
0659f497c0
frost lord update
2014-12-23 15:00:32 +11:00
19a7e6d666
time update
2014-12-23 13:01:44 +11:00
8ed7f34ab6
Sorted game pages
2014-12-22 19:20:08 -06:00
4797b251b1
YAY Champions enable/disable works.
2014-12-23 11:39:03 +11:00
825b25e8d1
fixed my bug in miniplugin
2014-12-23 11:29:48 +11:00
71cf8e8fd2
undid champs stuff :(
2014-12-23 11:22:41 +11:00
ec9401506c
Game servers can now run champions/normal on the fly.
2014-12-23 11:18:48 +11:00
a197724de8
fixed le bugs.
2014-12-23 10:48:15 +11:00
0f5c33fe52
derp derp chissderp
2014-12-22 17:41:12 -06:00
b51367f33b
Add missing jooq classes
2014-12-22 17:40:04 -06:00
31b040c654
Merge remote-tracking branch 'origin/master'
2014-12-22 17:37:10 -06:00
1396c3395a
Add kill button, rename ban to remove, add some messages for actions, add remove admin
2014-12-22 17:37:02 -06:00
224d1bbf63
blizzard particle redo
...
hub text
2014-12-23 10:36:48 +11:00
9a9936bc8c
Allow animated motd to be enabled or disabled through database
2014-12-22 16:39:34 -06:00
3efc80ec58
Update jooq database classes
2014-12-22 16:11:59 -06:00
b83a81ec7e
Fixed little conflict issue.
2014-12-22 09:25:02 -05:00
9b3350c8c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2014-12-22 09:22:50 -05:00
Jonathan Williams
Shaun Bennett
Chiss