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

2723 Commits

Author SHA1 Message Date
Shaun Bennett 60ee5d1da0 Move disable custom inside of IsActive check 2016-01-28 22:33:48 -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 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 a0cc0b7ec9 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java
 2016-01-28 13:28:00 +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 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
Virizion a1eec79b3b Make dependable require 50 perfect builds instead of 10. 2016-01-25 16:43:43 -05:00
Shaun Bennett 616be8aea7 Fix messages, fix /stats 2016-01-25 03:59:37 -06:00
Virizion 2dcc356aab Make achievement category classics 2016-01-25 04:33:25 -05:00
NewGarbo 33845cbc72 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta 2016-01-25 08:48:13 +00: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 0252436990 cannons updates 2016-01-24 20:56:47 +00:00
Shaun Bennett 650d586e0f Add perfect build count to stats 2016-01-23 02:49:08 -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 ddc86f0897 Add Speediest Builderizer achievement 2016-01-22 19:13:23 -05:00
Virizion 5c83f5c1e5 Renamed to Speed Builders from Speed Builder. 2016-01-22 00:20:58 -05: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
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 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 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 ea315a1447 Merge remote-tracking branch 'remotes/origin/md_5/maven' into develop 
# Conflicts:
#	Plugins/Libraries/craftbukkit.jar
 2016-01-20 10:19:09 -05:00
Shaun Bennett 77d9f7cf32 Merge branch 'master' into develop 2016-01-20 10:12:20 -05:00
fooify 376f719c26 fixes important bug, fixed a scary typo! 2016-01-19 18:52:54 -08:00
md_5 bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Shaun Bennett 2b6074a210 Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command' 2016-01-17 22:46:56 -05:00
md_5 4927bb8c0b Fix some misc suspicious calls to Collection methods. 2016-01-17 20:20:48 +11:00
Sarah 4a5d6b5f2a Mysticates OCD.... 2016-01-17 02:48:15 +01:00
xGamingDudex 6e6f46671b Merge remote-tracking branch 'origin/develop' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilColor.java
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java
 2016-01-16 14:46:47 +01:00
xGamingDudex 8ee485e44c Progress 2016-01-16 14:43:14 +01:00
Shaun Bennett 404e049c31 Give item fix for offline players 2016-01-14 08:06:27 -05:00
Keir 53133d51ee Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-01-13 11:47:13 +00:00
fooify 63897b9b54 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2016-01-12 20:05:34 -08:00
Virizion 528a7435e7 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2016-01-12 20:25:08 -05:00
NewGarbo f3003e795e Implemented Outpost MK III 2016-01-12 18:59:01 +00:00
NewGarbo d3452772ed outposts work (grr git is weird trying to switch over to clans/beta) 2016-01-12 07:02:03 +00:00
Shaun Bennett 3693a2b2c5 Merge pull request #122 in MIN/mineplex from bugfix/thanos to develop 
* commit 'ed439569453dc248623834af6fb553341779e46c':
  Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
  Remove unused imports.
  Prevent players from stacking others with a menu inventory opened.
  Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.
 2016-01-11 16:26:09 -06:00
Shaun Bennett 025b87c806 Merge pull request #121 in MIN/mineplex from feature/mutedsign to develop 
* commit 'fa7eef504597011da14093fb76a8e088524eafd0':
  Muted players can't write on signs.
 2016-01-11 16:23:34 -06:00
Keir 1c49e3a111 Make chat log clickable, only close report instruction line suggests command. 2016-01-10 21:28:57 +00:00
Mysticate fa7eef5045 Muted players can't write on signs. 2016-01-10 13:13:38 -05:00
Thanos paravantis ed43956945 Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats. 2016-01-10 16:37:51 +02:00
Shaun Bennett 83e5c7399e Fix YOUTUBE_SMALL preferences 2016-01-09 18:41:19 -05:00
Shaun Bennett cd3037e7e5 Fix treasure purchases 2016-01-09 18:37:24 -05:00
Keir bd865c7e64 Fix command permissions. 2016-01-09 23:12:08 +00:00
Keir 5f362a878a Run some Redis functions async (as it sometimes blocks). 2016-01-09 22:21:15 +00:00
Keir 8b3bc7ca18 Fix timezone, correct url prefix and remove old debug code. 2016-01-09 21:51:54 +00:00
fooify 942460b471 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2016-01-09 13:05:44 -08:00
xGamingDudex f8e8669b5c Added Party and Cupid set (arrow, jump, death, particle + full set 
effect)
 2016-01-09 14:07:40 +01:00
Thanos paravantis ba3e7cb197 Merge branch 'master' into bugfix/thanos 2016-01-09 12:23:54 +02:00
Shaun Bennett 2df626b35e Fix CustomDataManager crash 2016-01-08 18:06:33 -05:00
Shaun Bennett 511b39caa7 Merge branch 'master' into develop 2016-01-08 17:05:54 -05:00
Keir 7ce028203b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-01-08 13:59:43 +00:00
Teddy 43fb04b482 Import clean up 2016-01-08 13:46:57 +00:00
Teddy 78405749a4 Changed TreasureShard rewarding, removed Queue 2016-01-08 13:46:39 +00:00
Shaun Bennett a75e2c15b8 Merge remote-tracking branch 'origin/develop' into develop 2016-01-08 06:35:37 -05:00
Shaun Bennett 15109707f3 Merge pull request #119 in MIN/mineplex from clans/alpha to develop 
* commit '025615d080b8b925f319a2f7707d2c3fa4755a88':
  Clans Alpha 0.18b fixes
 2016-01-08 05:34:35 -06:00
