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
NewGarbo
f86262dc0e
catapult and cannon progress
2016-01-28 23:32:23 +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
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
