JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,387 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

6387 Commits

Author SHA1 Message Date
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
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
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
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
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
Mysticate af5cf309ca Made sure that a valid tool is used before dropping any items. 2016-02-03 14:43:14 -05:00
Shaun Bennett 70d41b074f Merge pull request #154 in MIN/mineplex from develop to master 
* commit '86917fb1463f018a1f00f80ffd919d1a4afadbb1':
  Fix treasure stair orientation
  add a shard queue to DonationManager, use that for TreasureShardReward
  Fixed various ways of players going invisible through Spec mode.
  Import clean up
  Changed TreasureShard rewarding, removed Queue
  Unused import removed
  Queue speed up
  Debugs removed
  Treasure not giving Shards when dupes occur, fixed.
  Queue implemented for duplicate shard reward
 2016-02-02 05:29:42 -06:00
Shaun Bennett 86917fb146 Fix treasure stair orientation 2016-02-02 05:50:03 -05:00
Shaun Bennett a34ae8cf49 Merge remote-tracking branch 'remotes/origin/master' into develop 2016-02-02 05:37:30 -05:00
Shaun Bennett 0d02f526b6 Merge pull request #116 in MIN/mineplex from bugfix/duplicates to develop 
* commit 'af27944a39129454b2963707c27799643d2440f1':
  add a shard queue to DonationManager, use that for TreasureShardReward
  Import clean up
  Changed TreasureShard rewarding, removed Queue
  Unused import removed
  Queue speed up
  Debugs removed
  Treasure not giving Shards when dupes occur, fixed.
  Queue implemented for duplicate shard reward
 2016-02-02 04:35:44 -06:00
Shaun Bennett af27944a39 add a shard queue to DonationManager, use that for TreasureShardReward 2016-02-02 05:34:33 -05:00
Cheese 610522bdd9 mac fix 2016-02-02 09:25:46 +11:00
Shaun Bennett ee9e26e8ca Merge pull request #149 in MIN/mineplex from bugfix/spectator-infest to develop 
* commit 'ace7d1764c68f6ea679ae60b3104d1af96e1869c':
  Fixed various ways of players going invisible through Spec mode.
 2016-02-01 16:18:23 -06:00
Shaun Bennett 1a9c36d0a1 Merge pull request #153 in MIN/mineplex from master to bugfix/duplicates 
* commit '3a945f190dca9f558cbcb6052b3eaa2816d112b3': (308 commits)
  Commons codec is not included in BungeeCord.
  Pooling with later jedis versions doesn't work on Bungee.
  Gitignore redundant Eclipse files.
  Add Eclipse magic.
  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
  Prep for update
  Update CB.jar
  Prevent hearts changing colors in UHC tab.
  Fixed ForTheKing achievement.
  ...
 2016-02-01 15:49:34 -06:00
Virizion 41ea96d505 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2016-02-01 16:42:55 -05:00
Virizion 989c324a37 Hopper item pickup fix. 2016-02-01 16:18:40 -05:00
Shaun Bennett 3a945f190d Merge pull request #152 in MIN/mineplex from develop to master 
* commit '1e57f19bd605871c2f803741c7dc6f3e7b325647': (229 commits)
  Commons codec is not included in BungeeCord.
  Pooling with later jedis versions doesn't work on Bungee.
  Gitignore redundant Eclipse files.
  Add Eclipse magic.
  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
  Prep for update
  Update CB.jar
  Prevent hearts changing colors in UHC tab.
  Fixed ForTheKing achievement.
  ...
 2016-02-01 15:13:19 -06:00
md_5 1e57f19bd6 Commons codec is not included in BungeeCord. 2016-02-01 18:18:23 +11:00
md_5 e887bbf543 Pooling with later jedis versions doesn't work on Bungee. 2016-02-01 18:13:50 +11:00
md_5 509e0609c1 Gitignore redundant Eclipse files. 2016-02-01 10:34:11 +11:00
md_5 cc1ecbe0b8 Add Eclipse magic. 2016-02-01 10:24:49 +11:00
Mysticate ace7d1764c Fixed various ways of players going invisible through Spec mode. 2016-01-31 10:22:59 -05:00
md_5 852f96a314 Speed up LobbyBalancer to 500ms 2016-01-31 09:45:34 +11:00
md_5 478b92db44 Add example maven settings.xml 2016-01-31 09:44:46 +11:00
Shaun Bennett b9354b7972 Remove setTestOnBorrow 2016-01-30 16:10:30 -05:00