NewGarbo 025615d080 Clans Alpha 0.18b fixes 2016-01-08 11:24:36 +00:00
Shaun Bennett 0a56a838d2 Fix ClansLoginManager, Remove pointless code in CoreClientManager 2016-01-08 05:45:49 -05:00
Shaun Bennett 1d2f61db8c Disable purchasing Christmas Treasure 2016-01-08 03:15:05 -05:00
Shaun Bennett b6b455c1c0 Merge pull request #117 in MIN/mineplex from clans/alpha to develop 
* commit '15d2118bc1701b79576f6d73dc1d4aeca500f11e': (23 commits)
  Added C.Mod rank, and started on rank info.
  changed outpost forcefields to be a bit larger to surround the outpost more.
  made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.
  added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
  fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost)
  fixed outpost being built instantly on output block place.
  holograms above outpost block should be centered in the block and made them despawn on outpost death
  legendary pickkup message fix (FINALLY FIXED NOW )
  quick modification to outposts, and fixed the legendary announcements being weird
  updated clans version
  quikc change
  outpost changes, and some other things
  lots of work on outposts, fixed gold dupe glitch, fixed clans ban gui title being "Customize New Gear".
  fixes (?)
  lots of changes that i can't remember at this point
  Lots of changes, specifics: Fixed clans having more than max energy. Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory. /c <clan> now works with clans with 18+ players.
  player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.
  a couple more prettificatons to pvp timer messages.
  one more quick message change/fix
  qa changes to pvp safety
  ...
 2016-01-08 00:35:15 -06:00
Teddy 6bf0970dbe Unused import removed 2016-01-07 19:52:04 +00:00
NewGarbo d88b14d9d6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-07 09:35:07 +00:00
NewGarbo 52c4a55180 outpost changes, and some other things 2016-01-06 22:32:36 +00:00
libraryaddict c920d4efa1 Modify MapText to actually work, modify UtilText to save the images of characters 2016-01-07 04:48:44 +13:00
Teddy 99f0404fff Queue speed up 2016-01-05 21:05:02 +00:00
Teddy e2824dd0e0 Debugs removed 2016-01-05 21:01:51 +00:00
Teddy d4fd6a6bf7 Treasure not giving Shards when dupes occur, fixed. 2016-01-05 21:00:43 +00:00
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
Teddy d819671d16 Queue implemented for duplicate shard reward 2016-01-05 16:21:34 +00: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 ed81411373 Fix carl bonus messages 2016-01-04 15:58:27 -05:00
Keir 7d16aeb84d Cache private messages for chatsnap reports. 2016-01-04 18:04:47 +00:00
Keir 80c389faf4 Make private message event implement cancellable. 2016-01-04 17:59:16 +00: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
Shaun Bennett 8232d11cd1 Remove in game notifications, change sale message 2015-12-31 15:07:26 -06: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
Keir 3496abe227 Java 8 goodness. 2015-12-30 21:41:24 +00:00
libraryaddict 92c4450eea Update the dual version 2015-12-30 21:12:11 +13:00
Keir 2716039d07 Small cleanup. 2015-12-29 23:49:57 +00:00
Keir 5841ab1101 Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2015-12-29 23:47:00 +00:00
Keir dffd7d95ec Don't include sender in recipients. 2015-12-29 23:35:54 +00:00
Shaun Bennett 55cdf4148a Merge branch 'develop' 2015-12-29 03:21:03 -06:00
Shaun Bennett 7104f1363a Give YT rank access to extra preferences 2015-12-29 00:34:18 -06:00
Keir 278932b9b8 Use CST timezone. 2015-12-29 05:23:18 +00:00
Keir 912b4aa4c8 Get Redis connection data from redis-servers.dat file. 2015-12-29 05:19:56 +00:00
Keir cc421c1435 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2015-12-24 21:19:30 +00:00
fooify 41f56e9853 Lots of typo fixes and such 2015-12-24 11:13:54 -08:00
libraryaddict 2d974a781f Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
	Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-12-24 14:06:59 +13:00
NewGarbo 369687b5dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 
Conflicts:
	Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
 2015-12-23 18:31:51 +00:00
NewGarbo ff24ebc9f4 lots of changes that i can't remember at this point 2015-12-23 18:22:20 +00:00
Morten 8c399f03da Removed a weird query :/ 
Status: Finished
 2015-12-22 21:36:19 +01:00
Morten 9336eb19fa Finished up the Unban feature... 2015-12-22 21:31:57 +01:00
fooify 0ac2158988 i before e! 2015-12-22 11:02:57 -08:00
fooify 255dd0bdb3 fixed cosmetic menu item dropping bug 2015-12-22 11:02:37 -08:00
fooify 592fcbd282 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2015-12-22 10:55:11 -08:00
fooify a8d9956846 more grammatical errors hast been fixed 2015-12-22 10:35:20 -08:00
Virizion 0322ae1217 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-12-22 00:02:21 -05:00
Shaun Bennett 2ccd7a5de0 Fix Type Wars stat icon 2015-12-21 13:20:04 -05:00
Shaun Bennett c63014b51f Type-Wars merge 2015-12-21 12:49:10 -05:00
Sarah a5436d63c0 Updating Holiday Achievements 2015-12-21 18:45:26 +01:00
Sarah 7c66bdbbde Updating Stats GUI 2015-12-21 18:25:44 +01:00
Sarah 010b1b0a5d Achievements.... 2015-12-21 18:08:11 +01:00
Sarah 6e3274ff2f changing Category 2015-12-21 18:06:00 +01:00
Sarah f15c318e5c adding PM message. 2015-12-21 18:02:25 +01:00
Sarah 590da2128c Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
 2015-12-21 17:43:51 +01:00
Morten 1726aa2530 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-21 12:58:19 +01:00
Shaun Bennett fae2a5d2bf Update game display 2015-12-21 04:40:30 -05:00
Shaun Bennett a235103066 Merge pull request #106 in MIN/mineplex from update-menu to develop 
* commit 'f4050fb1ff54dbe4639b0258eff53360d800d0b9':
  Adjust GUI, fix beta button
  Yo shaun debug this m8 ty
 2015-12-21 03:36:46 -06:00
