Commit Graph

6418 Commits

Author SHA1 Message Date
Shaun Bennett a0e9a82327 Merge pull request #143 in MIN/mineplex from bugfix/achievements-misc to develop
* commit '7d33e76055eb160e58d63443a72117e654df9468':
  Fixed ForTheKing achievement.
  Made sure Sniper achievement in Bridges is always fulfilled.
  Fixed + Tidied Gladiators Precision achievement.
2016-01-29 02:32:50 -06:00
Shaun Bennett 63fa942789 Merge pull request #144 in MIN/mineplex from bugfix/uhc-hearts to develop
* commit 'caa5d922b520da30223230b58754a77dd3b72186':
  Prevent hearts changing colors in UHC tab.
2016-01-29 02:27:20 -06:00
libraryaddict dc469b9562 Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop 2016-01-29 17:02:07 +13:00
libraryaddict 8aac172c4a Update CB.jar 2016-01-29 17:01:48 +13:00
Mysticate caa5d922b5 Prevent hearts changing colors in UHC tab. 2016-01-28 22:54:20 -05:00
Mysticate 7d33e76055 Fixed ForTheKing achievement. 2016-01-28 22:51:19 -05:00
Mysticate 733ba067fe Made sure Sniper achievement in Bridges is always fulfilled. 2016-01-28 22:49:51 -05:00
Mysticate fffa1d5926 Fixed + Tidied Gladiators Precision achievement. 2016-01-28 22:48:52 -05:00
Mysticate d1d3382ec0 Prevented Coal particles from showing during the game 2016-01-28 22:44:33 -05:00
Mysticate b92ddc7575 Added proper ore pickup delay. 2016-01-28 22:39:48 -05:00
Shaun Bennett 60ee5d1da0 Move disable custom inside of IsActive check 2016-01-28 22:33:48 -05:00
Shaun Bennett eb29c6b367 Fix constructor 2016-01-28 22:28:18 -05:00
Shaun Bennett 3fa9f79427 Merge pull request #134 in MIN/mineplex from rankdescriptions to develop
* commit '0177cf91bbd179ce9a1f320d59790094612f24fe': (43 commits)
  Clean up
  Final edits
  Waiting for a testing session.
  Descriptions changed
  Use Garbo's description changes
  Stats added for all other games
  Halloween, added kit to stats
  Halloween, added stats
  Gravity, added stats
  Gladiators, added stats
  Evolution, added stats
  Draw my thing, added stats
  Dragons, added stats
  Dragon Riders, added default registery
  Dragon Escape Teams, added stats
  Dragon Escape, added stats + implemented kit display for stats
  Death Tag, added stats
  Christmas Chaos, added stats
  Champ TDM, added stats
  Champ Dominate,added stats
  ...
2016-01-28 21:23:13 -06:00
Shaun Bennett 0177cf91bb Merge with develop 2016-01-28 22:23:17 -05:00
Shaun Bennett 40f6969413 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-01-28 22:16:15 -05:00
Shaun Bennett 051d70771b Facebook Command 2016-01-28 22:15:35 -05:00
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