Commit Graph

6537 Commits

Author SHA1 Message Date
Shaun Bennett 1e596a6969 Valentines rewards 2016-02-12 04:54:09 -06:00
Shaun Bennett 66aa89b5e0 Fix sheep look bug, valentines gift effects, valentines achievements 2016-02-12 04:32:26 -06:00
Shaun Bennett dfd61833b7 Valentines changes 2016-02-12 03:03:47 -06:00
Shaun Bennett 4f0f81c8df Update Courtship messages 2016-02-12 01:47:20 -06:00
Shaun Bennett d51e26a5a4 Valentines game adjustments 2016-02-12 01:34:29 -06:00
Shaun Bennett d8965179f7 More valentines adjustments/fix gladiators tutorial being enabled 2016-02-11 23:01:59 -06:00
Shaun Bennett 2eeddb828b Merge pull request #165 in MIN/mineplex from virizion_speed_builder to develop
* commit '51d152d48473f820ab6d03586fb41f890750f645':
  Perfect build all fix
  Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
  Stop mid game joiners from getting participation gems.
  Mob egg baby fix. Also fixed non build entities from being "broken"
  spec command add guardian
  The infamous look direction bounce bug
  Chiss' double jump mechanic
  Moar fixes
  Hopper item pickup fix.
2016-02-11 22:59:35 -06:00
William Burns 790ed4f993 Fix tools for block type/colour selections. 2016-02-11 08:11:40 +00:00
William Burns b3045d38e7 Add colour selection for multiple block types. 2016-02-10 16:34:00 +00:00
Cheese eebe25040e cleaned the particle effects a bit 2016-02-10 16:31:25 +11:00
Shaun Bennett 00f7880dd2 Fix compile error 2016-02-09 21:15:15 -06:00
Shaun Bennett e3ff25526b Merge pull request #164 in MIN/mineplex from valentines/game to develop
* commit '6800e4ef478e2d1eea5c19ec52a8368ec0bd520a':
  valentines final push
  bug fixes
  more valentines :)
  many valentine, such wow
  val1
2016-02-09 20:28:58 -06:00
Shaun Bennett f6e091f029 Merge pull request #163 in MIN/mineplex from feature/valentines-cosmetics to develop
* commit '57638ff68496b6f10012f8782633066b52a8a715':
  More work on valentines
  Valentines gifts
  Added love potion and hub sheep thing.
  Started on Love Potion system. Switching branches.
  Varius tweaks and changes.
  Added sheep mount to index.
  Added various cosmetic items for Valentines day.
2016-02-09 20:28:37 -06:00
Shaun Bennett 57638ff684 More work on valentines 2016-02-09 16:26:17 -06:00
Cheese 6800e4ef47 valentines final push 2016-02-09 20:43:24 +11:00
Shaun Bennett a868b8b2b8 Valentines gifts 2016-02-08 22:26:33 -06:00
Virizion 51d152d484 Perfect build all fix 2016-02-07 19:05:53 -05:00
Virizion aaf1fd42f3 Only eliminated players are guardians. Broken blocks/mobs go directly into inventory. 2016-02-07 18:16:36 -05:00
Virizion b40f018ee2 Stop mid game joiners from getting participation gems. 2016-02-07 17:20:58 -05:00
Virizion e96b4c4a7f Mob egg baby fix. Also fixed non build entities from being "broken" 2016-02-07 15:59:59 -05:00
Virizion 008fc587b0 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2016-02-07 15:33:37 -05:00
Virizion 7e9ff95ae3 spec command add guardian 2016-02-07 15:27:39 -05:00
Shaun Bennett a5c5a7c536 Merge pull request #157 in MIN/mineplex from bugfix/bridges-ore-mining to develop
* commit '465f12e210120e316e9252dc4e5b7207b4ae0279':
  Fixed NPE
  Made sure that a valid tool is used before dropping any items.
