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 |
|
Chiss
|
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 |
|
Chiss
|
0659f497c0
|
frost lord update
|
2014-12-23 15:00:32 +11:00 |
|
Chiss
|
19a7e6d666
|
time update
|
2014-12-23 13:01:44 +11:00 |
|
Shaun Bennett
|
8ed7f34ab6
|
Sorted game pages
|
2014-12-22 19:20:08 -06:00 |
|
Chiss
|
4797b251b1
|
YAY Champions enable/disable works.
|
2014-12-23 11:39:03 +11:00 |
|
Chiss
|
825b25e8d1
|
fixed my bug in miniplugin
|
2014-12-23 11:29:48 +11:00 |
|
Chiss
|
71cf8e8fd2
|
undid champs stuff :(
|
2014-12-23 11:22:41 +11:00 |
|
Chiss
|
ec9401506c
|
Game servers can now run champions/normal on the fly.
|
2014-12-23 11:18:48 +11:00 |
|
Chiss
|
a197724de8
|
fixed le bugs.
|
2014-12-23 10:48:15 +11:00 |
|
Shaun Bennett
|
0f5c33fe52
|
derp derp chissderp
|
2014-12-22 17:41:12 -06:00 |
|
Shaun Bennett
|
b51367f33b
|
Add missing jooq classes
|
2014-12-22 17:40:04 -06:00 |
|
Shaun Bennett
|
31b040c654
|
Merge remote-tracking branch 'origin/master'
|
2014-12-22 17:37:10 -06:00 |
|
Shaun Bennett
|
1396c3395a
|
Add kill button, rename ban to remove, add some messages for actions, add remove admin
|
2014-12-22 17:37:02 -06:00 |
|
Chiss
|
224d1bbf63
|
blizzard particle redo
hub text
|
2014-12-23 10:36:48 +11:00 |
|
Shaun Bennett
|
9a9936bc8c
|
Allow animated motd to be enabled or disabled through database
|
2014-12-22 16:39:34 -06:00 |
|
Shaun Bennett
|
3efc80ec58
|
Update jooq database classes
|
2014-12-22 16:11:59 -06:00 |
|
Jonathan Williams
|
b83a81ec7e
|
Fixed little conflict issue.
|
2014-12-22 09:25:02 -05:00 |
|
Jonathan Williams
|
9b3350c8c7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-12-22 09:22:50 -05:00 |
|
Jonathan Williams
|
d920439ec5
|
Clans update. Laying groundwork for energy
|
2014-12-22 09:22:10 -05:00 |
|
Chiss
|
fa0a9ac859
|
fixed exploit on skylands
|
2014-12-22 21:08:44 +11:00 |
|
Chiss
|
ec8e1f0546
|
more MPS stuff
fixed bridges exploit
|
2014-12-22 16:31:13 +11:00 |
|
Chiss
|
2472ca95ec
|
MPS updates
|
2014-12-22 13:19:45 +11:00 |
|
Chiss
|
4a50e3ae62
|
Merge branch 'chissbrokethis'
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
|
2014-12-22 10:57:39 +11:00 |
|
Chiss
|
98b614848d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into HEAD
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleBlizzard.java
|
2014-12-22 10:54:31 +11:00 |
|
Chiss
|
0e7dec919d
|
minor updates
|
2014-12-22 10:51:19 +11:00 |
|
Chiss
|
71f7b4c963
|
legend join messages
|
2014-12-22 10:40:06 +11:00 |
|
Chiss
|
1a56f074b3
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-12-22 10:22:13 +11:00 |
|
Chiss
|
eba54c6b8a
|
Removed hub snake parkour
|
2014-12-22 10:21:58 +11:00 |
|
Chiss
|
9321abdaf5
|
Merge branch 'searchanddestroy' of ssh://184.154.0.242:7999/min/mineplex into searchanddestroy
|
2014-12-19 13:59:31 +11:00 |
|
Chiss
|
184c6cb4ba
|
added func to change attackreason for combatmanager
|
2014-12-19 13:59:18 +11:00 |
|
Jonathan Williams
|
52cc0862d7
|
Memory leak fix for CUSTOM TAG
|
2014-12-18 18:29:33 -05:00 |
libraryaddict
|
93314711e7
|
Modified snd
|
2014-12-18 17:56:21 +13:00 |
|
Shaun Bennett
|
4c4ba34d39
|
Merge pull request #5 from feature/chatslow to master
* commit '9ef0ea629c57b148d815b93a455f9817ce512960':
Added changes from master to Chat
Chat Slow Command
|
2014-12-17 20:08:32 -06:00 |
|
Shaun Bennett
|
9ef0ea629c
|
Added changes from master to Chat
|
2014-12-17 20:07:39 -06:00 |
|
Shaun Bennett
|
899add5fcd
|
Merging changes from master
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
|
2014-12-17 20:07:11 -06:00 |
|
Chiss
|
437c1aeabe
|
MPS rank todo
|
2014-12-18 13:06:57 +11:00 |
|
Chiss
|
60f567a3fb
|
fixed some errors ;o
|
2014-12-18 12:47:00 +11:00 |
|
Chiss
|
679f7909b0
|
Merge branch 'feature/private-servers' of ssh://184.154.0.242:7999/min/mineplex into feature/private-servers
|
2014-12-18 12:45:56 +11:00 |
|
Chiss
|
56d14b7bc0
|
Particle stuff
|
2014-12-18 12:45:45 +11:00 |
|
Shaun Bennett
|
604243dfa3
|
UI improvements - icon changes, whitelist toggle, notify messages
|
2014-12-17 19:42:11 -06:00 |
|
Shaun Bennett
|
2677d2e557
|
Fancy icons for 1.8!
|
2014-12-17 19:15:31 -06:00 |
|
Shaun Bennett
|
a63c48e338
|
Refactoring private server menu
|
2014-12-17 18:45:15 -06:00 |
|
Shaun Bennett
|
d19431a47f
|
Rename Clicked to onClick
|
2014-12-17 18:40:44 -06:00 |