Chiss
|
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 |
|
Chiss
|
a15256da88
|
update
|
2014-12-23 19:04:10 +11:00 |
|
Shaun Bennett
|
6843901ef3
|
fix join message
|
2014-12-23 02:02:59 -06: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 |
|
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 |
|