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

6268 Commits

Author SHA1 Message Date
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
Keir Nellyer
5f14670bc2 Remove old redundant iml file. 2016-01-28 11:20:40 +00:00
NewGarbo
ceeeb3bc45 no tnt from dispensers 2016-01-28 10:58:46 +00:00
teddy
eed55b48ac Descriptions changed 2016-01-28 09:55:48 +00:00
Keir Nellyer
3fc11e5c8a For some reason this didn't get committed with the previous stuff. 2016-01-27 21:54:34 +00:00
Keir Nellyer
ac37417fca Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/.idea/modules.xml
 2016-01-27 21:44:04 +00:00
Teddy
70be135a40 Merge branch 'feature/hoverable-chat' of http://dev.mineplex.com:7990/scm/min/mineplex into rankdescriptions 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
 2016-01-27 19:42:11 +00:00
Virizion
40113f99d3 Borders for spec are fixed. 2016-01-26 17:14:21 -05:00
Virizion
2f4146c243 Leaves fix. 2016-01-25 21:12:28 -05:00
Virizion
c5dfddd710 Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket. 2016-01-25 20:54:01 -05:00
Virizion
a1eec79b3b Make dependable require 50 perfect builds instead of 10. 2016-01-25 16:43:43 -05:00
NewGarbo
e68dea65e1 stop dispensers being used for flint-andsteal, bonemeal etc etc 2016-01-25 17:46:39 +00:00
NewGarbo
18e892c4ec finally fixed that windblade dupe 2016-01-25 17:41:07 +00:00
NewGarbo
71bb1ed3d6 this is just really slowing down startup time by A LOT 2016-01-25 17:22:56 +00:00
NewGarbo
9d77632fcc allow clans moderators to use /cb 2016-01-25 17:18:00 +00:00
NewGarbo
2bf2050844 increased sapling cooldown to 20 minutes from one second. 2016-01-25 17:13:53 +00:00
NewGarbo
7f1c74ced5 bumped version up to 0.19 2016-01-25 17:11:08 +00:00
Sarah
53132a248f the L 2016-01-25 12:28:21 +01:00
Sarah
c7733bb068 Updateting spectator Menu layout. 2016-01-25 12:27:19 +01:00
Sarah
91b6ae8b09 fixing spec item in menu 2016-01-25 12:14:56 +01:00
Shaun Bennett
4314f35f80 Multiply by less 2016-01-25 04:46:47 -06:00
Shaun Bennett
b143ec7c19 negative! 2016-01-25 04:42:09 -06:00
Shaun Bennett
6ff7c83d3e Trying different hologram location 2016-01-25 04:17:58 -06:00
Shaun Bennett
616be8aea7 Fix messages, fix /stats 2016-01-25 03:59:37 -06:00
Shaun Bennett
d511ca5bad Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder 2016-01-25 03:51:44 -06:00
Shaun Bennett
bc8f6e511c Center hologram 2016-01-25 03:44:22 -06:00
Virizion
2dcc356aab Make achievement category classics 2016-01-25 04:33:25 -05:00
Shaun Bennett
61f1a58b1c hologram changes 2016-01-25 03:29:53 -06:00
Shaun Bennett
181cce4774 Holograms maybe? 2016-01-25 03:08:56 -06:00
NewGarbo
5b32911a42 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-25 08:46:26 +00:00
NewGarbo
0b7cec60ae put cmod above support so that support can't bypass clans home block 2016-01-25 08:44:17 +00:00
NewGarbo
d82a7b353f allow C.Mods to join all server regardless of home servers 2016-01-25 08:42:38 +00:00
Virizion
219b86ae55 Chiss' checklist. 2016-01-25 03:01:54 -05:00
Sarah
31ef7ffe19 Removing right clicking. 2016-01-25 07:45:38 +01:00
Sarah
f722831e6a removing switching players until spigot patch is on. 2016-01-25 05:44:06 +01:00
Sarah
9e63c9000a adding spectator rotation. 2016-01-25 04:30:42 +01:00
Virizion
bfe9aa7a59 Remove unnecessary tabs. Make the judge guardian use it's own laser again. 2016-01-24 21:55:57 -05:00
Virizion
0eda813d41 Fixed builds with only mobs not loading. 2016-01-24 19:14:34 -05:00
Sarah
00f01e09af adding entity spectating by right clicking and right clicking head in compass menu. 2016-01-24 20:00:05 +01:00
NewGarbo
1f7e1fb6cf fix dupe bug and safelog 2016-01-23 13:40:49 +00:00
Virizion
a747426fa0 Fixed mobs. 2016-01-23 05:00:14 -05:00
Virizion
a359c4f8b6 Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder 2016-01-23 03:42:50 -05:00
Virizion
1e732b08e7 TICK TICK TICK TICK. 2016-01-23 03:42:36 -05:00
Cheese
790e2e8f73 Merge branch 'virizion_speed_builder' of ssh://184.154.0.242:7999/min/Mineplex into virizion_speed_builder 2016-01-23 19:32:37 +11:00
Cheese
c1ff7f4fc2 all players equal, no one loses 2016-01-23 19:32:23 +11:00
Virizion
a75770b0a6 Change build to load from top instead of bottom. 2016-01-23 03:15:41 -05:00
Shaun Bennett
650d586e0f Add perfect build count to stats 2016-01-23 02:49:08 -05:00
Shaun Bennett
f82a408f30 Build time modifiers 2016-01-23 02:43:41 -05:00
Virizion
5dc773032b Add joining players to guardians team instead of spectator. 2016-01-23 02:10:11 -05:00
Virizion
245cc1ed93 Limit Perfectionist achievement to 1. 2016-01-22 22:18:29 -05:00
Shaun Bennett
311d42db30 Use Garbo's description changes 2016-01-22 19:48:06 -05:00
Shaun Bennett
231b8cb19a Merge pull request #133 in MIN/mineplex from bugfix/foo to develop 
* commit '376f719c261bd2152a6646a152472a2485e1b689':
  fixes important bug, fixed a scary typo!
  Lots of typo fixes and such
  i before e!
  fixed cosmetic menu item dropping bug
  more grammatical errors hast been fixed
  Grammatical errors hath been fixed!
 2016-01-22 18:38:26 -06:00
