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

6117 Commits

Author SHA1 Message Date
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
Shaun Bennett
52b6779a4f Merge pull request #146 in MIN/mineplex from bugfix/bridges-ore-stealing to develop 
* commit 'b45e00796d66cf8aeb39510e0bd23bc5bd59327b':
  Fixed explosions dropping right items.
  Made block define its own drops.
  Removed an nunnecesarry method
  Fixed items not dropping their regular counterpart.
 2016-01-30 01:45:00 -06:00
Shaun Bennett
c23855bd65 Merge with develop 2016-01-30 02:44:24 -05:00
md_5
1f2fc65f99 Tone down lobby balancer too. 2016-01-30 13:55:58 +11:00
md_5
7ed0ab442f Emergency patch to slow down redis player count updates. 2016-01-30 12:36:20 +11:00
Mysticate
b45e00796d Fixed explosions dropping right items. 2016-01-29 15:58:49 -05:00
NewGarbo
fe01c9b8d5 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-29 20:57:10 +00:00
NewGarbo
d10266c4d1 sapling fix 2016-01-29 20:56:38 +00:00
Shaun Bennett
1c3c800a66 Update fixes - @Teddy! 2016-01-29 14:05:09 -05:00
Mysticate
1e29bd6936 Made block define its own drops. 2016-01-29 11:44:40 -05:00
Mysticate
447583aa2a Removed an nunnecesarry method 2016-01-29 09:41:45 -05:00
Mysticate
075a1141f1 Fixed items not dropping their regular counterpart. 2016-01-29 09:36:09 -05:00
Shaun Bennett
c1f91cbfb0 Final changes 2016-01-29 03:56:49 -05:00
Shaun Bennett
50fc1f5a10 merge with develop 2016-01-29 03:44:04 -05:00
Shaun Bennett
d30fb8d8ef Merge remote-tracking branch 'origin/clans/alpha' into clans/alpha 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-01-29 03:40:28 -05:00
Shaun Bennett
a1f9f41910 Merge remote-tracking branch 'origin/develop' into develop 2016-01-29 03:37:03 -05:00
Shaun Bennett
863be023d9 Prep for update 2016-01-29 03:36:52 -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
Shaun Bennett
ba0dd3da44 Merge pull request #141 in MIN/mineplex from bugfix/bridges-ore-stealing to develop 
* commit 'b92ddc75759bc848b409b5626f0fbeb9d71154b5':
  Added proper ore pickup delay.
 2016-01-29 02:33:23 -06:00
Shaun Bennett
a0e9a82327 Merge pull request #143 in MIN/mineplex from bugfix/achievements-misc to develop 
* commit '7d33e76055eb160e58d63443a72117e654df9468':
  Fixed ForTheKing achievement.
  Made sure Sniper achievement in Bridges is always fulfilled.
  Fixed + Tidied Gladiators Precision achievement.
 2016-01-29 02:32:50 -06:00
Shaun Bennett
63fa942789 Merge pull request #144 in MIN/mineplex from bugfix/uhc-hearts to develop 
* commit 'caa5d922b520da30223230b58754a77dd3b72186':
  Prevent hearts changing colors in UHC tab.
 2016-01-29 02:27:20 -06:00
libraryaddict
dc469b9562 Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop 2016-01-29 17:02:07 +13:00
libraryaddict
8aac172c4a Update CB.jar 2016-01-29 17:01:48 +13:00
Mysticate
caa5d922b5 Prevent hearts changing colors in UHC tab. 2016-01-28 22:54:20 -05:00
Mysticate
7d33e76055 Fixed ForTheKing achievement. 2016-01-28 22:51:19 -05:00
Mysticate
733ba067fe Made sure Sniper achievement in Bridges is always fulfilled. 2016-01-28 22:49:51 -05:00
Mysticate
fffa1d5926 Fixed + Tidied Gladiators Precision achievement. 2016-01-28 22:48:52 -05:00
Mysticate
d1d3382ec0 Prevented Coal particles from showing during the game 2016-01-28 22:44:33 -05:00
Mysticate
b92ddc7575 Added proper ore pickup delay. 2016-01-28 22:39:48 -05:00
Shaun Bennett
60ee5d1da0 Move disable custom inside of IsActive check 2016-01-28 22:33:48 -05:00
Shaun Bennett
eb29c6b367 Fix constructor 2016-01-28 22:28:18 -05:00
Shaun Bennett
0177cf91bb Merge with develop 2016-01-28 22:23:17 -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
251fb53f29 Merge pull request #124 in MIN/mineplex from bugfix/morph to develop 
* commit '2e433d8b0654507a9a41d9bbae313ab90e92471f':
  Made sure that the active morph gets disabled on clear
 2016-01-28 21:08:32 -06:00
Shaun Bennett
bf273708f9 Merge pull request #136 in MIN/mineplex from feature/entity-spectating to develop 
* commit '53132a248f9d899e2b4b275a31cfd69376533688':
  the L
  Updateting spectator Menu layout.
  fixing spec item in menu
  Removing right clicking.
  removing switching players until spigot patch is on.
  adding spectator rotation.
  adding entity spectating by right clicking and right clicking head in compass menu.
 2016-01-28 21:08:13 -06:00
Shaun Bennett
015cca57b6 Merge pull request #138 in MIN/mineplex from bugfix/gladiators-hotbar-editor to develop 
* commit '75629055d851265e91eb7d0679a40a1357552e17':
  Un-register HotbarEditor MiniPlugin and fix /spec bug.
  Un-register the hotbar page listener on disable.
 2016-01-28 21:03:48 -06: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
7860ca24c8 disallow all staff from using /we 2016-01-28 23:33:06 +00:00
Virizion
b6db99806a Remove debug message. 2016-01-28 18:28:43 -05:00
teddy
96ea001291 Clean up 2016-01-28 23:05:27 +00:00
teddy
da8a55f99c Final edits 2016-01-28 22:57:54 +00:00
William Burns
75629055d8 Un-register HotbarEditor MiniPlugin and fix /spec bug. 2016-01-28 20:43:58 +00:00
Virizion
04544c2b8d Fix flickering judge laser. 2016-01-28 14:28:47 -05:00
William Burns
d44d4c2278 Un-register the hotbar page listener on disable. 2016-01-28 19:21:42 +00:00
teddy
63cea58f05 Waiting for a testing session. 2016-01-28 17:18:24 +00:00
NewGarbo
88c1391ba2 disallow sapling in dispensers (grrr working in two different branches is really strange) 2016-01-28 13:30:16 +00:00
NewGarbo
b5f04011e5 fixed chatslow not working + filter not working for players not in clan 2016-01-28 13:24:30 +00:00