2016-02-07 14:00:46 -06:00
Shaun Bennett c059425e9d Remove GiveawayManager (not used anymore) 2016-02-07 13:18:29 -06:00
Mysticate 465f12e210 Fixed NPE 2016-02-07 13:27:38 -05:00
Shaun Bennett f502c2a693 Fix filtermessage sync calls 2016-02-07 12:15:08 -06:00
Mysticate a8ff714ee4 Added love potion and hub sheep thing. 2016-02-07 10:19:40 -05:00
md_5 9ea32d0725 Use ERROR for Spigot to ensure we don't blow past our plan limits. 2016-02-07 22:02:48 +11:00
md_5 f7b8dada6d Add Sentry to BungeeCord too. 2016-02-07 21:40:51 +11:00
md_5 2eb365c189 Implement Sentry for exception monitoring. 2016-02-07 20:29:56 +11:00
Cheese 2ab1b51401 bug fixes 2016-02-07 14:09:02 +11:00
Cheese a35a9ea31f more valentines :) 2016-02-07 13:27:53 +11:00
Mysticate c1393697f8 Started on Love Potion system. Switching branches. 2016-02-06 14:08:17 -05:00
Shaun Bennett 4f5625d63e Clans Alpha 1.0 changes 2016-02-05 18:42:22 -05:00
phobia 27e4ef784c WP Evade 2016-02-06 08:44:37 +11:00
phobia b0888208d1 More alphs bug fixes 2016-02-05 23:55:38 +11:00
Virizion 2ac7840d71 The infamous look direction bounce bug 2016-02-04 23:54:54 -05:00
Virizion b0b43524da Chiss' double jump mechanic 2016-02-04 22:05:46 -05:00
Mysticate b414642990 Varius tweaks and changes. 2016-02-04 21:58:55 -05:00
Virizion a76e570b8a Moar fixes 2016-02-04 21:43:17 -05:00
Cheese 690c2acce8 many valentine, such wow 2016-02-05 13:25:57 +11:00
phobia 6291decf87 Fixes to flame and broadsword 2016-02-05 11:42:39 +11:00
phobia 73d4ff2639 Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha 2016-02-05 10:12:31 +11:00
phobia 6fd9cffb01 Clans alpha bug fixes 2016-02-05 10:12:18 +11:00
NewGarbo 6c7d08a8f9 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-02-04 22:55:53 +00:00
NewGarbo e61b36f55c Fixed /c stuck timer taking 7 seconds instead of 2 minutes 2016-02-04 22:55:37 +00:00
Mysticate e94222a68e Added sheep mount to index. 2016-02-04 13:13:22 -05:00
Mysticate c0d6cbbb85 Added various cosmetic items for Valentines day.
- Heart arrow trail
- Heart death animation
- Heart double jump animation
- Heart set
- Cupid's bow gadget
- Pink Sheep mount
2016-02-04 13:12:53 -05:00
Cheese 5c22c841fe val1 2016-02-04 10:55:29 +11:00
Shaun Bennett 699a26f630 Merge pull request #159 in MIN/mineplex from master to feature/dmt-update
* commit '70d41b074f9256b4ac0b6fb51b68fb24dcf10e24': (328 commits)
  Fix treasure stair orientation
  add a shard queue to DonationManager, use that for TreasureShardReward
  mac fix
  Commons codec is not included in BungeeCord.
  Pooling with later jedis versions doesn't work on Bungee.
  Gitignore redundant Eclipse files.
  Add Eclipse magic.
  Fixed various ways of players going invisible through Spec mode.
  Speed up LobbyBalancer to 500ms
  Add example maven settings.xml
  Remove setTestOnBorrow
  Tone down lobby balancer too.
  Emergency patch to slow down redis player count updates.
  Fixed explosions dropping right items.
  sapling fix
  Update fixes - @Teddy!
  Made block define its own drops.
  Removed an nunnecesarry method
  Fixed items not dropping their regular counterpart.
  Final changes
  ...
2016-02-03 16:06:59 -06:00