Shaun Bennett
b2e4dff9e5 Add time to perfect build message 2016-01-22 19:18:23 -05:00
Shaun Bennett
02b45bd302 Forgot to register stat tracker 2016-01-22 19:14:25 -05:00
Shaun Bennett
ddc86f0897 Add Speediest Builderizer achievement 2016-01-22 19:13:23 -05:00
Shaun Bennett
d0e5be9c93 Guardian is impressed (untested!) 2016-01-22 18:35:18 -05:00
NewGarbo
bf6f1a1701 sapling stuff messed up oops 2016-01-22 15:28:12 +00:00
NewGarbo
6638562866 npe fix 2016-01-22 15:21:20 +00:00
NewGarbo
c4bbeb2535 more control over saplings 2016-01-22 14:55:50 +00:00
NewGarbo
a377a09925 fixed wind blade dupe bug 2016-01-22 11:22:20 +00:00
Virizion
3f715ab4dd Enable inventory click. 2016-01-22 02:23:58 -05:00
Shaun Bennett
4bbd956e14 Don't use the same build twice (untested!) 2016-01-22 01:37:47 -05:00
Shaun Bennett
49e439af55 Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder 2016-01-22 01:28:09 -05:00
Shaun Bennett
6bb60ddebd Ignore empty builds (untested!) 2016-01-22 01:27:29 -05:00
Virizion
c66f37817e Fixed invis bug. 2016-01-22 01:22:31 -05:00
Virizion
5c83f5c1e5 Renamed to Speed Builders from Speed Builder. 2016-01-22 00:20:58 -05:00
Virizion
0da921f3d2 Removed debug thing. 2016-01-21 23:52:59 -05:00
Virizion
a38319147a Stopped physics which fixed the torch bug. 2016-01-21 23:49:49 -05:00
Shaun Bennett
582fa4c915 Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder 2016-01-21 22:42:33 -05:00
Shaun Bennett
c38596a09f Name the guardian, 10 seconds to view builds 2016-01-21 22:42:25 -05:00
Virizion
24e97176cc Call clear build area method on eliminate. 2016-01-21 22:05:30 -05:00
Virizion
d37b8b40fc Disable item merge to (hopefully) fix phantom rails. 2016-01-21 20:41:28 -05:00
Virizion
50c9b33701 Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder 2016-01-21 20:13:53 -05:00
Virizion
636da8f4fa Mob destroying. Removed a debug change that only selected builds with mobs in them. 2016-01-21 20:13:32 -05:00
Cheese
5675aed698 velocity the drops to the player 2016-01-22 11:56:52 +11:00
Virizion
69825893c9 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2016-01-21 19:11:36 -05:00
Virizion
6ab6307f74 Pushing all my stuff for Shaunpai. 2016-01-21 19:08:38 -05:00
Shaun Bennett
877ec4710e Removing duplicate NCP hooks 2016-01-21 17:22:10 -05:00
Shaun Bennett
3803a3d82e Add player heads back to friends lsit 2016-01-21 17:19:51 -05:00
Shaun Bennett
0fd5540de6 Merge pull request #132 in MIN/mineplex from bugfix/give-item-offline to develop 
* commit '404e049c31df6d4278ee3ed46e7f0b8e2f92ee16':
  Give item fix for offline players
 2016-01-21 15:44:34 -06:00
