Commit Graph

6715 Commits

Author SHA1 Message Date
teddy 63cea58f05 Waiting for a testing session. 2016-01-28 17:18:24 +00:00
NewGarbo 37fb656279 dispenser 2016-01-28 13:31:45 +00:00
NewGarbo f645c4d6f8 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-28 13:30:50 +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 8cb5591218 merge conflicts 2016-01-28 13:28:39 +00:00
NewGarbo a0cc0b7ec9 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java
2016-01-28 13:28:00 +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
NewGarbo 682a243c31 fixed catapult state being mapped to incorrect blocks 2016-01-28 09:18:58 +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
Shaun Bennett 3d4cd9ee27 Fix tutorial command, add tutorial info to scoreboard, message manager, transitioning to a visual manager 2016-01-26 17:47:01 -06:00
Virizion 40113f99d3 Borders for spec are fixed. 2016-01-26 17:14:21 -05:00
NewGarbo 7f7e73a101 more catapults! 2016-01-26 21:10:58 +00:00
NewGarbo 3d7a371d1d catapults 2016-01-26 20:18:53 +00:00
Shaun Bennett 155d8bff1b Fix cannon angles 2016-01-26 13:36:30 -06:00
NewGarbo 9215d0d3ff NegativeArraySizeException fix 2016-01-26 18:40:55 +00:00
NewGarbo 63f9622876 cannon correctly loadded title + fixed rotation being all wrong 2016-01-26 17:51:29 +00:00
NewGarbo 7c85fe62ca charred blocks updates 2016-01-26 17:36:12 +00:00
NewGarbo 2445e73623 better cannon crater particles 2016-01-26 13:06:47 +00:00
NewGarbo 3b18b93286 fixed top right slot in cannon not counting as an empty slot. 2016-01-26 09:26:51 +00:00
NewGarbo 467af4b835 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-26 09:24:53 +00: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
NewGarbo 2b70daf8df allowed clans mods to use /cban 2016-01-25 17:02:49 +00:00
NewGarbo 5a5dc9925e set spawning rate of charred blocks a 10% lower 2016-01-25 17:02:26 +00:00
NewGarbo 208df93739 fixed fire particles not showing up in craters 2016-01-25 17:02:02 +00:00
NewGarbo ce36cf79bf added a tnt limit, set to 1 as it makes gameplay better 2016-01-25 17:01:46 +00:00
NewGarbo 9b88683fdc fix cannon tnt exploding prematurely, added cooldown rather than using Recharge. 2016-01-25 17:00:38 +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 33845cbc72 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-25 08:48:13 +00:00
NewGarbo fde5a5af28 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-25 08:47:08 +00:00