Commit Graph

480 Commits

Author SHA1 Message Date
Chiss 6e1f88c14f Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-23 09:28:39 +11:00
Chiss 42cab3a39c HG STUFF 2013-11-23 09:28:27 +11:00
Jonathan Williams 8a5e9e2f48 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-22 14:17:07 -08:00
Jonathan Williams affc9eeb9c Added inventory click for creative users in Hub
Added Ultra/Survival games beta stuff do servernpcpage
2013-11-22 14:17:00 -08:00
Chiss a5a80378f7 Loot fixes 2013-11-23 09:15:13 +11:00
Chiss 3d13fb0dc9 HG Fixes 2013-11-22 23:12:39 +11:00
Jonathan Williams 9c9e5f1ae0 Added goal selector clear for entities in UtilEntity 2013-11-22 00:38:24 -08:00
Chiss 0b7bf00ca7 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-22 18:41:31 +11:00
Chiss 0a683416ff SG Update 2013-11-22 18:40:38 +11:00
Jonathan Williams 7885df35ae Added spectating flag for EntityTNTPrimed 2013-11-21 23:32:41 -08:00
Jonathan Williams 9e8cd9db7d Disabled painting in parkour areas. 2013-11-21 12:38:16 -08:00
Jonathan Williams 44416001b3 Disabled Bat Blaster near Parkour.
Disabled Painting blocks near cactus.
2013-11-21 12:16:24 -08:00
Jonathan Williams be7ea65033 Website bin/obj cleanup
Fixed Pet Rename problem.
Fixed Extra Pet tag problem.

Added ServerStatus for dedicated servers.
2013-11-21 12:08:58 -08:00
Jonathan Williams 4bd4943bd8 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex 2013-11-17 17:00:20 -08:00
Jonathan Williams 9ba122a4cb Added recursive retrieval for Bungees 2013-11-17 17:00:12 -08:00
Chiss 7aec2d572b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-17 21:04:51 +11:00
Chiss 18c70901ca gem kit fix 2013-11-17 21:04:27 +11:00
Jonathan Williams 0fa953715e Fixed interact cancel in Hub. 2013-11-16 18:49:17 -08:00
Chiss fff13a14bf Gem lowered on firework/meow 2013-11-17 12:31:13 +11:00
Chiss 0aae7d24ed BH Gem Fixes 2013-11-17 12:30:14 +11:00
Chiss 85a3edc75e Mute should now correctly block all command input too. 2013-11-17 11:04:54 +11:00
Chiss be4de5f7bb Europe server in news 2013-11-17 10:59:02 +11:00
Chiss e91ed271c2 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex 2013-11-17 09:54:06 +11:00
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