Shaun Bennett
a41816ca22 Include version.properties in Mineplex.Core 2016-01-21 16:37:35 -05:00
Shaun Bennett
a0f39bf36e Merge remote-tracking branch 'origin/develop' into develop 2016-01-21 16:31:52 -05:00
Shaun Bennett
64ec092d09 Rename coin command to shard command 2016-01-21 09:10:39 -05:00
Teddy
1e72ebcbe6 Merge branch 'master' into rankdescriptions 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2016-01-21 12:54:12 +00:00
Keir Nellyer
dd0fc23467 Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-01-21 10:12:02 +00:00
md_5
447583624e Fix ascii.png duplication. 2016-01-21 17:47:21 +11:00
Shaun Bennett
5af8d747b3 Merge remote-tracking branch 'origin/develop' into develop 2016-01-20 15:07:48 -05:00
Shaun Bennett
269cd710fc Fix wrong group id for spigot excludes 2016-01-20 15:07:39 -05:00
Shaun Bennett
c0d4fa1bea Merge pull request #125 in MIN/mineplex from bugfix/mb-wins to develop 
* commit '4924d652f555392c9e36feb05a64cccd61b6c594':
  Store winner UUID instead of Player object to avoid leaking excess data
  Fixed who the winner is in MB Games.
 2016-01-20 12:33:56 -06:00
Shaun Bennett
4924d652f5 Store winner UUID instead of Player object to avoid leaking excess data 2016-01-20 13:33:40 -05:00
Shaun Bennett
7715df8e6a Merge pull request #130 in MIN/mineplex from md_5/servermonitor/leak to develop 
* commit '55c54eeff4dc72619fc9be1bb724b9dd37804919':
  Fix ServerMonitor not actually removing ServerGroup instances.
 2016-01-20 12:24:33 -06:00
Shaun Bennett
359655f417 Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop 
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
  Fix some misc suspicious calls to Collection methods.
 2016-01-20 12:23:55 -06:00
Shaun Bennett
c7bb380a56 Merge pull request #128 in MIN/mineplex from md_5/mineplexer/leak to develop 
* commit '6cf08193dfbedb08352fd3a450022afac0ecd331':
  Fix small memory leak in Mineplexer.
 2016-01-20 12:23:13 -06:00
Shaun Bennett
0a5791a92f Go back to compile scope, need to talk to md_5 about this 2016-01-20 13:13:20 -05:00
Shaun Bennett
037a2f8353 Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command 2016-01-20 13:04:31 -05:00
Shaun Bennett
8977735baf Include a version.properties in maven build 2016-01-20 11:57:21 -05:00