Cheese
5c22c841fe
val1
2016-02-04 10:55:29 +11:00
Shaun Bennett
c23855bd65
Merge with develop
2016-01-30 02:44:24 -05:00
md_5
7ed0ab442f
Emergency patch to slow down redis player count updates.
2016-01-30 12:36:20 +11:00
Shaun Bennett
1c3c800a66
Update fixes - @Teddy!
2016-01-29 14:05:09 -05:00
Shaun Bennett
50fc1f5a10
merge with develop
2016-01-29 03:44:04 -05:00
Shaun Bennett
a1f9f41910
Merge remote-tracking branch 'origin/develop' into develop
2016-01-29 03:37:03 -05:00
Shaun Bennett
2e2a08bea8
Merge pull request #142 in MIN/mineplex from bugfix/coal-particles to develop
...
* commit 'd1d3382ec065bb7c508044d53124266fda142c00':
Prevented Coal particles from showing during the game
2016-01-29 02:33:57 -06:00
Mysticate
d1d3382ec0
Prevented Coal particles from showing during the game
2016-01-28 22:44:33 -05:00
Shaun Bennett
60ee5d1da0
Move disable custom inside of IsActive check
2016-01-28 22:33:48 -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
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
b5f04011e5
fixed chatslow not working + filter not working for players not in clan
2016-01-28 13:24:30 +00:00
Virizion
a1eec79b3b
Make dependable require 50 perfect builds instead of 10.
2016-01-25 16:43:43 -05:00
Shaun Bennett
616be8aea7
Fix messages, fix /stats
2016-01-25 03:59:37 -06:00
Virizion
2dcc356aab
Make achievement category classics
2016-01-25 04:33:25 -05: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
Shaun Bennett
650d586e0f
Add perfect build count to stats
2016-01-23 02:49:08 -05:00
Shaun Bennett
231b8cb19a
Merge pull request #133 in MIN/mineplex from bugfix/foo to develop
...
* commit '376f719c261bd2152a6646a152472a2485e1b689':
fixes important bug, fixed a scary typo!
Lots of typo fixes and such
i before e!
fixed cosmetic menu item dropping bug
more grammatical errors hast been fixed
Grammatical errors hath been fixed!
2016-01-22 18:38:26 -06:00
Shaun Bennett
ddc86f0897
Add Speediest Builderizer achievement
2016-01-22 19:13:23 -05:00
Virizion
5c83f5c1e5
Renamed to Speed Builders from Speed Builder.
2016-01-22 00:20:58 -05:00
Virizion
69825893c9
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-01-21 19:11:36 -05:00
Virizion
6ab6307f74
Pushing all my stuff for Shaunpai.
2016-01-21 19:08:38 -05:00
Shaun Bennett
877ec4710e
Removing duplicate NCP hooks
2016-01-21 17:22:10 -05:00
Shaun Bennett
3803a3d82e
Add player heads back to friends lsit
2016-01-21 17:19:51 -05:00
Shaun Bennett
0fd5540de6
Merge pull request #132 in MIN/mineplex from bugfix/give-item-offline to develop
...
* commit '404e049c31df6d4278ee3ed46e7f0b8e2f92ee16':
Give item fix for offline players
2016-01-21 15:44:34 -06:00
Shaun Bennett
a0f39bf36e
Merge remote-tracking branch 'origin/develop' into develop
2016-01-21 16:31:52 -05:00
Shaun Bennett
64ec092d09
Rename coin command to shard command
2016-01-21 09:10:39 -05:00
md_5
447583624e
Fix ascii.png duplication.
2016-01-21 17:47:21 +11:00
Shaun Bennett
359655f417
Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop
...
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
Fix some misc suspicious calls to Collection methods.
2016-01-20 12:23:55 -06:00
Shaun Bennett
037a2f8353
Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command
2016-01-20 13:04:31 -05:00
Shaun Bennett
77d9f7cf32
Merge branch 'master' into develop
2016-01-20 10:12:20 -05:00
fooify
376f719c26
fixes important bug, fixed a scary typo!
2016-01-19 18:52:54 -08:00
Shaun Bennett
2b6074a210
Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command'
2016-01-17 22:46:56 -05:00
md_5
4927bb8c0b
Fix some misc suspicious calls to Collection methods.
2016-01-17 20:20:48 +11:00
Sarah
4a5d6b5f2a
Mysticates OCD....
2016-01-17 02:48:15 +01:00
Shaun Bennett
404e049c31
Give item fix for offline players
2016-01-14 08:06:27 -05:00
fooify
63897b9b54
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2016-01-12 20:05:34 -08:00
Virizion
528a7435e7
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2016-01-12 20:25:08 -05:00
NewGarbo
d3452772ed
outposts work (grr git is weird trying to switch over to clans/beta)
2016-01-12 07:02:03 +00:00
Shaun Bennett
3693a2b2c5
Merge pull request #122 in MIN/mineplex from bugfix/thanos to develop
...
* commit 'ed439569453dc248623834af6fb553341779e46c':
Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
Remove unused imports.
Prevent players from stacking others with a menu inventory opened.
Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.
2016-01-11 16:26:09 -06:00
Shaun Bennett
025b87c806
Merge pull request #121 in MIN/mineplex from feature/mutedsign to develop
...
* commit 'fa7eef504597011da14093fb76a8e088524eafd0':
Muted players can't write on signs.
2016-01-11 16:23:34 -06:00
Mysticate
fa7eef5045
Muted players can't write on signs.
2016-01-10 13:13:38 -05:00
Thanos paravantis
ed43956945
Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
2016-01-10 16:37:51 +02:00
Shaun Bennett
83e5c7399e
Fix YOUTUBE_SMALL preferences
2016-01-09 18:41:19 -05:00
Shaun Bennett
cd3037e7e5
Fix treasure purchases
2016-01-09 18:37:24 -05:00
fooify
942460b471
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2016-01-09 13:05:44 -08:00
Thanos paravantis
ba3e7cb197
Merge branch 'master' into bugfix/thanos
2016-01-09 12:23:54 +02:00
Shaun Bennett
2df626b35e
Fix CustomDataManager crash
2016-01-08 18:06:33 -05:00
Shaun Bennett
511b39caa7
Merge branch 'master' into develop
2016-01-08 17:05:54 -05:00
