Commit Graph

6402 Commits

Author SHA1 Message Date
Shaun Bennett 251fb53f29 Merge pull request #124 in MIN/mineplex from bugfix/morph to develop
* commit '2e433d8b0654507a9a41d9bbae313ab90e92471f':
  Made sure that the active morph gets disabled on clear
2016-01-28 21:08:32 -06:00
Shaun Bennett bf273708f9 Merge pull request #136 in MIN/mineplex from feature/entity-spectating to develop
* commit '53132a248f9d899e2b4b275a31cfd69376533688':
  the L
  Updateting spectator Menu layout.
  fixing spec item in menu
  Removing right clicking.
  removing switching players until spigot patch is on.
  adding spectator rotation.
  adding entity spectating by right clicking and right clicking head in compass menu.
2016-01-28 21:08:13 -06:00
Shaun Bennett 015cca57b6 Merge pull request #138 in MIN/mineplex from bugfix/gladiators-hotbar-editor to develop
* commit '75629055d851265e91eb7d0679a40a1357552e17':
  Un-register HotbarEditor MiniPlugin and fix /spec bug.
  Un-register the hotbar page listener on disable.
2016-01-28 21:03:48 -06:00
Shaun Bennett f72ee95759 Merge pull request #139 in MIN/mineplex from virizion_speed_builder to develop
* commit 'b6db99806ab171774ffd9c9db11cf361ad76dc94': (83 commits)
  Remove debug message.
  Fix flickering judge laser.
  Borders for spec are fixed.
  Leaves fix.
  Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
  Make dependable require 50 perfect builds instead of 10.
  Multiply by less
  negative!
  Trying different hologram location
  Fix messages, fix /stats
  Center hologram
  Make achievement category classics
  hologram changes
  Holograms maybe?
  Chiss' checklist.
  Remove unnecessary tabs. Make the judge guardian use it's own laser again.
  Fixed builds with only mobs not loading.
  Fixed mobs.
  TICK TICK TICK TICK.
  all players equal, no one loses
  ...
2016-01-28 21:02:23 -06:00
NewGarbo 7860ca24c8 disallow all staff from using /we 2016-01-28 23:33:06 +00:00
Virizion b6db99806a Remove debug message. 2016-01-28 18:28:43 -05:00
teddy 96ea001291 Clean up 2016-01-28 23:05:27 +00:00
teddy da8a55f99c Final edits 2016-01-28 22:57:54 +00:00
William Burns 75629055d8 Un-register HotbarEditor MiniPlugin and fix /spec bug. 2016-01-28 20:43:58 +00:00
Virizion 04544c2b8d Fix flickering judge laser. 2016-01-28 14:28:47 -05:00
William Burns d44d4c2278 Un-register the hotbar page listener on disable. 2016-01-28 19:21:42 +00:00
teddy 63cea58f05 Waiting for a testing session. 2016-01-28 17:18:24 +00:00
NewGarbo 88c1391ba2 disallow sapling in dispensers (grrr working in two different branches is really strange) 2016-01-28 13:30:16 +00:00
NewGarbo b5f04011e5 fixed chatslow not working + filter not working for players not in clan 2016-01-28 13:24:30 +00:00
NewGarbo ceeeb3bc45 no tnt from dispensers 2016-01-28 10:58:46 +00:00
teddy eed55b48ac Descriptions changed 2016-01-28 09:55:48 +00:00
Teddy 70be135a40 Merge branch 'feature/hoverable-chat' of http://dev.mineplex.com:7990/scm/min/mineplex into rankdescriptions
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
2016-01-27 19:42:11 +00:00
Virizion 40113f99d3 Borders for spec are fixed. 2016-01-26 17:14:21 -05:00
Virizion 2f4146c243 Leaves fix. 2016-01-25 21:12:28 -05:00
Virizion c5dfddd710 Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket. 2016-01-25 20:54:01 -05:00
Virizion a1eec79b3b Make dependable require 50 perfect builds instead of 10. 2016-01-25 16:43:43 -05:00
NewGarbo e68dea65e1 stop dispensers being used for flint-andsteal, bonemeal etc etc 2016-01-25 17:46:39 +00:00
NewGarbo 18e892c4ec finally fixed that windblade dupe 2016-01-25 17:41:07 +00:00
NewGarbo 71bb1ed3d6 this is just really slowing down startup time by A LOT 2016-01-25 17:22:56 +00:00
NewGarbo 9d77632fcc allow clans moderators to use /cb 2016-01-25 17:18:00 +00:00
NewGarbo 2bf2050844 increased sapling cooldown to 20 minutes from one second. 2016-01-25 17:13:53 +00:00
NewGarbo 7f1c74ced5 bumped version up to 0.19 2016-01-25 17:11:08 +00:00
Sarah 53132a248f the L 2016-01-25 12:28:21 +01:00
Sarah c7733bb068 Updateting spectator Menu layout. 2016-01-25 12:27:19 +01:00
Sarah 91b6ae8b09 fixing spec item in menu 2016-01-25 12:14:56 +01:00
Shaun Bennett 4314f35f80 Multiply by less 2016-01-25 04:46:47 -06:00
Shaun Bennett b143ec7c19 negative! 2016-01-25 04:42:09 -06:00
Shaun Bennett 6ff7c83d3e Trying different hologram location 2016-01-25 04:17:58 -06:00
Shaun Bennett 616be8aea7 Fix messages, fix /stats 2016-01-25 03:59:37 -06:00
Shaun Bennett d511ca5bad Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder 2016-01-25 03:51:44 -06:00
Shaun Bennett bc8f6e511c Center hologram 2016-01-25 03:44:22 -06:00
Virizion 2dcc356aab Make achievement category classics 2016-01-25 04:33:25 -05:00
Shaun Bennett 61f1a58b1c hologram changes 2016-01-25 03:29:53 -06:00
Shaun Bennett 181cce4774 Holograms maybe? 2016-01-25 03:08:56 -06:00
NewGarbo 5b32911a42 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-25 08:46:26 +00:00
NewGarbo 0b7cec60ae put cmod above support so that support can't bypass clans home block 2016-01-25 08:44:17 +00:00
NewGarbo d82a7b353f allow C.Mods to join all server regardless of home servers 2016-01-25 08:42:38 +00:00
Virizion 219b86ae55 Chiss' checklist. 2016-01-25 03:01:54 -05:00
Sarah 31ef7ffe19 Removing right clicking. 2016-01-25 07:45:38 +01:00
Sarah f722831e6a removing switching players until spigot patch is on. 2016-01-25 05:44:06 +01:00
Sarah 9e63c9000a adding spectator rotation. 2016-01-25 04:30:42 +01:00
Virizion bfe9aa7a59 Remove unnecessary tabs. Make the judge guardian use it's own laser again. 2016-01-24 21:55:57 -05:00
Virizion 0eda813d41 Fixed builds with only mobs not loading. 2016-01-24 19:14:34 -05:00
Sarah 00f01e09af adding entity spectating by right clicking and right clicking head in compass menu. 2016-01-24 20:00:05 +01:00
NewGarbo 1f7e1fb6cf fix dupe bug and safelog 2016-01-23 13:40:49 +00:00