Commit Graph

6150 Commits

Author SHA1 Message Date
Thanos paravantis 101caf12ff Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop. 2016-01-05 20:48:28 +02:00
Sarah db2cddc443 Fixing Join/Quit messages 2016-01-05 19:10:40 +01:00
Shaun Bennett a73309fc11 Merge remote-tracking branch 'origin/develop' into develop 2016-01-04 18:14:10 -05:00
Shaun Bennett f749300d48 Fix team stats not displaying properly 2016-01-04 18:13:54 -05:00
Shaun Bennett 10eb65a8d6 Merge pull request #114 in MIN/mineplex from bugfix/disguise-command to develop
* commit 'dd6d7b1b96947a400911bc5fa310039ab147c159':
  updating denial message
  Love you Sarah <3
  Fixing Disguise File
  update /Disguise for Hub as well
  updating /disguise
2016-01-04 15:58:43 -06:00
Shaun Bennett 652084d071 Merge pull request #115 in MIN/mineplex from bugfix/thanos to develop
* commit '3770211e66b41e16440609a0a79b3999b9b6cca7':
  Turf Wars: Include Teddy's border fix.
  Turf Wars: Undo bracket formatting.
  Turf Wars: Apply knockback on all players when there are only two in the match.
  Turf Wars: Add comment on block physics event.
  Turf Wars: Fix sneaking near turf edge and wool placement near ladders.
2016-01-04 15:56:32 -06:00
Shaun Bennett 962efe4a61 Fix not being able to join games through portals 2016-01-04 16:41:07 -05:00
Shaun Bennett ed81411373 Fix carl bonus messages 2016-01-04 15:58:27 -05:00
Thanos paravantis 3770211e66 Turf Wars: Include Teddy's border fix. 2016-01-04 22:58:11 +02:00
Thanos paravantis 982e684a45 Turf Wars: Undo bracket formatting. 2016-01-04 21:42:58 +02:00
Shaun Bennett c50fb52a88 Disable New Years Countdown 2016-01-04 14:21:21 -05:00
Shaun Bennett c739ecc26d Fix forcefield for YOUTUBE_SMALL 2016-01-04 14:20:39 -05:00
Thanos paravantis 47c78bcba1 Turf Wars: Apply knockback on all players when there are only two in the match. 2016-01-04 17:19:40 +02:00
Thanos paravantis f6ce98f65b Turf Wars: Add comment on block physics event. 2016-01-02 23:33:08 +02:00
Thanos paravantis 03c6395a30 Turf Wars: Fix sneaking near turf edge and wool placement near ladders. 2016-01-02 23:30:27 +02:00
Sarah dd6d7b1b96 updating denial message 2016-01-02 16:45:15 +01:00
NewGarbo b47665e115 lots of work on outposts,
fixed gold dupe glitch,
fixed clans ban gui title being "Customize New Gear".
2016-01-02 14:02:50 +00:00
Morten 7e1b0b9110 Love you Sarah <3 2016-01-02 03:19:39 +01:00
Sarah a06a0060aa Fixing Disguise File 2016-01-02 01:53:19 +01:00
Sarah a30c2b0d75 update /Disguise for Hub as well 2016-01-02 00:53:56 +01:00
Shaun Bennett 2e017fa5ca Fix redis command 2015-12-31 16:11:51 -06:00
Shaun Bennett 8232d11cd1 Remove in game notifications, change sale message 2015-12-31 15:07:26 -06:00
Shaun Bennett 74eb04e5b4 Merge pull request #112 in MIN/mineplex from feature/new-year to develop
* commit '6b3a5416643389a7bcac8df93f40f492452971e5':
  Accurate timings
  Small edits
  Flame
  Made it activate in all lobbies via command.
  Added a new years countdown to the hub.
2015-12-31 14:51:49 -06:00
William Burns 6b3a541664 Accurate timings 2015-12-31 18:53:57 +00:00
Shaun Bennett 456b0dbeb7 Merge pull request #110 in MIN/mineplex from feature/MasterBuilder-Unban to develop
* commit 'f83016e0074ce810f727276a0feb127ecd69098f':
  Also really quickly fixed the Invisibility in lobby bug (hopefully)
  Removed a weird query :/
  Finished up the Unban feature...
  Added a feature to unban clients across the network But there still a bug when you type a username of a none registered member. Will fix ASAP - likely after Mineware
2015-12-31 11:27:08 -06:00
Shaun Bennett b28ad2dca7 Merge pull request #111 in MIN/mineplex from feature/typewars-monitor to develop
* commit 'efbd1c52d28b7d0a0b58663c25ba14345409573a':
  Monitoring for josh + the mods
  Fix Type Wars stat icon
2015-12-31 11:18:16 -06:00
Sarah 8ef1a524c1 updating /disguise 2015-12-31 12:01:24 +01:00
Mysticate efbd1c52d2 Merge remote-tracking branch 'origin/master' into feature/typewars-antimacrorekter 2015-12-31 03:01:23 -05:00
Mysticate 5ff9d1985b Monitoring for josh + the mods 2015-12-31 03:00:40 -05:00
William Burns 637baed830 Small edits 2015-12-31 01:24:58 +00:00
William Burns 874695cdf6 Flame 2015-12-31 00:50:53 +00:00
William Burns a64dc6a8d4 Made it activate in all lobbies via command. 2015-12-31 00:46:31 +00:00
William Burns 1b40cece80 Added a new years countdown to the hub. 2015-12-30 20:04:01 +00:00
William Burns f1c7424939 Fixing hotbar 2015-12-29 15:19:09 +00:00
Shaun Bennett 55cdf4148a Merge branch 'develop' 2015-12-29 03:21:03 -06:00
Shaun Bennett 16ee74885e Add maintenance line 2015-12-29 02:52:53 -06:00
Shaun Bennett 7ad12d0a6b Show Host Rank in private servers 2015-12-29 00:50:20 -06:00
Shaun Bennett 7104f1363a Give YT rank access to extra preferences 2015-12-29 00:34:18 -06:00
Virizion 8a8d5b088b Switch to 7x7 builds. 2015-12-28 16:48:03 -05:00
Virizion 3d9a252868 Added auto pickup and fixed some stuff. 2015-12-27 15:26:43 -05:00
Virizion 162b3eb33f Stopped a bunch of block events. 2015-12-27 14:34:24 -05:00
Virizion 845014b677 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-25 15:49:41 -05:00
Shaun Bennett c680d91b56 Nerf TypeWars gems (again) 2015-12-25 03:12:04 -06:00
Shaun Bennett dd8e91e463 Update MOTD 2015-12-25 03:03:53 -06:00
Shaun Bennett 25d36b546a Remove unnecessary files 2015-12-25 01:53:00 -06:00
Shaun Bennett d08cfa0c4c Holiday Gifts 2015-12-25 01:51:36 -06:00
Virizion b0f8edb0f9 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-23 18:25:52 -05:00
NewGarbo aa50c4762f fixes (?) 2015-12-23 18:55:44 +00:00
libraryaddict 1d4a5e5804 Clean up imports, set resource pack on clans. 2015-12-24 07:47:05 +13:00
libraryaddict 000b1f85b7 Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop 2015-12-24 07:41:55 +13:00