Shaun Bennett 99285b2ac8 Merge remote-tracking branch 'remotes/origin/type-wars' into develop 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
 2015-12-21 03:50:55 -05:00
Mysticate 0f5be6444b Yo shaun debug this m8 ty 2015-12-21 02:23:59 -05:00
fooify fe658b30a1 Grammatical errors hath been fixed! 2015-12-19 15:03:42 -08:00
AlexTheCoder 66c9fa122c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2015-12-18 21:33:59 -05:00
Virizion a5c18f4677 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-18 20:05:03 -05:00
William Burns c2e88c2794 Merge branch 'develop' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data 2015-12-18 18:16:32 +00:00
William Burns 13cfc0e12a Updated to a better check 2015-12-18 18:16:20 +00:00
NewGarbo 1840572c49 Lots of changes, specifics: 
Fixed clans having more than max energy.
Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory.
/c <clan> now works with clans with 18+ players.
 2015-12-18 11:13:38 +00:00
Shaun Bennett 298ea1e5e6 Merge pull request #101 in MIN/mineplex from update-paintball to develop 
* commit 'd561915fd32885036b55cc6a05899934a544e131':
  FORMATTING CHANG EI'M GOING TO CRY UGH
  DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D
  Changed dns api key to new key. Prevent server monitor redis calls to cause restarts. Added winter chests to customer support.
  Epic chnage that saved the day omg
  Die player cache
  Quick changes to improve things.
  Uncommented bouncy balls
  Final tweaks to random armorstand
  Quick thing before merge
  Worked on double.
  Switching branches
  Formatting
  Reformatted
  Fixed paintball to the max. :>>
  Class
  Switching branches c:
  Sniper work
  Work. Deemed unsuitable due to an issue with the paintballs flying wide.
  Added a sniper kit! :D
 2015-12-17 23:32:22 -06:00
Shaun Bennett f80648bfbc Update DBPool to load from file 2015-12-18 00:32:07 -05:00
Mysticate 2bf734a15c DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D 2015-12-17 23:08:07 -05:00
Virizion 806b656dcf Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2015-12-17 21:56:01 -05:00
Virizion 7621fe793d Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-17 21:50:32 -05:00
Mysticate 066d0a861f Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-17 21:00:15 -05:00
Jonathan Williams c2fb6e6c15 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-17 18:34:25 -05:00
Jonathan Williams 2953fe395f Changed dns api key to new key. 
Prevent server monitor redis calls to cause restarts.
Added winter chests to customer support.
 2015-12-17 18:33:49 -05:00
William Burns 3e8c3cb928 Changed to setData in PlayerCustomData 2015-12-17 22:16:05 +00:00
William Burns 2ac28c4fd5 Merge branches 'develop' and 'feature/player-data' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2015-12-17 21:44:31 +00:00
William Burns 5c045bfce4 Changes to core client manager, and finishing custom data! 2015-12-17 21:27:44 +00:00
libraryaddict 7f188072ad Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop 2015-12-18 10:03:41 +13:00
libraryaddict 66372c397b First version of ResourcePackManager that handles all resource packs globally 2015-12-18 10:03:03 +13:00
William Burns 7d9b97180d Testing ArcadePlayer implementation 2015-12-17 01:48:55 +00:00
William Burns ee202bc7f5 Add MineplexPlayer -> ArcadePlayer 2015-12-16 22:32:34 +00:00
William Burns 370c59ce75 Added custom data 2015-12-16 21:52:41 +00:00
Sarah 4e9e0243cd Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
 2015-12-16 18:16:08 +01:00
