Commit Graph

1607 Commits

Author SHA1 Message Date
Chiss
630281c663 SSM Hunger Fix 2013-11-17 09:53:53 +11:00
Jonathan Williams
3a725246dc Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-16 02:59:35 -08:00
Jonathan Williams
c1de12a8e7 Added autoreconnect to bungee repos
Fixed up disguise for block hunt.
2013-11-16 02:59:28 -08:00
Chiss
07d9610bf7 Hub sky text 2013-11-16 21:21:04 +11:00
Chiss
2a9c11d700 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-16 21:10:23 +11:00
Chiss
1e0a456286 hub changes 2013-11-16 21:09:59 +11:00
Jonathan Williams
a9241bc7f3 Changed Hub to normal. 2013-11-16 02:07:51 -08:00
Jonathan Williams
3f93e6daf1 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java
2013-11-16 01:56:22 -08:00
Jonathan Williams
75c2a5fd6e Added sound disguises
Removed purchasable batgun.
2013-11-16 01:55:10 -08:00
Chiss
9c6ebcea52 shocking nerf 2013-11-16 18:25:19 +11:00
Chiss
37ed58cea9 axe boost nerf 2013-11-16 17:57:21 +11:00
Chiss
690811dd05 cased SG debug properly 2013-11-16 17:54:30 +11:00
Chiss
b8e1c22967 BH updates 2013-11-16 17:53:42 +11:00
Chiss
d71a8002d3 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-16 17:11:05 +11:00
Chiss
ea8d28abc1 Formula 2013-11-16 17:10:54 +11:00
Chiss
ef54732531 DISGUISE THEM CATS 2013-11-16 16:43:03 +11:00
Jonathan Williams
39384470e7 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-15 21:41:23 -08:00
Jonathan Williams
84acc952fa Added DisguiseCat.
Added CookieTown Block Hunt.
2013-11-15 21:41:14 -08:00
Chiss
2e6758e23c BH Updates 2013-11-16 13:15:16 +11:00
Chiss
29ce493f64 Hide and SEEEEEEK (block honts) 2013-11-15 18:52:46 +11:00
Chiss
99c97d1ecd Block Hunt changes 2013-11-14 16:28:29 +11:00
Chiss
0013b1bacf Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-14 16:28:06 +11:00
Jonathan Williams
115109e5b8 Added sound disguise for DisguiseBase
Small desc tweak on server monitor.
2013-11-14 00:01:41 -05:00
Chiss
6ebda931fd Fixed bug where backtracking players could be in the scoreboard twice. 2013-11-11 07:27:41 +11:00
Jonathan Williams
980ce0a5a3 Block disguise velocity tweak. 2013-11-08 16:06:17 -08:00
Jonathan Williams
6885f89130 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
2013-11-08 15:21:19 -08:00
Jonathan Williams
4856b5d90d Removed derp organize brackets in PunishPage 2013-11-08 15:20:29 -08:00
Chiss
255307088c Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
2013-11-09 10:03:49 +11:00
Chiss
3c5b1fe74f H&S Updates
some punish fixes
hub toggles no longer pulse on pressure plate
2013-11-09 09:48:40 +11:00
Jonathan Williams
ef0d233512 Dynamic server tinkering again. 2013-11-08 14:46:05 -08:00
Jonathan Williams
cae10fe7b4 Fixes to DynamicServer Monitor
Fixed SSM disguise clunky movement.
2013-11-08 10:52:56 -08:00
Chiss
dc062c7bb6 H&S Push 2013-11-07 19:49:21 +11:00
Jonathan Williams
79b739fc14 Project for servermonitor 2013-11-07 00:22:42 -08:00
Jonathan Williams
7cc880afd1 ServerMonitor tweaks. 2013-11-07 00:22:04 -08:00
Chiss
8fa7b9f283 Helpers can use WARNINGS 2013-11-07 17:03:34 +11:00
Jonathan Williams
e27f01e916 Fixed punish constructor bugs for dom/mk 2013-11-06 21:36:00 -08:00
Jonathan Williams
2af6da79d2 Added maps for tracking. 2013-11-06 20:58:39 -08:00
Jonathan Williams
079a58d2cd Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-06 20:38:41 -08:00
Jonathan Williams
f8567dcfa6 Fix for scoreboard uppercase issue in hub. 2013-11-06 20:38:33 -08:00
Chiss
8e7b5ac6fe Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-07 15:26:37 +11:00
Chiss
6b577af7b4 Punish Update
H&S Additions
2013-11-07 15:25:46 +11:00
Jonathan Williams
49e796c39d Fixed Game.Core build issue.
Cleaned up a lot.

Added missing files for Mineplexer
2013-11-06 20:19:56 -08:00
Jonathan Williams
e0d10f6550 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-06 19:48:27 -08:00
Jonathan Williams
41e9ffb018 Removed BungeeSigns
Updated Bungee plugin to pull US servers only.
Added dynamic MOTD from mysql for BungeeCord.jar

Fixed crash for disguise block arm animation.
2013-11-06 19:48:00 -08:00
Chiss
0d5b174ebe Stacker/Party exceptions for YouTubers 2013-11-07 10:33:39 +11:00
Chiss
9f11352f10 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-07 10:19:30 +11:00
Chiss
03731de7f8 Rank changes
MAC no longer kicks lag/fly
some H&S stuff :O
2013-11-07 10:18:36 +11:00
Jonathan Williams
70dae64389 added missing file. 2013-11-06 10:26:33 -08:00
Jonathan Williams
0a50d9b127 ServerMonitor files. 2013-11-06 09:14:08 -08:00
Jonathan Williams
2e7bd5504a depr deprerer 2013-11-06 01:04:17 -08:00