26246604a7
This should've gone with the previous commit :/
2016-01-13 11:48:18 +00:00
53133d51ee
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-01-13 11:47:13 +00:00
ee6425bbaf
Removed extra blank lines.
2016-01-12 23:31:35 -05:00
dfd5a63b78
More changes and fixes.
2016-01-12 23:29:08 -05:00
63897b9b54
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2016-01-12 20:05:34 -08:00
528a7435e7
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2016-01-12 20:25:08 -05:00
b27d5849d8
General fixes.
2016-01-12 20:23:25 -05:00
f1314d5c26
JSON now handled by JsonMessage Builder
2016-01-12 13:25:47 +00:00
b1c6af4d1a
Update CB
2016-01-12 20:18:03 +13:00
ed8d9459b2
goes with the commit below VVVV
2016-01-12 07:02:19 +00:00
d3452772ed
outposts work (grr git is weird trying to switch over to clans/beta)
2016-01-12 07:02:03 +00:00
c873b6b886
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-12 06:58:53 +00:00
c3e11e87ea
Fix small issues with burning and ignition
2016-01-12 19:10:32 +13:00
11da5a3fe1
Fix fire combusting and cancelled damage events
2016-01-12 18:56:48 +13:00
4e9a4c87d4
Merge pull request #123 in MIN/mineplex from bugfix/disguise-command to develop
...
* commit '0f587ba5d908afdccb877358d71e56a3edda49cd':
fixing "Kicked for flying again" again...
2016-01-11 17:20:51 -06:00
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
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
88c53bf464
Added default ChatStat for all games to prevent my server from dying when testing
2016-01-11 19:35:00 +00:00
d656c7a212
fixed clans banned players counting as being online after joining and their territory then being blown up
2016-01-11 18:02:03 +00:00
02ff8bdbdb
Custom stats working, escaping bug fix and List reset bug
2016-01-11 12:59:57 +00:00
40d913beaf
Changed a List to reset each time its registered to prevent stats copying to the next game, automatic string escaping, party colour name changed to original colour
2016-01-11 12:35:44 +00:00
b9d44d9a24
not updating properly, fixed
2016-01-11 12:14:29 +00:00
78eaee98df
Typo mistake
2016-01-11 12:09:08 +00:00
ec6e916c7b
more stable, progress for making 'easier-to-use'
2016-01-11 12:06:30 +00:00
3773ab3f0b
fixed safelog npcs sticking around some time
2016-01-11 10:14:32 +00:00
60a78e396f
remove legendary announcement in chat/middle text
2016-01-11 09:16:11 +00:00
6c055c31a0
Fix flashing through doors, Update to 0.18c
2016-01-10 20:39:56 -05:00
d5b5ac7bb0
changed regen level on giants broadsword from 4 to 3 and made slowness last longer so that screen doesn't glitch out
2016-01-10 23:06:39 +00:00
d4ccb82791
didn't push this earlier
2016-01-10 23:03:16 +00:00
6673081fb3
fixed LeechingAttribute from throwing an error when setting health above 20
2016-01-10 22:31:51 +00:00
04c7f2c1f1
made pressure plates, buttons, and levers from working with block toss
2016-01-10 22:20:50 +00:00
1c49e3a111
Make chat log clickable, only close report instruction line suggests command.
2016-01-10 21:28:57 +00:00
bccee71ff7
made signs placed by muted players get cleared on being placed
2016-01-10 21:16:49 +00:00
734351011a
made all old clans ban clients get unloaded. there seems to have been problems with certain clients not unloading.
2016-01-10 21:15:50 +00:00
9c3a62a308
made it so punished players can't place signs
2016-01-10 21:03:34 +00:00
68808efb49
made players not be able to chat while chat is silenced
2016-01-10 20:57:12 +00:00
fa3de2a479
made clans ban messages not public
2016-01-10 20:55:29 +00:00
51872faa04
fix mutes not working
2016-01-10 20:53:55 +00:00
fa7eef5045
Muted players can't write on signs.
2016-01-10 13:13:38 -05:00
5caeb8bee0
even nicer visual
2016-01-10 17:34:15 +00:00
c814132b24
ratio's and nicer visuals
2016-01-10 17:33:18 +00:00
83375a6883
stats not updating
2016-01-10 16:01:40 +00:00
1bce624ab3
Finally got rid of MalformedJSON
2016-01-10 15:13:11 +00:00
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
46695f8449
Fix hub fly for YOUTUBE_SMALL
2016-01-09 18:44:32 -05:00
83e5c7399e
Fix YOUTUBE_SMALL preferences
2016-01-09 18:41:19 -05:00
8193b5121b
Dont allow /disguise for YOUTUBE_SMALL
2016-01-09 18:39:47 -05:00
cd3037e7e5
Fix treasure purchases
2016-01-09 18:37:24 -05:00
bd865c7e64
Fix command permissions.
2016-01-09 23:12:08 +00:00
7db3f3469f
Destroy pool when a thread ends.
2016-01-09 22:21:27 +00:00
Keir
Virizion
fooify
Teddy
libraryaddict
NewGarbo
Shaun Bennett
Mysticate
Thanos paravantis