Keir db5327d2e4 Online reports can now be updated without re-sending all the data (ie we don't want to update all the chat messages when a member of staff handles a report). 
Misc. changes and fixes.
 2015-12-16 15:51:01 +00:00
Keir cd18d2a94f ReportServer fixes and improvements. 2015-12-16 15:05:00 +00:00
William Burns baf0f254bb Custom data, waiting for JLO 2015-12-16 14:41:57 +00:00
Keir 6f82f8349d Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/.idea/modules.xml
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
 2015-12-16 14:07:56 +00:00
Virizion 7fa1963268 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-15 23:06:13 -05:00
Mysticate d16dd4a9d2 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-15 19:35:55 -05:00
Keir b5149d2da7 Implemented williams frontend design. 2015-12-16 00:22:55 +00:00
Mysticate b36bf37197 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-15 19:22:38 -05:00
Keir 6d9bcb8e66 Reworked serialization and store more data in json files for later parsing. 
Internally store UUIDs for reports and convert them as needed for display to user.
Many other misc. changes and refactorings.
 2015-12-15 21:30:45 +00:00
Shaun Bennett 211e440e67 Merge remote-tracking branch 'remotes/origin/master' into develop 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
 2015-12-15 15:00:14 -05:00
Shaun Bennett aef704d972 Slight winter reward rarity changes 2015-12-15 14:58:09 -05:00
Shaun Bennett 5f14d6675f Fix shard values 2015-12-15 14:56:19 -05:00
Shaun Bennett 07f610d4bd More Fixes 2015-12-15 14:45:12 -05:00
Shaun Bennett 607c164753 Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop 2015-12-15 13:55:01 -05:00
Shaun Bennett b9a688c4e7 Update monthly bonuses 2015-12-15 13:07:49 -05:00
Shaun Bennett e3e757da8a Fix mounts owned count 2015-12-15 13:06:11 -05:00
Shaun Bennett 3edba0fac6 Fix Grinch Hat 2015-12-15 12:28:06 -05:00
Shaun Bennett f2107b7b79 Merge remote-tracking branch 'origin/develop' into develop 2015-12-15 12:07:40 -05:00
Shaun Bennett 2216fdc52c Dont disable new gadgets in games 2015-12-15 12:07:34 -05:00
NewGarbo c63bac6433 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-12-15 11:42:16 +00:00
libraryaddict 47ad563596 Spawn nametags far far away from players 2015-12-15 22:46:30 +13:00
Cheese 871c97f7af changed chest %'s 2015-12-15 09:25:44 +11:00
NewGarbo 9137fcfe40 loads of changes (pvp timer, unsafe stuff) 2015-12-14 12:39:00 +00:00
AlexTheCoder 73c84c530e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2015-12-14 06:40:16 -05:00
Cheese 0f38c7b287 increased minimum coal 2015-12-14 22:12:50 +11:00
Cheese 951cd65903 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 22:05:22 +11:00
Cheese 045bc760c2 increassed cooldown, people getting trapped perm 2015-12-14 22:05:08 +11:00
Cheese 809ff649be lowered rarities a bit 2015-12-14 22:03:09 +11:00
Shaun Bennett 7181a26e58 Remove pointless equals() 2015-12-14 05:56:39 -05:00
Cheese 9e72e5adf1 nicer text 2015-12-14 21:43:11 +11:00
Cheese daa9f165b1 removed coins from gadgets 2015-12-14 21:41:47 +11:00
Cheese 0ecd5a05f5 fixed hat ownership 
reduced coal cost
 2015-12-14 21:32:06 +11:00
Cheese 00de6880ba fixed wrong types 2015-12-14 21:25:30 +11:00
Cheese 342e9f2345 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 20:53:49 +11:00
Cheese 1189535748 icon fixes 2015-12-14 20:53:34 +11:00
Shaun Bennett 816c057eb3 Notify server about opening chest 2015-12-14 04:49:44 -05:00
Shaun Bennett daf1d29ce0 Fix Carl 2015-12-14 04:44:11 -05:00
Shaun Bennett 50bf97ae4a Fancy treasure changes 2015-12-14 04:19:15 -05:00
Cheese 670eaa1954 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 19:16:03 +11:00
Shaun Bennett e4fd97467f More treasure changes 2015-12-14 03:14:52 -05:00
Cheese 288c20fc74 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 19:13:05 +11:00
Cheese 9e35399d1d rarities tweaked + shards 2015-12-14 19:09:55 +11:00
Shaun Bennett db9db558a0 Update GUI slots 2015-12-14 02:56:07 -05:00
Shaun Bennett 4afca01ad0 Treasures! 2015-12-14 02:49:51 -05:00
Cheese c508b5ea96 chest visuals 2015-12-14 18:13:19 +11:00
Shaun Bennett 063c87c4fe Merge remote-tracking branch 'origin/master' 2015-12-14 00:29:11 -05:00
Shaun Bennett cdbcae7e3e Cosmetic Menu Update 2015-12-14 00:28:28 -05:00
Cheese 048a9a81b8 gadget ammo should no logner be purchasable 2015-12-14 16:20:39 +11:00
Virizion 09643d3e61 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-14 00:08:32 -05:00
Cheese 7f9e5c4ec9 more coal 2015-12-14 16:06:49 +11:00
Cheese f6f04fe256 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 16:04:05 +11:00
Cheese 55fffdad59 fixed some colors 2015-12-14 16:03:51 +11:00
Virizion b3b41e453b Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-14 00:01:41 -05:00
Shaun Bennett e8b0e5dd8e Fix IntellIJ Files 2015-12-13 23:51:47 -05:00
Cheese bccade55bc reduced coal fumes size 2015-12-14 15:43:45 +11:00
Shaun Bennett 5be91de006 Merge master 2015-12-13 23:40:18 -05:00
Shaun Bennett fe3431ba04 Cosmetic Menu Update 2015-12-13 23:31:21 -05:00
Cheese 1073981778 Merge branch 'master' into update-xmaschaos 2015-12-14 15:30:15 +11:00
libraryaddict b5bdf7ced4 Remove custom name on players on join and arcade spectator 2015-12-14 15:42:32 +13:00
Mysticate 90145bf8e7 Merge branch 'master' of 
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
update-xmaschaos

Conflicts:
	Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
 2015-12-13 18:57:35 -05:00
Mysticate 35ab40727b XMAS UPDATE OMG :O 2015-12-13 18:55:21 -05:00
xGamingDudex 64fb2b11d8 Added fake skin data 
+Moved hats to use fake non-changing skin data
+Added Rudolph hat
+Added Grinch hat
+Added suport for fake skins on DisguisePlayer
+Tweaked PartyPopper
 2015-12-13 23:09:25 +01:00
Virizion 8bcc36adb1 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-13 01:39:42 -05:00
libraryaddict e7213fdb7e Remove project specific settings 2015-12-13 16:41:37 +13:00
libraryaddict 9058428484 Change ItemBuilder to have ItemFlag, change hub icons to not display weapon damage 2015-12-13 16:40:46 +13:00
AlexTheCoder cf05cf5d7b - All finished 
- Added method for disabling explosion manager miniplugin
 2015-12-12 05:12:17 -05:00
AlexTheCoder 49186680f0 - Game ID conflict resolution 2015-12-12 00:31:13 -05:00
AlexTheCoder 31be60bdb4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2015-12-12 00:25:24 -05:00
Virizion 7a82cf04f0 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-11 23:02:16 -05:00
Shaun Bennett c470ad880d Merge pull request #77 in MIN/mineplex from foo to master 
* commit 'd7497ec09881047d7461630fac2c3b51bf37a06c': (23 commits)
  Fixed Micro Battle icon not appearing in stats menu
  Gravity's icon changed to ENDER_PORTAL_FRAME
  world's smallest bugfix - admin->co-host
  Fixed advertisement being able to be bypassed by spec and instant join
  fixed naming pets non-alphanumeric characters
  changed reference to premium ranks
  removed important debug thing
  fixed ssm enderman always facing south on teleport
  fixed bacon blast exloding blocks
  fixed shield smash and fissure affecting spectators
  fixed slab issue with Assassin's Flash
  Re-fixed Barbarian bug
  Fixed SG Barbarian bug
  SSM bug fix: magma cube flame dash doesn't make player invisible
  fixed several smash bugs and one global issue
  Slightly bumped Monster Maze jump time value
  fixed bridge bug "Death Bomber counts suicides as well"
  typo fix in legendary aura description
  Update achievement kit reference text
  Fixed tnt bug (SG)
  ...
 2015-12-11 18:57:18 -06:00
xGamingDudex 6d1e4b6cab Merge remote-tracking branch 'origin/master' into project-cosmetics 2015-12-11 18:09:09 +01:00
xGamingDudex 9af6fd6904 Merge branch 'project-cosmetics' of 
http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into
project-cosmetics

Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPartyPopper.java
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountBabyReindeer.java
 2015-12-11 18:06:35 +01:00
xGamingDudex ba087d119a Small tweaks 2015-12-11 17:31:05 +01:00
Cheese 2ffd1d4595 BOB ROSS 2015-12-11 23:11:33 +11:00
Cheese d5612a8f27 added a hint to how many more coal you need to your next prize. 2015-12-11 23:09:06 +11:00
Cheese 39f5f70a5f fixing up coal things 2015-12-11 22:43:34 +11:00
Shaun Bennett ac6d3c2c8f merge with master 2015-12-11 06:27:23 -05:00
Cheese 7c432461c9 changed coal item rewards to 3 tier :) 2015-12-11 22:25:14 +11:00
Cheese e01a5369fd set bonuses 
item gadget gui update
 2015-12-11 21:53:39 +11:00
Cheese 40c2fdc3fc fixed suits 2015-12-11 21:11:35 +11:00
Cheese d7f39bdfd8 costume sets 2015-12-11 20:59:55 +11:00
Cheese 7fc08f34a7 fixed typo 2015-12-11 20:34:01 +11:00
Cheese f717a5f8cc more set stuff 2015-12-11 20:30:41 +11:00
Cheese 0cda29e135 improved cosmetic set implementation 2015-12-11 20:08:36 +11:00
Cheese a6f664006f set display in gui 2015-12-11 20:01:54 +11:00
Cheese d8a5edf9e9 fixed up gui items 2015-12-11 19:24:19 +11:00
Cheese 61a8d2825e gadget gui overhaul 2015-12-11 19:20:13 +11:00
Jonathan Williams 95a81ef368 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
 2015-12-11 01:26:20 -05:00
Jonathan Williams 222173ab17 Improved and implemented GameProfile caching. 2015-12-11 01:24:59 -05:00
Jonathan Williams b5c157c123 Changed PlayerCache to Cache 2015-12-11 01:24:16 -05:00
Cheese 98e91d29f6 more cosmetic stuff :) 2015-12-11 17:21:54 +11:00
Cheese 7f8c9c02bc and the mounts 2015-12-11 16:38:44 +11:00
Cheese fe7ce40783 finished cosmetic names 2015-12-11 16:31:15 +11:00
Cheese 05a80b23a1 converting gadget text. (kill me now) 2015-12-11 16:07:02 +11:00
Cheese 88f44a293b candy! 2015-12-11 15:31:35 +11:00
Cheese 3447de9a92 Merge branch 'master' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java
 2015-12-11 15:20:50 +11:00
Cheese a5b28422cd cosmetics 2015-12-11 15:19:20 +11:00
AlexTheCoder 33f73aebe5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2015-12-10 23:17:59 -05:00
Shaun Bennett 4588091c5b Merge remote-tracking branch 'origin/master' 2015-12-10 23:15:42 -05:00
Shaun Bennett 21c8a66917 Fix imports 2015-12-10 23:15:35 -05:00
Shaun Bennett 1ab13d2ef5 Treasure Shards! 2015-12-10 22:52:15 -05:00
AlexTheCoder 6878e4489d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2015-12-10 22:49:19 -05:00
AlexTheCoder fe933913e8 - Fixed maps 
- Spawners
 2015-12-10 22:48:57 -05:00
Virizion 14b5a9453a Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-10 22:18:00 -05:00
William Burns a760dba783 i lied. 2015-12-11 02:59:16 +00:00
William Burns 7a597d90b7 final push goodnight 2015-12-11 02:48:06 +00:00
Shaun Bennett 5a1892e1ed Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics 2015-12-10 21:32:14 -05:00
Shaun Bennett d6aed5dff7 More work 2015-12-10 21:32:10 -05:00
Cheese 31cea3342e some gadget stuff 2015-12-11 13:17:38 +11:00
Shaun Bennett ffd4658740 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 2015-12-10 21:06:50 -05:00
Shaun Bennett 2694787590 Reverting 2015-12-10 20:59:57 -05:00
Shaun Bennett cf73d27a84 Merge remote-tracking branch 'origin/master' 2015-12-10 20:53:42 -05:00
Shaun Bennett 4d05bd5c50 Player count for chiss 2015-12-10 20:53:38 -05:00
Shaun Bennett 16f39c1e71 Pushing changes to go help william 2015-12-10 20:51:34 -05:00
William Burns 626a812844 Many changes 2015-12-11 00:40:54 +00:00
Shaun Bennett 4d8b8bd58b Fix errors, update cosmetic menu 2015-12-10 19:27:32 -05:00
Shaun Bennett a9e6224eca Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-12-10 19:21:33 -05:00
Shaun Bennett 7b4f5d5b75 Christmas chest in gui 2015-12-10 19:19:20 -05:00
Shaun Bennett 72a8aaf556 Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-12-10 19:18:49 -05:00
xGamingDudex 44a244caf4 Merge branch 'project-cosmetics' of http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into project-cosmetics 2015-12-11 01:10:54 +01:00
xGamingDudex a6a4c8be36 Cosmetic Update 
+ Added GadgetDisable Event
+ Renamed GadgetActivateEvent to GadgetEnable event
+ Added hat framework, and some example hats
+ Added sets and Frost Lord set
+ Fixed some imports
+ Added new way of checking ownership of gadgets
+ Added some utility methods to GadgetManager
+ Added support for alternative package name of gadgets
+ Fixed coal
+ New Blood Helix particle
 2015-12-11 01:05:32 +01:00
Shaun Bennett d16d9a36e9 Use Account ID from client manager instead of PlayerCache 2015-12-10 17:25:39 -05:00
Shaun Bennett 851b613d2e Now playing fix 2015-12-10 17:04:15 -05:00
Sarah 0f8028f6e6 Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
 2015-12-10 12:24:11 +01:00
Sarah c94c84f203 Some fixes 2015-12-10 02:59:22 +01:00
Sarah 76b29756ff Fixing some stats and disabling Chat spam messages. 2015-12-10 02:02:36 +01:00
Keir 8459cf0f95 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
 2015-12-09 18:13:26 +00:00
Keir 54157024f7 Committing current progress, can't afford to lose this again 2015-12-09 18:06:04 +00:00
Virizion 507761d5b0 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-08 21:24:21 -05:00
William Burns d709071feb Much fix, many wow. 2015-12-08 23:20:42 +00:00
Shaun Bennett 7f75749194 Merge remote-tracking branch 'origin/master' 2015-12-08 16:55:14 -05:00
Sarah 484dce18e1 Changing some Achievement things, to allow double values and dividing, Adding WPM, fixing some bugs. 2015-12-08 22:34:42 +01:00
Cheese fba88ec231 mount stuff is fixed 2015-12-09 08:19:55 +11:00
Virizion 8051486fcb Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-08 16:14:41 -05:00
Shaun Bennett ca71f1f64f Merge remote-tracking branch 'origin/master' 2015-12-08 14:32:17 -05:00
William Burns f8f95c64e5 Fixing arena moving 2015-12-08 15:10:29 +00:00
Shaun Bennett a1915e324c Some java 8 code 2015-12-08 08:42:45 -05:00
xGamingDudex b1536547d3 Cosmetic Update 2 
+ Item Coal
+ Freeze Cannon
+ Party Popper / Party Bomb
+ Snowball
+ Coal Fumes Particle
+ Snowman sneak trail/glide
+ Teaked stuff
 2015-12-08 00:50:08 +01:00
Keir 529eab5aef Improved the report php code, made it more object orientated. 
Commented out debug code.
 2015-12-07 23:43:29 +00:00
Shaun Bennett 42a0354c9e Now Playing, Preference to disable ads 2015-12-07 18:28:05 -05:00
William Burns 55f0453897 Start of re-write 2015-12-07 23:20:03 +00:00
Virizion ec4a21a282 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-07 18:19:16 -05:00
Keir d38ce9ef1e Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-12-07 18:54:53 +00:00
Shaun Bennett 8ff034fb5d Merge pull request #89 in MIN/mineplex from clans-beta to master 
* commit 'eed6966a5b39d1fc9544055a5b5801758a62a56a':
  Winter MOTD, Stat fixes (maybe?!)
  made use ability teleport player back to where they should be
  Forgot to push these changes last update!
  fixed tnt blowing up in claims when offline
  fixed task not getting cleanup up after /skiptutorial
  fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
  Fix heavy attribute, disable claim visualizer
  Disable subtasks for now
  Clans alpha 0.17
  clan claim visualizer
  fixed infinite claims
 2015-12-07 12:22:10 -06:00
Shaun Bennett c3ace42a68 Winter MOTD, Stat fixes (maybe?!) 2015-12-07 13:21:11 -05:00
Keir 31d05cdb3b Fix error from last commit (git forced me to commit unfinished files due to the merge). 2015-12-07 18:13:48 +00:00
Keir 67b3fe1d23 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
 2015-12-07 18:11:40 +00:00
Shaun Bennett ffbb057d23 Merge pull request #88 in MIN/mineplex from iKeirNez_Bugfix to master 
* commit '9bd7869e2260e23a0ff981b7084ff9b4a3768b43':
  Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.
 2015-12-07 11:25:17 -06:00
Shaun Bennett c6c012031f Less ugly formatting 2015-12-07 04:44:19 -05:00
Shaun Bennett 4354133de9 Add Minecraft timings to /lag 2015-12-07 04:40:34 -05:00
Cheese e1efcabfbf chat sale msgs 2015-12-07 20:39:31 +11:00
Shaun Bennett 44a5bcb793 remove titan chest message, update pumkin message, holiday MB/DMT words 2015-12-07 02:06:00 -05:00
Shaun Bennett 7b5db2d4fb Hub Music, HubMusic Preference 2015-12-07 00:58:44 -05:00
Shaun Bennett 488895ea53 Note block player 2015-12-06 21:12:10 -05:00
xGamingDudex c36182b8d4 Cosmetic Update 
New:
+ New GUI System
+ Candy Cane Particle
+ Candy Cane Double Jump
+ Candy Cane Death Effect
+ Candy Cane Arrow Trail
+ Snowman Morph
+ Baby Reindeer Mount
+ Pet Coal Apparition

Fixed/Updated:
* Added getTick to UpdateEvent and UtilTime
* Added more methods to UtilParticle
* Gadget manager isMoving now counts flying as moving
* Updated some cosmetics
 2015-12-07 02:53:14 +01:00
Mysticate 09f7a03444 Quick changes to improve things. 2015-12-06 20:00:22 -05:00
Mysticate 88dcdaa445 Merge remote-tracking branch 'origin/master' into update-paintball 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
 2015-12-06 12:00:06 -05:00
AlexTheCoder 4278f3fa99 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla 2015-12-06 03:51:08 -05:00
AlexTheCoder 430de10008 - Everything except maps [probably should've committed sooner] 2015-12-06 03:47:07 -05:00
Cheese ccb6456110 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
 2015-12-06 18:09:24 +11:00
Cheese 35c362b8bf small youtuber perms 2015-12-06 18:08:36 +11:00
Shaun Bennett b7b5235f59 Fix error 2015-12-06 00:57:43 -05:00
Cheese d095e14b4c Merge branch 'monster-league' 2015-12-06 16:33:21 +11:00
Cheese 9880e9a3c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-06 16:32:59 +11:00
Cheese 040e94f1fb bouncy 2015-12-06 16:32:45 +11:00
Shaun Bennett 618105b4c8 Add minimum rank to Announcement Command 2015-12-06 00:15:49 -05:00
Shaun Bennett 8d831d5228 Fix END_PORTAL bug causing gui's to break 2015-12-06 00:06:31 -05:00
Shaun Bennett 32a6d572ee Disable gadgets in arcade for player count > 40 2015-12-05 22:56:15 -05:00
libraryaddict b98944b0a0 Handle attach entity 2015-12-06 14:38:00 +13:00
Virizion 5b49c4adc3 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-05 19:58:55 -05:00
libraryaddict d5606f55ea Modified CustomTagFix to support player name titles 2015-12-06 10:18:35 +13:00
Keir 9bd7869e22 Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved. 2015-12-05 01:08:21 +00:00
Keir 2e72e46242 Add report preferences to exclusive preferences. 2015-12-05 01:05:43 +00:00
Keir ef6fd0eaa3 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2015-12-05 00:05:05 +00:00
fooify d7497ec098 Fixed Micro Battle icon not appearing in stats menu 2015-12-04 15:56:48 -08:00
Cheese 49c735e43c removed duplicate code 2015-12-05 10:34:06 +11:00
Keir ddf6037fc4 Wrote standalone chatsnap handler and implemented required changes in Core. 2015-12-04 23:30:27 +00:00
Cheese 4a53667539 gadget restructure 
converted frost lord and titan particles into 4 subcategories.
 2015-12-05 10:22:00 +11:00
Keir c19baf5750 Make periodic handler message display close command and clicking it suggests the command. 2015-12-04 22:08:44 +00:00
Shaun Bennett 5c575b41fc Clans alpha 0.17 2015-12-04 05:15:28 -05:00
fooify b1bd2ff5ac Gravity's icon changed to ENDER_PORTAL_FRAME 2015-12-03 16:50:27 -08:00
Virizion c3a564faa7 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-03 19:31:24 -05:00
fooify 348f2d8e4c Merge remote-tracking branch 'origin/master' into foo 2015-12-03 16:31:16 -08:00
Christopher Jozsa 8717f962e6 Merge pull request #83 in MIN/mineplex from mrsomeone12_SmallFixes to master 
* commit 'c98b427fdebb0d8abcce3a17731c0f9b35eece01':
  Added missing MountData and SingleEntityMountData files.
  Mount bug fix.
  Added method to edit NoAI field on entities.
  Implemented new mount data system replacing instead of entities as data.
  We only need to add the "Go Back" page once...
  TitanMount fixes
 2015-12-03 17:15:21 -06:00
Virizion cab5c2a76d Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-02 20:12:41 -05:00
NewGarbo d6ca52e4a4 modifications 2015-12-02 05:11:09 +00:00
Virizion 1810defd2d Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-01 20:39:54 -05:00
fooify 338e0f1892 fixed naming pets non-alphanumeric characters 2015-12-01 16:23:07 -08:00
Keir 9508556d57 Refactor. 2015-12-01 22:47:51 +00:00
Jonathan Williams 633697dc7a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-30 23:49:32 -06:00
Jonathan Williams 03a1f19df9 Fixed memory leaks in Disguise and Recall. 
Removed debug messages in ItemMapManager
 2015-11-30 23:49:16 -06:00
Cheese 51023a7630 cosmetic cooldown fix 2015-12-01 15:38:54 +11:00
Cheese 208eaf3a01 cosmetics recharge slowdown 2015-12-01 11:38:52 +11:00
xGamingDudex c98b427fde Added missing MountData and SingleEntityMountData files. 
For some reason, git decided that it was a good idea to remove these two
files from the index...
 2015-12-01 00:46:20 +01:00
Keir 0bbb705654 Small method & class renames, document methods. 2015-11-30 16:35:07 +00:00
Keir 4aa84b9180 Store chat messages from the last 30 minutes. 2015-11-30 02:03:26 +00:00
xGamingDudex 6120c8246b Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes 2015-11-29 19:11:24 +01:00
xGamingDudex d1d58919f4 Mount bug fix. 
Mount was put in map before removed, resulting in new mount being half
disabled.
 2015-11-29 19:09:55 +01:00
xGamingDudex 509835ea64 Implemented new mount data system replacing instead of entities as data. 
+ Removed some unnecessary code
+ Made StackManager use new mount system

This system also fixes a bug allowing players "hijack" some of the
mounts as it was not properly persistent.
 2015-11-29 19:08:00 +01:00
xGamingDudex 327bf8d09b We only need to add the "Go Back" page once... 2015-11-29 18:32:24 +01:00
fooify 61df87b446 Merge remote-tracking branch 'origin/master' into foo 2015-11-29 06:37:30 -08:00
Virizion e09e5851a6 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-11-29 01:17:17 -05:00
Shaun Bennett 7c947ad97b Merge master 2015-11-28 23:55:00 -05:00
NewGarbo 9ff9724fc8 tutorial revamp 2.0 2015-11-29 02:10:39 +00:00
Cheese 5cefe27257 cosmetic fixes 2015-11-29 11:40:19 +11:00
NewGarbo aa68701ebd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-28 20:16:49 +00:00
fooify 8cdae7ce1a Merge remote-tracking branch 'origin/master' into foo 2015-11-28 09:33:47 -08:00
xGamingDudex dc0da3987b TitanMount fixes 
Added so that the magma cube is looking in the direction of which the
player is flying.
Removed players ability to unequipt the armorstand that take out the
netherrack block from their head slot.
 2015-11-28 17:22:17 +01:00
Cheese 51227ae4f3 fixed leak 2015-11-29 01:25:15 +11:00
libraryaddict 28947643e0 More updates for dual version 2015-11-29 02:54:16 +13:00
NewGarbo 0dceca5cfc Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-28 09:04:15 +00:00
NewGarbo a0ae500876 tutorial revamp [clans] 2015-11-28 09:03:58 +00:00
libraryaddict d4ab57e4e7 Update for 1.9 dual version 2015-11-28 19:38:58 +13:00
Cheese 700cf51206 titan stuff almost done 2015-11-28 16:35:11 +11:00
Cheese 963caae719 Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes' 2015-11-28 16:00:28 +11:00
Cheese 8af545af80 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
 2015-11-28 15:59:26 +11:00
Cheese 0871663498 titan stuff 
I HATE YOU SNAKE.
 2015-11-28 15:57:07 +11:00
Shaun Bennett 1a87d85174 Merge remote-tracking branch 'remotes/origin/master' into clans-beta 2015-11-27 23:13:43 -05:00
xGamingDudex 24f8a98545 Added titan particle trail. 2015-11-28 02:22:41 +01:00
NewGarbo fe085c1571 loaaads of stuff 2015-11-27 19:42:15 +00:00
libraryaddict 636dcdf9f7 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitan.java
 2015-11-28 05:28:04 +13:00
libraryaddict 5f8f643d95 What snake mount code I did 2015-11-28 05:26:43 +13:00
Shaun Bennett a5ebf9b059 Fixes for release 2015-11-27 05:53:57 -05:00
Cheese 4e2f48b37e Merge branch 'master' into clans-beta 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
 2015-11-27 19:16:30 +11:00
Cheese f55b6761a8 disabled titan gadgets! 2015-11-27 19:14:35 +11:00
Cheese 77be81c216 pet changes 2015-11-27 16:50:22 +11:00
Cheese 2b047cdde8 more titan stuff 2015-11-27 16:46:48 +11:00
Cheese 05e7183b65 titan stuff update 2015-11-27 15:55:00 +11:00
Virizion 73c2f16d8b Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-11-26 23:11:12 -05:00
NewGarbo 0274bf2847 loads of changes. 2015-11-27 03:28:19 +00:00
libraryaddict 3c98243201 Some more guardian stuff 2015-11-27 15:56:56 +13:00
libraryaddict 0a4416381b Fix guardian 2015-11-27 15:55:02 +13:00
Cheese 98d988584d titan cosmetics 2015-11-27 13:35:25 +11:00
Keir 0ee042f192 Implement equals and hashCode, move compareTo into MessageSnap class. 2015-11-26 23:59:17 +00:00
Keir 3e06451ac1 Whoops, this should be 30 SECONDS, not MINUTES. 2015-11-26 23:50:45 +00:00
Keir d47b494628 Add /chatcache (mainly for debugging). 
Fix cache not being able to store more than 1 value per sender.
Add comparator to sort all messages chronologically.
 2015-11-26 23:29:43 +00:00
Keir edf93ec43f Initial ChatSnap implementation. 2015-11-26 16:55:27 +00:00
NewGarbo 0d43ffc7b2 fixessss 2015-11-26 06:54:49 +00:00
Virizion de82806fc0 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-11-25 22:53:06 -05:00
libraryaddict 3e8a53562e Add new hologram interaction thingy so holograms can catch interactions that they would normally block 2015-11-26 15:49:28 +13:00
Shaun Bennett 1306137cb2 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-11-25 14:51:00 -05:00
Shaun Bennett ff5d828dd7 Merge with master, lots of clans fixes/work 2015-11-25 14:50:49 -05:00
NewGarbo 2adfef41ca bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 ) 2015-11-25 16:46:53 +00:00
xGamingDudex 3b89d65a09 Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
	Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
 2015-11-25 15:59:18 +01:00
libraryaddict ca81265b9e Readded PacketHandler debug message 2015-11-25 13:42:11 +13:00
Sarah 46362a3d5f Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-11-24 15:38:52 +01:00
Cheese 837be048a6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 21:38:47 +11:00
Jonathan Williams f8d8b75586 Changed how timings is used. 2015-11-24 04:36:18 -06:00
fooify f300fd2c98 Merge remote-tracking branch 'origin/master' into foo 2015-11-23 15:34:27 -08:00
Shaun Bennett ef7c26c04c Clans changes 2015-11-23 15:57:13 -05:00
NewGarbo a551e89310 fixed clans tips preferences, and changed World Event commands perms from being ALL to EVENT 2015-11-23 09:44:35 +00:00
Keir f0e24468d5 Enable reporting functionality for Arcade and Clans plugins. 2015-11-22 14:23:17 +00:00
Keir dcca67e571 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-22 13:54:16 +00:00
Virizion ddc5427ae3 Merge branch 'master' into virizion_speed_builder 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-11-21 14:20:53 -05:00