Mineplex2018-withcommit

JarvisBigBalls/Mineplex2018-withcommit

Author	SHA1	Message	Date
Keir	19301271a4	Fix format character.	2016-01-13 11:51:49 +00:00
Keir	26246604a7	This should've gone with the previous commit :/	2016-01-13 11:48:18 +00: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
Virizion	ee6425bbaf	Removed extra blank lines.	2016-01-12 23:31:35 -05:00
Virizion	dfd5a63b78	More changes and fixes.	2016-01-12 23:29:08 -05: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
Virizion	b27d5849d8	General fixes.	2016-01-12 20:23:25 -05:00
NewGarbo	fb53e443e7	cleanup and cannons stuff	2016-01-12 20:27:24 +00:00
NewGarbo	f3003e795e	Implemented Outpost MK III	2016-01-12 18:59:01 +00:00
NewGarbo	6cde84ec5f	fixed outpost block placing/breaking boundary checking	2016-01-12 18:57:25 +00:00
NewGarbo	025f82e5ed	made the forcefield bump much weaker	2016-01-12 16:31:21 +00:00
Teddy	f1314d5c26	JSON now handled by JsonMessage Builder	2016-01-12 13:25:47 +00:00
NewGarbo	62f16ada81	that's not the correct bounds!	2016-01-12 07:57:35 +00:00
NewGarbo	5b4b5fb2b5	fixed outpost forcefield knocking you away even if the building is complete, also made the particles show the actual boundaries	2016-01-12 07:44:20 +00:00
libraryaddict	b1c6af4d1a	Update CB	2016-01-12 20:18:03 +13:00
NewGarbo	7d858c72f3	Merge branch 'clans/beta' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta	2016-01-12 07:12:18 +00:00
NewGarbo	a6be919e4a	agh lost some code ;-;	2016-01-12 07:10:22 +00:00
NewGarbo	ed8d9459b2	goes with the commit below VVVV	2016-01-12 07:02:19 +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
NewGarbo	c873b6b886	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha	2016-01-12 06:58:53 +00:00
libraryaddict	c3e11e87ea	Fix small issues with burning and ignition	2016-01-12 19:10:32 +13:00
libraryaddict	11da5a3fe1	Fix fire combusting and cancelled damage events	2016-01-12 18:56:48 +13:00
Shaun Bennett	4e9a4c87d4	Merge pull request #123 in MIN/mineplex from bugfix/disguise-command to develop * commit '0f587ba5d908afdccb877358d71e56a3edda49cd': fixing "Kicked for flying again" again...	2016-01-11 17:20:51 -06: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
Teddy	88c53bf464	Added default ChatStat for all games to prevent my server from dying when testing	2016-01-11 19:35:00 +00:00
NewGarbo	d656c7a212	fixed clans banned players counting as being online after joining and their territory then being blown up	2016-01-11 18:02:03 +00:00
Teddy	02ff8bdbdb	Custom stats working, escaping bug fix and List reset bug	2016-01-11 12:59:57 +00:00
Teddy	40d913beaf	Changed a List to reset each time its registered to prevent stats copying to the next game, automatic string escaping, party colour name changed to original colour	2016-01-11 12:35:44 +00:00
Teddy	b9d44d9a24	not updating properly, fixed	2016-01-11 12:14:29 +00:00
Teddy	78eaee98df	Typo mistake	2016-01-11 12:09:08 +00:00
Teddy	ec6e916c7b	more stable, progress for making 'easier-to-use'	2016-01-11 12:06:30 +00:00
NewGarbo	3773ab3f0b	fixed safelog npcs sticking around some time	2016-01-11 10:14:32 +00:00
NewGarbo	60a78e396f	remove legendary announcement in chat/middle text	2016-01-11 09:16:11 +00:00
Shaun Bennett	6c055c31a0	Fix flashing through doors, Update to 0.18c	2016-01-10 20:39:56 -05:00
NewGarbo	d5b5ac7bb0	changed regen level on giants broadsword from 4 to 3 and made slowness last longer so that screen doesn't glitch out	2016-01-10 23:06:39 +00:00
NewGarbo	d4ccb82791	didn't push this earlier	2016-01-10 23:03:16 +00:00
NewGarbo	6673081fb3	fixed LeechingAttribute from throwing an error when setting health above 20	2016-01-10 22:31:51 +00:00
NewGarbo	04c7f2c1f1	made pressure plates, buttons, and levers from working with block toss	2016-01-10 22:20:50 +00:00
Keir	1c49e3a111	Make chat log clickable, only close report instruction line suggests command.	2016-01-10 21:28:57 +00:00
NewGarbo	bccee71ff7	made signs placed by muted players get cleared on being placed	2016-01-10 21:16:49 +00:00
NewGarbo	734351011a	made all old clans ban clients get unloaded. there seems to have been problems with certain clients not unloading.	2016-01-10 21:15:50 +00:00
NewGarbo	9c3a62a308	made it so punished players can't place signs	2016-01-10 21:03:34 +00:00
NewGarbo	68808efb49	made players not be able to chat while chat is silenced	2016-01-10 20:57:12 +00:00
NewGarbo	fa3de2a479	made clans ban messages not public	2016-01-10 20:55:29 +00:00
NewGarbo	51872faa04	fix mutes not working	2016-01-10 20:53:55 +00:00
Mysticate	fa7eef5045	Muted players can't write on signs.	2016-01-10 13:13:38 -05:00
Teddy	5caeb8bee0	even nicer visual	2016-01-10 17:34:15 +00:00
Teddy	c814132b24	ratio's and nicer visuals	2016-01-10 17:33:18 +00:00
Teddy	83375a6883	stats not updating	2016-01-10 16:01:40 +00:00
Teddy	1bce624ab3	Finally got rid of MalformedJSON	2016-01-10 15:13:11 +00: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	46695f8449	Fix hub fly for YOUTUBE_SMALL	2016-01-09 18:44:32 -05:00
Shaun Bennett	83e5c7399e	Fix YOUTUBE_SMALL preferences	2016-01-09 18:41:19 -05:00
Shaun Bennett	8193b5121b	Dont allow /disguise for YOUTUBE_SMALL	2016-01-09 18:39:47 -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	7db3f3469f	Destroy pool when a thread ends.	2016-01-09 22:21:27 +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
Teddy	263e1326cd	JSON progress	2016-01-09 20:22:29 +00:00
NewGarbo	fa509f0043	fixed giant's broadsword giving HUGE regen. PLEASE PUSH ASAP	2016-01-09 19:58:31 +00:00
Thanos paravantis	ce1bac8037	Remove unused imports.	2016-01-09 17:03:14 +02:00
Thanos paravantis	62e1fb3688	Prevent players from stacking others with a menu inventory opened.	2016-01-09 17:01:57 +02:00
Sarah	0f587ba5d9	fixing "Kicked for flying again" again...	2016-01-09 12:07:57 +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	710654cd06	Use Validate class from Apache Commons to minify code.	2016-01-08 15:06:13 +00: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
Keir	5cb91bb315	Allow reuse of ReportManager instance (for later use).	2016-01-08 13:59:30 +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	ee73b374a6	Forgot to uncomment in ClansLoginManager	2016-01-08 06:36:59 -05: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
Sarah	5482d1dc40	Fixing "kicked for Flying"	2016-01-08 12:17:28 +01:00
Shaun Bennett	0a56a838d2	Fix ClansLoginManager, Remove pointless code in CoreClientManager	2016-01-08 05:45:49 -05:00
Shaun Bennett	6096fcad42	Fix hotbar issues	2016-01-08 04:06:11 -05:00
Shaun Bennett	504d9d508c	Slightly reduce Squid's Ink Blast damage in SSM	2016-01-08 03:15:30 -05:00
Shaun Bennett	1d2f61db8c	Disable purchasing Christmas Treasure	2016-01-08 03:15:05 -05:00
Shaun Bennett	d361ce948e	Merge branch 'develop' into william-gladiators # Conflicts: # Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java	2016-01-08 02:21:32 -05:00
Shaun Bennett	db7d814e02	Disable hub music	2016-01-08 01:42:05 -05:00
Shaun Bennett	19bb44cb9a	Disable HolidayManager and HolidayGiftManager	2016-01-08 01:41:02 -05:00
Shaun Bennett	9c3b07123f	Revert to normal HubType	2016-01-08 01:39:54 -05:00
Shaun Bennett	003af1b87c	Disable Holiday Words in DMT and Build	2016-01-08 01:38:49 -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
NewGarbo	15d2118bc1	Added C.Mod rank, and started on rank info.	2016-01-07 23:32:51 +00:00
Shaun Bennett	b606c8da22	More tutorial	2016-01-07 18:08:54 -05:00
NewGarbo	e1e8c2bb97	changed outpost forcefields to be a bit larger to surround the outpost more.	2016-01-07 21:02:55 +00:00
NewGarbo	43f075014a	made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.	2016-01-07 20:05:33 +00:00
Teddy	6bf0970dbe	Unused import removed	2016-01-07 19:52:04 +00:00
NewGarbo	fff6d8e03f	added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.	2016-01-07 19:36:52 +00:00
Keir	3be6030a5d	Exit if no identifier is supplied before any errors are caused.	2016-01-07 16:21:33 +00:00
Keir	21d8576787	Fix "bubbles" becoming detached from their icon.	2016-01-07 15:52:03 +00:00
NewGarbo	90a06d97b5	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)	2016-01-07 14:04:26 +00:00
NewGarbo	d4fdda8ef2	fixed outpost being built instantly on output block place. cleaned up a bit	2016-01-07 14:03:15 +00:00
NewGarbo	5c810a46c9	holograms above outpost block should be centered in the block and made them despawn on outpost death	2016-01-07 13:26:18 +00:00
NewGarbo	e9789b2ee8	legendary pickkup message fix (FINALLY FIXED NOW )	2016-01-07 10:31:23 +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	b685a207bc	quick modification to outposts, and fixed the legendary announcements being weird	2016-01-07 09:34:16 +00:00
Keir	644453a9c4	Name PubSub threads.	2016-01-07 07:06:55 +00:00
Keir	a63d98a2d7	Write to files asynchronously.	2016-01-07 07:04:24 +00:00
Keir	abc15e3a4c	Handle multiple multi-threaded Redis connections (and re-connections), improved logging, various refactors.	2016-01-07 06:58:21 +00:00
Keir	98a7b6d6d6	Allow data directory to be configured using a command-line parameter.	2016-01-07 04:40:39 +00:00
NewGarbo	ef929b39b3	updated clans version	2016-01-06 22:38:45 +00:00
NewGarbo	76c0230805	quikc change	2016-01-06 22:35:09 +00:00
NewGarbo	52c4a55180	outpost changes, and some other things	2016-01-06 22:32:36 +00:00
libraryaddict	de6f6cf5f0	Add a IsLive check in Spleef	2016-01-07 08:49:26 +13:00
libraryaddict	c920d4efa1	Modify MapText to actually work, modify UtilText to save the images of characters	2016-01-07 04:48:44 +13:00
Keir	63f8b3a74e	Keep files for 15 days instead of 1.	2016-01-05 22:33:07 +00: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	652084d071	Merge pull request #115 in MIN/mineplex from bugfix/thanos to develop * commit '3770211e66b41e16440609a0a79b3999b9b6cca7': Turf Wars: Include Teddy's border fix. Turf Wars: Undo bracket formatting. Turf Wars: Apply knockback on all players when there are only two in the match. Turf Wars: Add comment on block physics event. Turf Wars: Fix sneaking near turf edge and wool placement near ladders.	2016-01-04 15:56:32 -06:00
Shaun Bennett	962efe4a61	Fix not being able to join games through portals	2016-01-04 16:41:07 -05:00
Shaun Bennett	ed81411373	Fix carl bonus messages	2016-01-04 15:58:27 -05:00
Thanos paravantis	3770211e66	Turf Wars: Include Teddy's border fix.	2016-01-04 22:58:11 +02:00
Shaun Bennett	05ef4d30c7	Store a set of active members for objective goals	2016-01-04 15:56:33 -05:00
Thanos paravantis	982e684a45	Turf Wars: Undo bracket formatting.	2016-01-04 21:42:58 +02:00
Shaun Bennett	c50fb52a88	Disable New Years Countdown	2016-01-04 14:21:21 -05:00
Shaun Bennett	c739ecc26d	Fix forcefield for YOUTUBE_SMALL	2016-01-04 14:20:39 -05:00
Shaun Bennett	ce8586e5c5	More work and refactoring on the tutorial	2016-01-04 14:18:58 -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
Thanos paravantis	47c78bcba1	Turf Wars: Apply knockback on all players when there are only two in the match.	2016-01-04 17:19:40 +02:00
Thanos paravantis	f6ce98f65b	Turf Wars: Add comment on block physics event.	2016-01-02 23:33:08 +02:00
Thanos paravantis	03c6395a30	Turf Wars: Fix sneaking near turf edge and wool placement near ladders.	2016-01-02 23:30:27 +02:00
AlexTheCoder	2b365e4afd	- Fixed blacklisting to stop join spam	2016-01-02 14:35:05 -05:00
Sarah	dd6d7b1b96	updating denial message	2016-01-02 16:45:15 +01: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
Sarah	a06a0060aa	Fixing Disguise File	2016-01-02 01:53:19 +01:00
Sarah	a30c2b0d75	update /Disguise for Hub as well	2016-01-02 00:53:56 +01:00
Shaun Bennett	2e017fa5ca	Fix redis command	2015-12-31 16:11:51 -06:00
Shaun Bennett	8232d11cd1	Remove in game notifications, change sale message	2015-12-31 15:07:26 -06:00
Shaun Bennett	74eb04e5b4	Merge pull request #112 in MIN/mineplex from feature/new-year to develop * commit '6b3a5416643389a7bcac8df93f40f492452971e5': Accurate timings Small edits Flame Made it activate in all lobbies via command. Added a new years countdown to the hub.	2015-12-31 14:51:49 -06:00
William Burns	6b3a541664	Accurate timings	2015-12-31 18:53:57 +00: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
Sarah	8ef1a524c1	updating /disguise	2015-12-31 12:01:24 +01:00
Mysticate	efbd1c52d2	Merge remote-tracking branch 'origin/master' into feature/typewars-antimacrorekter	2015-12-31 03:01:23 -05:00
Mysticate	5ff9d1985b	Monitoring for josh + the mods	2015-12-31 03:00:40 -05:00
William Burns	637baed830	Small edits	2015-12-31 01:24:58 +00:00
William Burns	874695cdf6	Flame	2015-12-31 00:50:53 +00:00
William Burns	a64dc6a8d4	Made it activate in all lobbies via command.	2015-12-31 00:46:31 +00:00
Keir	3496abe227	Java 8 goodness.	2015-12-30 21:41:24 +00:00
William Burns	1b40cece80	Added a new years countdown to the hub.	2015-12-30 20:04:01 +00:00
libraryaddict	1a30e0b335	Latest changes to CB	2015-12-30 23:34:27 +13:00
AlexTheCoder	a4853e667c	- Gameplay edits and disabling broadcaster code	2015-12-30 03:23:21 -05: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
William Burns	f1c7424939	Fixing hotbar	2015-12-29 15:19:09 +00:00
Shaun Bennett	55cdf4148a	Merge branch 'develop'	2015-12-29 03:21:03 -06:00
Shaun Bennett	16ee74885e	Add maintenance line	2015-12-29 02:52:53 -06:00
Shaun Bennett	7ad12d0a6b	Show Host Rank in private servers	2015-12-29 00:50:20 -06:00
Shaun Bennett	7104f1363a	Give YT rank access to extra preferences	2015-12-29 00:34:18 -06:00
Keir	00e92f2569	Change date time format, biggest -> lowest units.	2015-12-29 06:20:13 +00:00
Keir	16b3ad6c1c	Hovering over a reports age now shows the full date and time it was created.	2015-12-29 06:09:45 +00:00
Keir	738815bbb1	Show age of report instead of creation date and time for ease of use.	2015-12-29 05:51:50 +00: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
fooify	fe337986bf	Merge remote-tracking branch 'origin/develop' into bugfix/foo	2015-12-28 16:16:10 -08:00
Virizion	8a8d5b088b	Switch to 7x7 builds.	2015-12-28 16:48:03 -05:00
Virizion	3d9a252868	Added auto pickup and fixed some stuff.	2015-12-27 15:26:43 -05:00
Virizion	162b3eb33f	Stopped a bunch of block events.	2015-12-27 14:34:24 -05:00
William Burns	1066becd68	push	2015-12-26 20:21:46 +00:00
Virizion	845014b677	Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder	2015-12-25 15:49:41 -05:00
Shaun Bennett	c680d91b56	Nerf TypeWars gems (again)	2015-12-25 03:12:04 -06:00
Shaun Bennett	dd8e91e463	Update MOTD	2015-12-25 03:03:53 -06:00
Shaun Bennett	25d36b546a	Remove unnecessary files	2015-12-25 01:53:00 -06:00
Shaun Bennett	d08cfa0c4c	Holiday Gifts	2015-12-25 01:51:36 -06:00
Keir	fb24f4a1b0	Re-add ReportServer module (got removed somehow) and add it under the "Other" group.	2015-12-25 00:37:21 +00:00
Keir	56c5b8edee	Rename module to ReportServer.	2015-12-24 21:29:40 +00:00
Keir	2252a5397d	Fix file filter and reduce it down to 1 line.	2015-12-24 21:25:55 +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
Keir	42aba8bda1	Added file purger (runs every 30 minutes, purges anything older than a day). Use a logger instead of sout. General cleanup, especially of console messages.	2015-12-24 21:13:09 +00:00
fooify	41f56e9853	Lots of typo fixes and such	2015-12-24 11:13:54 -08:00
fooify	b356bce177	Merge remote-tracking branch 'origin/develop' into bugfix/foo	2015-12-24 11:09:08 -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
Virizion	b0f8edb0f9	Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder	2015-12-23 18:25:52 -05:00
NewGarbo	aa50c4762f	fixes (?)	2015-12-23 18:55:44 +00:00
libraryaddict	1d4a5e5804	Clean up imports, set resource pack on clans.	2015-12-24 07:47:05 +13:00
libraryaddict	000b1f85b7	Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop	2015-12-24 07:41:55 +13:00
libraryaddict	67bdc6832f	Tentative beginnings for clans resource packs	2015-12-24 07:40:49 +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
William Burns	79dea726aa	Added check for falling from map.	2015-12-23 10:59:12 +00:00
William Burns	c48df36459	Canvas reset with starting picture.	2015-12-23 10:26:14 +00:00
William Burns	ad1d444af8	Kit changes and new words.	2015-12-23 09:52:52 +00:00
William Burns	08b5e7b4db	Working loadouts.	2015-12-23 09:21:43 +00:00
Morten	f83016e007	Also really quickly fixed the Invisibility in lobby bug (hopefully)	2015-12-23 00:39:16 +01: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
William Burns	b255c58653	Merge branches 'develop' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators	2015-12-21 21:56:08 +00:00
Shaun Bennett	2ccd7a5de0	Fix Type Wars stat icon	2015-12-21 13:20:04 -05:00
Shaun Bennett	7a72762c78	Update MOTD	2015-12-21 12:56:37 -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	082b5e156c	fixing Kit NPEs	2015-12-21 17:48:17 +01:00
Sarah	ff5761cc1d	Fixing ending Stats.	2015-12-21 17:44:15 +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	5469289d82	Wrong iterator!	2015-12-21 06:57:56 -05: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	f4050fb1ff	Adjust GUI, fix beta button	2015-12-21 04:35:57 -05: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
Shaun Bennett	0da28faab8	Work on new tutorial	2015-12-21 03:49:27 -05:00
Mysticate	0f5be6444b	Yo shaun debug this m8 ty	2015-12-21 02:23:59 -05:00
Sarah	816da0f633	Fixing Gems	2015-12-20 12:00:32 +01:00
fooify	fe658b30a1	Grammatical errors hath been fixed!	2015-12-19 15:03:42 -08:00
Sarah	f1188529f2	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-12-19 13:09:26 +01:00
Sarah	c56cd0d56e	adjusting some timings	2015-12-19 13:08:53 +01:00
Sarah	35966d88cf	Fixing Tutorial Minion	2015-12-19 13:05:39 +01:00
Sarah	7327d9463f	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-12-19 13:00:49 +01:00
Sarah	8a54388480	fixing last commit	2015-12-19 13:00:12 +01:00
Sarah	32a0dd6668	adding Tutorial notification	2015-12-19 12:59:37 +01:00
Sarah	152e759c10	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-12-19 12:56:05 +01:00
Sarah	7cb002ca86	Adding Tutorial notification	2015-12-19 12:55:28 +01:00
Sarah	f8bffc9f88	nuke delay and Stats	2015-12-19 12:45:06 +01:00
Virizion	c0ab31fdac	Finished up fixes.	2015-12-19 00:19:50 -05: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
AlexTheCoder	09528a9262	- Initial broadcast stuff	2015-12-18 21:33:40 -05:00
Virizion	a5c18f4677	Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder	2015-12-18 20:05:03 -05:00
Sarah	b3afa0094e	Fixing some nuke stuff, Giant noises only for own Team and "Giant under attack message", spelling fixes	2015-12-19 00:59:15 +01:00
Sarah	dab2416ccd	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-12-19 00:49:16 +01:00
Sarah	6c5e3d7509	Fixing visibility.	2015-12-19 00:48:42 +01: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
Keir	a72125b1dc	Implement new error thingy.	2015-12-18 18:11:25 +00:00
William Burns	0e0a22ab15	Error page	2015-12-18 17:56:22 +00:00
Keir	0b4568e785	Commit progress.	2015-12-18 17:41:03 +00:00
Keir	77595c8fbc	Allow search form to be loaded when no identifier is supplied (error messages are a bit crappy atm I'm aware).	2015-12-18 16:20:57 +00:00
Keir	bd887e1eef	Make search box functional.	2015-12-18 15:52:20 +00:00
William Burns	f57304764c	Added a hotbar layout editor	2015-12-18 15:16:00 +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	d561915fd3	FORMATTING CHANG EI'M GOING TO CRY UGH	2015-12-17 23:16:57 -05:00
Mysticate	2bf734a15c	DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D	2015-12-17 23:08:07 -05:00
Shaun Bennett	2c09fd969b	Attempt at fixing spectator page	2015-12-17 22:24:44 -05:00
Virizion	806b656dcf	Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder	2015-12-17 21:56:01 -05:00
Shaun Bennett	53f9a051c5	Fix spectator page sorting team list	2015-12-17 21:52:34 -05:00
Virizion	7621fe793d	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-17 21:50:32 -05:00
Virizion	5f506e3810	Moved team generation.	2015-12-17 21:49:15 -05:00
Mysticate	066d0a861f	Merge remote-tracking branch 'origin/master' into update-paintball	2015-12-17 21:00:15 -05:00
NewGarbo	4bf7e15055	player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.	2015-12-18 01:05:02 +00: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	e7243d4b9c	Re-add getArcadePlayer(Player player)	2015-12-17 22:19:45 +00: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
Keir	2e02b9c8ea	Hide WIP rank label. Fix spelling issue.	2015-12-17 17:43:36 +00:00
William Burns	7d9b97180d	Testing ArcadePlayer implementation	2015-12-17 01:48:55 +00:00
Mysticate	d28c2be1c3	Epic chnage that saved the day omg	2015-12-16 20:26:04 -05:00
NewGarbo	b4c3ce9fba	a couple more prettificatons to pvp timer messages.	2015-12-16 23:19:04 +00:00
NewGarbo	eb9ba92fb1	one more quick message change/fix	2015-12-16 22:53:24 +00:00
NewGarbo	2ee1ccbcf9	qa changes to pvp safety	2015-12-16 22:48:55 +00:00
William Burns	ee202bc7f5	Add MineplexPlayer -> ArcadePlayer	2015-12-16 22:32:34 +00:00
William Burns	4077aa808f	Add to Arcade and Hub	2015-12-16 22:01:51 +00:00
William Burns	370c59ce75	Added custom data	2015-12-16 21:52:41 +00:00
NewGarbo	d619a9644b	few changes to pvp timer, and fixed bugs etc	2015-12-16 18:25:30 +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	ad9620bb3d	Fix formatting.	2015-12-16 16:02:45 +00:00
Keir	3ecb4c7fb8	Report handlers are now parsed and displayed correctly.	2015-12-16 16:01:19 +00: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
Keir	9c7c6fdb37	Don't treat these ints as strings (quicker comparison).	2015-12-16 13:58:05 +00:00
Keir	56d606adf0	Constants cannot hold arrays.	2015-12-16 13:38:48 +00:00
Virizion	628ee8a137	Some small fixes.	2015-12-16 00:02:21 -05: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
Mysticate	4566577c68	Die player cache	2015-12-15 19:26:09 -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
William Burns	958399be59	Merge branch 'feature/report' of ssh://184.154.0.242:25565/min/mineplex into feature/report	2015-12-15 22:17:15 +00:00
William Burns	bc88a35cea	Add my first design!	2015-12-15 22:17:05 +00:00
Keir	398fcfdcba	Update php code to parse new report data. Main class is now view.php.	2015-12-15 22:13:23 +00:00
Keir	5528c7c885	Push iml file.	2015-12-15 21:55:42 +00:00
Keir	1042032836	Update the web side to handle to handle the new changes.	2015-12-15 21:36:54 +00: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
NewGarbo	7ac1fd86b4	made pvp timer players immune to skills	2015-12-15 21:12:49 +00:00
NewGarbo	baef84f4d9	fixed pvp timer subtitles bugged out	2015-12-15 20:09:54 +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	92b82d786b	Don't give Winter Holiday Chests to offline players	2015-12-15 13:34:47 -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
Sarah	40ae7743c6	reverting last "fix"	2015-12-15 14:20:21 +01:00
NewGarbo	6a346790f7	disable tutorial	2015-12-15 12:00:56 +00:00
NewGarbo	1da04b84b5	test push (change version to 0.17d)	2015-12-15 11:57:33 +00: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
AlexTheCoder	6c1c40a972	- Fixed command bugs	2015-12-15 02:25:16 -05:00
AlexTheCoder	02f6a14f07	- Game commands	2015-12-15 02:06:59 -05:00
Sarah	cf58fdee4a	trying to fix the spigot Chat spam thingy.	2015-12-15 05:29:59 +01:00
Cheese	871c97f7af	changed chest %'s	2015-12-15 09:25:44 +11:00
Sarah	afa45c47ca	Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into pregametutorial	2015-12-14 14:23:42 +01: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
AlexTheCoder	ee63332062	- Moved setting changes	2015-12-14 06:39:35 -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	52394c89dd	fixed skins beign wrong way around	2015-12-14 21:34:27 +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	6ec8ec4c01	Merge pull request #97 in MIN/mineplex from william-gladiators to master * commit 'd91e4ab4f756746b31c7ebdd3e7d33c139ea7d30': Another door bug, and a title fix. Health looks nicer. Bug fixes. Title shortened.	2015-12-14 03:45:55 -06: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	93c13d138d	Remove some debug stuff I forgot to remove.	2015-12-14 00:10:45 -05: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
Virizion	d8f44434ff	Fixed a bunch of bugs. Still need to fix clicking compass ending game.	2015-12-14 00:00:40 -05:00
Shaun Bennett	e8b0e5dd8e	Fix IntellIJ Files	2015-12-13 23:51:47 -05:00
Shaun Bennett	8e31c79c58	Merge remote-tracking branch 'origin/master'	2015-12-13 23:46:46 -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
Cheese	f26c31b7ec	xmas a little harder	2015-12-14 15:33:09 +11: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
Cheese	94169a5b8a	it made me push it :(	2015-12-14 15:29:34 +11:00
Cheese	c34ac3ec52	xmas	2015-12-14 15:21:43 +11:00
Jonathan Williams	dcf3c1ea88	Deleted and added new Cache since renaming was jacked up.	2015-12-13 23:14:17 -05:00
Mysticate	42244ae798	Snowman AI fix	2015-12-13 22:43:11 -05:00
Mysticate	a04eaddc42	Fixed bump	2015-12-13 22:25:18 -05:00
libraryaddict	f90484c37f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-12-14 15:43:03 +13:00
libraryaddict	b5bdf7ced4	Remove custom name on players on join and arcade spectator	2015-12-14 15:42:32 +13:00
Virizion	54911bb213	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-13 19:54:57 -05:00
Virizion	12eba41975	Fixed corner stairs.	2015-12-13 19:52:32 -05:00
Mysticate	0dd7db27cd	FIXED FORAMTTING	2015-12-13 19:49:41 -05:00
Mysticate	a827f95eb4	Fixed scoreboard. VIVA LA FIESTA	2015-12-13 19:24:24 -05:00
Mysticate	0e9e8c155f	Quick fix that I don't think i caused.	2015-12-13 19:11:06 -05:00
Mysticate	0c383f8bf4	Remove bad message	2015-12-13 18:58:03 -05: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
Shaun Bennett	6c2b40d63a	Cannon work	2015-12-13 15:40:32 -05:00
William Burns	d91e4ab4f7	Another door bug, and a title fix.	2015-12-13 20:27:37 +00:00
Keir	50753e30e6	Clicking a users name copies it to the users clipboard and also displays an alert to the user that this has happened.	2015-12-13 19:12:32 +00:00
Shaun Bennett	677e95a7fd	Update IntellIJ grouping	2015-12-13 14:05:28 -05:00
Sarah	63f5794c79	Only fix Giant facings is prepare Phase	2015-12-13 14:31:21 +01:00
William Burns	e31124e212	Health looks nicer.	2015-12-13 13:29:46 +00:00
William Burns	4fad564e15	Bug fixes. Title shortened.	2015-12-13 12:50:06 +00:00
Cheese	b095fa9efe	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-13 21:15:32 +11:00
Cheese	011a194dc6	fixed exploit	2015-12-13 21:14:57 +11:00
Virizion	8bcc36adb1	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-13 01:39:42 -05:00
Virizion	ec86cad7ee	Changed descriptions.	2015-12-13 01:38:38 -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
Sarah	a92361f2fe	some more descriptions for Tutorials	2015-12-12 20:03:35 +01:00
AlexTheCoder	cf05cf5d7b	- All finished - Added method for disabling explosion manager miniplugin	2015-12-12 05:12:17 -05:00
AlexTheCoder	1535e167cd	- Inventory enum fix	2015-12-12 02:36:01 -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	2a45018fcd	array thing	2015-12-11 23:41:46 -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	402530d671	Merge pull request #94 in MIN/mineplex from william-gladiators to master * commit '0d4bd91b573ca251d15471b6454452bd4ebca195': lag detection thing Scoreboard change and breaking blocks. Couple of fixes	2015-12-11 18:57:52 -06: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
William Burns	0d4bd91b57	lag detection thing	2015-12-11 22:47:07 +00:00
Sarah	09e5aed6e7	Adding some descriptions.	2015-12-11 22:06:23 +01: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
William Burns	6456d7bd66	Scoreboard change and breaking blocks.	2015-12-11 16:55:15 +00:00
William Burns	1dcbf5f7fd	Couple of fixes	2015-12-11 16:34:04 +00:00
xGamingDudex	ba087d119a	Small tweaks	2015-12-11 17:31:05 +01:00
Keir	a1f1667647	Fix "Player.php" filename case.	2015-12-11 12:28:38 +00:00
Keir	4b122b16ae	Fix formatting. Fix "Player.php" filename case.	2015-12-11 12:28:12 +00: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
William Burns	523c1875ef	fix	2015-12-11 06:58:11 +00: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
Cheese	66011cde8c	fixed player count	2015-12-11 17:25:23 +11: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
AlexTheCoder	42065fc5dc	- Fixed duplicate code	2015-12-10 23:22:08 -05: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
libraryaddict	9a4006df27	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-12-11 17:18:07 +13: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
libraryaddict	c5f0624bf7	Add build file	2015-12-11 17:17:52 +13: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
libraryaddict	3cd187ff04	Move LineFormat.java	2015-12-11 16:57:21 +13:00
Shaun Bennett	bc46518a05	Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics	2015-12-10 22:54:53 -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
libraryaddict	4cfa7c436b	Add missing file	2015-12-11 16:48:40 +13:00
Virizion	14b5a9453a	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-10 22:18:00 -05:00
Virizion	68360c6705	shortened if	2015-12-10 22:17:10 -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
William Burns	1607345f04	title + debug	2015-12-11 02:41:44 +00:00
Shaun Bennett	557f3e97a5	Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics	2015-12-10 21:32:35 -05: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
William Burns	563a0f0ec7	remove tutorial and no flicker	2015-12-11 02:30:44 +00:00
libraryaddict	a0b7870acc	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-12-11 15:21:18 +13:00
libraryaddict	1661c056c1	Added line stuff	2015-12-11 15:21:05 +13: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	f8d7aeb5ea	before revert	2015-12-11 01:32:32 +00:00
William Burns	dda5ac6728	work	2015-12-11 01:20:36 +00:00
Sarah	4abad9e1c4	fixing chat and test commands.	2015-12-11 02:00:26 +01:00
Sarah	ffb75a7832	Adding CustomEnding	2015-12-11 01:44:19 +01: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	5d96ceb41e	Let owner+ disguise as staff - easy way to check a player's rank	2015-12-10 19:20:11 -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	5b0909012d	Renamed GadgetActivateEvent to GadgetEnable event Some files didn't make it to prev commit	2015-12-11 01:07:47 +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	ab16bf89e5	Merge remote-tracking branch 'origin/master'	2015-12-10 17:04:25 -05:00
Shaun Bennett	851b613d2e	Now playing fix	2015-12-10 17:04:15 -05:00
William Burns	4cf33eef05	Tutorial changes!	2015-12-10 21:32:14 +00:00
William Burns	624e8bbe89	Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators	2015-12-10 20:56:03 +00:00
William Burns	0bd276c16a	Merge branch 'pregametutorial' of ssh://184.154.0.242:25565/min/mineplex into pregametutorial	2015-12-10 20:53:01 +00:00
William Burns	8d7b03e3f6	Added the ability to have title AND subtitle per TutorialText.	2015-12-10 20:52:41 +00:00
William Burns	2951088005	Tutorial changes/additions.	2015-12-10 20:48:13 +00:00
Virizion	c73bd54aec	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-10 15:38:17 -05:00
William Burns	3586642414	Added back the tutorial.	2015-12-10 19:32:25 +00:00
William Burns	af7c058f22	Lots of bug fixes / additions since the testing 12/9/15.	2015-12-10 19:06:07 +00: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
libraryaddict	1ee1e7a04b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-12-10 20:02:39 +13:00
libraryaddict	eaf3937004	Fix the damage while walking on falling block	2015-12-10 20:02:12 +13:00
Virizion	0e9d401717	Restore block when break is cancelled because it can be in the air phase and not get restored.	2015-12-09 22:32:39 -05:00
Virizion	9b53e15b4f	More stuff.	2015-12-09 21:38:00 -05:00
Virizion	662d3b464f	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-09 21:15:39 -05:00
Virizion	0ff87cf134	Stuff.	2015-12-09 21:14:45 -05:00
Cheese	fabf3dab59	updated blocksearch	2015-12-10 13:12:01 +11: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
Virizion	be6f9ac6dc	Capitalize enum names.	2015-12-09 19:17:12 -05:00
William Burns	87a834c01b	FIX	2015-12-10 00:03:57 +00:00
William Burns	90896073d4	debug	2015-12-10 00:03:17 +00:00
William Burns	cea2716851	fight man	2015-12-09 23:59:20 +00:00
William Burns	05bd55f720	iter	2015-12-09 23:53:04 +00:00
William Burns	b8a2304edd	work	2015-12-09 23:39:00 +00:00
William Burns	3ad0a3db6e	fix	2015-12-09 23:14:08 +00:00
William Burns	17c989d941	Less per-player arena stuff	2015-12-09 22:39:04 +00:00
William Burns	513db5dd8d	doing byes	2015-12-09 21:33:31 +00:00
William Burns	852be97bae	Work	2015-12-09 20:16:16 +00:00
Keir	7749401e62	Show UUID when clicking on a username (temporary).	2015-12-09 20:05:24 +00: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
Sarah	a5c46545df	fixing timer being shown.	2015-12-09 14:44:22 +01:00
NewGarbo	667f076202	fixed unsafe timer	2015-12-09 10:46:05 +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	c021fbf9ed	Bounce baby bounce.	2015-12-08 23:27:38 +00:00
William Burns	d709071feb	Much fix, many wow.	2015-12-08 23:20:42 +00:00
Shaun Bennett	2e49611035	LinkedHashMaps, Buttons	2015-12-08 17:45:27 -05:00
Shaun Bennett	7f75749194	Merge remote-tracking branch 'origin/master'	2015-12-08 16:55:14 -05:00
Cheese	26c5c419f8	fixed a bug where old displayName would be used after name was updated.	2015-12-09 08:38:05 +11: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
William Burns	a83ede3caa	Handling slow movers	2015-12-08 21:14:19 +00:00
William Burns	7bdbd5a6af	Woo almost done!	2015-12-08 21:10:27 +00:00
Cheese	2decc049c5	fixed my muddling of perks	2015-12-09 07:47:07 +11:00
Cheese	09d8367b4b	fixed method	2015-12-09 07:32:36 +11:00
Christopher Jozsa	0b8e0409b6	Merge pull request #92 in MIN/mineplex from update-SSM to master * commit '504a49278cb7e140029e4c2ceb85f3defe524a33': SSM kit description change, grammar mistake SSM Pig bomb bug fix	2015-12-08 14:29:32 -06:00
Shaun Bennett	ca71f1f64f	Merge remote-tracking branch 'origin/master'	2015-12-08 14:32:17 -05:00
Keir	9ce7b25482	Prevent escaping in id string.	2015-12-08 18:37:05 +00:00
William Burns	d598f83ec0	More progress	2015-12-08 18:17:43 +00:00
Teddy	504a49278c	SSM kit description change, grammar mistake	2015-12-08 16:35:49 +00:00
Teddy	2bf1012fa4	SSM Pig bomb bug fix	2015-12-08 16:34:07 +00: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
William Burns	4e2a422f27	Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java	2015-12-08 13:13:18 +00:00
William Burns	2b12016e14	Progress	2015-12-08 13:12:30 +00:00
Shaun Bennett	addb2c8c0e	Fix java 8 compiler issue	2015-12-08 08:02:40 -05:00
William Burns	cdc602a435	Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators	2015-12-08 10:55:57 +00:00
Shaun Bennett	89e8a7a2b5	Merge pull request #91 in MIN/mineplex from clans-beta to master * commit 'b22c64ca6a5419e6b23abea1681cc750d15b6d37': Fix excludes	2015-12-08 04:51:58 -06:00
Shaun Bennett	b22c64ca6a	Fix excludes	2015-12-08 05:51:21 -05:00
Shaun Bennett	ffbf76a125	Merge pull request #90 in MIN/mineplex from clans-beta to master * commit 'a84f580719d1b221bbcaa49cd19d4251defa3b11': Update IntelliJ to Java 8	2015-12-08 04:46:47 -06:00
Shaun Bennett	a84f580719	Update IntelliJ to Java 8	2015-12-08 05:45:26 -05:00
William Burns	99cf7ea22c	Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators	2015-12-08 10:44:43 +00:00
William Burns	e6d995008e	Arenas	2015-12-08 10:44:24 +00:00
Keir	c22a206a0e	Added some documentation (mainly declaring variable types).	2015-12-08 10:38:44 +00:00
Virizion	48a5776fb7	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-07 23:30:30 -05:00
Virizion	d22a905206	Lot more stuff! :D	2015-12-07 23:29:33 -05:00
Cheese	fe1f763374	changed order blocks will be added to the list	2015-12-08 15:26:32 +11: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
Virizion	f837fd14db	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-07 18:45:42 -05: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
Cheese	719297ebb1	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-08 10:31:25 +11:00
Cheese	4ba2e8c96c	fixed old staff being stuck invis. partially changed scoreboard to show playercount	2015-12-08 10:31:11 +11:00
Shaun Bennett	42a0354c9e	Now Playing, Preference to disable ads	2015-12-07 18:28:05 -05:00
William Burns	43192317ad	Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators	2015-12-07 23:20:21 +00: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
Sarah	0619fb857f	fixing invisibility.	2015-12-07 23:44:02 +01: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	eed6966a5b	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-12-07 13:21:17 -05: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
Sarah	3f7eef35d5	Forcefield range.	2015-12-07 18:59:06 +01:00
Sarah	dfb1837e81	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-07 18:54:19 +01: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
Keir	eed944597c	Commit PHP code.	2015-12-07 17:05:58 +00:00
Shaun Bennett	7984c0ac31	Add !	2015-12-07 06:12:49 -05:00
Cheese	a39b11ce67	slowed meteors	2015-12-07 21:56:00 +11:00
Cheese	1fe6b5489a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-07 21:53:49 +11:00
Cheese	d318a5cf87	interacto!	2015-12-07 21:53:34 +11: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	6e67f34db1	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-07 20:39:46 +11:00
Cheese	e1efcabfbf	chat sale msgs	2015-12-07 20:39:31 +11:00
Shaun Bennett	3cdf8c4b08	Merge remote-tracking branch 'origin/master'	2015-12-07 04:23:33 -05:00
Shaun Bennett	2afbe23a7c	Load songs from update folder	2015-12-07 04:23:26 -05:00
Cheese	7b11baf24b	Christmas sale bossbars	2015-12-07 20:20:49 +11:00
Cheese	8c4615203c	sale message	2015-12-07 20:07:20 +11:00
Cheese	ed3bea8e85	DONE!	2015-12-07 18:36:05 +11:00
Cheese	5c632a1e3a	sharper target	2015-12-07 18:20:12 +11:00
Cheese	1a0d90a495	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-07 18:06:43 +11:00
Cheese	fea637db80	fixed some freeze	2015-12-07 18:06:26 +11:00
Shaun Bennett	ecde1dd314	Merge remote-tracking branch 'origin/master'	2015-12-07 02:06:09 -05:00
Shaun Bennett	44a5bcb793	remove titan chest message, update pumkin message, holiday MB/DMT words	2015-12-07 02:06:00 -05:00
Cheese	d75d7a2c8f	snowfight finish	2015-12-07 17:56:35 +11:00
Cheese	1e441ac017	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-07 17:37:04 +11:00
Cheese	1ada06af91	rewrote lots!	2015-12-07 17:36:45 +11:00
Shaun Bennett	7b5db2d4fb	Hub Music, HubMusic Preference	2015-12-07 00:58:44 -05:00
Virizion	6904f7c9a9	Tons more stuff on the checklist.	2015-12-06 22:54:45 -05:00
Cheese	5486d8acf6	more prep	2015-12-07 13:42:59 +11:00
Cheese	97fe633e4c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-07 13:25:48 +11:00
Cheese	54ec0e39bb	more polisshhhh on snowfight enabled xmas chests	2015-12-07 13:25:32 +11:00
Shaun Bennett	488895ea53	Note block player	2015-12-06 21:12:10 -05:00
Cheese	cbafb2ba91	fixes	2015-12-07 13:04:45 +11:00
Cheese	0c397d6a81	simplified kits and intro	2015-12-07 13:02:26 +11: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
Cheese	b2a595b01b	snwo fight changes	2015-12-07 12:02:53 +11:00
Mysticate	09f7a03444	Quick changes to improve things.	2015-12-06 20:00:22 -05:00
AlexTheCoder	118bde5484	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2015-12-06 19:57:27 -05:00
Sarah	072856be7d	teleportations.	2015-12-06 23:19:53 +01:00
Mysticate	b5967a1205	Uncommented bouncy balls	2015-12-06 17:14:51 -05:00
Mysticate	e74b83f8f2	Merge remote-tracking branch 'origin/master' into update-paintball	2015-12-06 17:12:29 -05:00
Mysticate	5e57caa94d	Final tweaks to random armorstand	2015-12-06 17:09:33 -05:00
Cheese	6f16eeead7	missin files	2015-12-07 08:48:55 +11:00
Sarah	10d26ca32b	timer fixes.	2015-12-06 22:41:04 +01:00
Virizion	ca7e5d0d6d	remove later	2015-12-06 16:37:00 -05:00
Sarah	64f8ee7280	fixing some timings.	2015-12-06 21:48:21 +01:00
NewGarbo	425463d339	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-12-06 19:11:13 +00:00
NewGarbo	a9c7f088f3	made use ability teleport player back to where they should be	2015-12-06 19:10:18 +00:00
Keir	e21bd37b92	Add connection host for Jedis.	2015-12-06 19:05:20 +00:00
Sarah	3260550368	adding proper forcefield for minions and giants.	2015-12-06 19:38:23 +01: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
Mysticate	11b2748a5a	Quick thing before merge	2015-12-06 11:45:10 -05:00
Cheese	fa6418769b	YT name change	2015-12-06 21:26:02 +11: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
Cheese	9c7eea86b4	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-06 14:56:18 +11:00
Shaun Bennett	32a6d572ee	Disable gadgets in arcade for player count > 40	2015-12-05 22:56:15 -05:00
Cheese	5aabd00972	set hub to christmas removed snowball pickup disabled arrows sticking into players from ALL projectiles	2015-12-06 14:55:28 +11:00
Shaun Bennett	11e1e53a36	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-12-05 21:36:19 -05:00
Shaun Bennett	d5a9a92913	Forgot to push these changes last update!	2015-12-05 21:36:07 -05:00
libraryaddict	b98944b0a0	Handle attach entity	2015-12-06 14:38:00 +13:00
Virizion	9144ab7b3f	Fixed some demolition stuff.	2015-12-05 20:30:21 -05:00
Virizion	5b49c4adc3	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-05 19:58:55 -05:00
Virizion	d3ce0d6434	Some more stuff on the checklist.	2015-12-05 19:57:48 -05:00
Sarah	114ae33d89	fixing spawns and monster slowdown.	2015-12-06 00:00:50 +01:00
libraryaddict	d5606f55ea	Modified CustomTagFix to support player name titles	2015-12-06 10:18:35 +13:00
Sarah	90c6d0a83f	spelling fixes, disabling Particles, fixing mob limit.	2015-12-05 22:17:45 +01:00
Sarah	4c4b997453	fixing giant facing.	2015-12-05 19:00:44 +01:00
Virizion	62c49fa8e6	some more stuff on the checklist	2015-12-04 23:04:52 -05: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
Sarah	a3d6af884d	spawns after tutorial and Giants facing each other.	2015-12-05 00:57:27 +01: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
Sarah	35534afd4a	overall runtime.	2015-12-04 19:54:02 +01:00
Sarah	1bb40b21d3	Tutorial/Phase Time.	2015-12-04 19:49:28 +01:00
NewGarbo	5d59b1a015	fixed tnt blowing up in claims when offline	2015-12-04 18:32:46 +00:00
NewGarbo	bca65116ab	fixed task not getting cleanup up after /skiptutorial	2015-12-04 18:23:23 +00:00
Shaun Bennett	f57f4ed0aa	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-12-04 12:10:10 -05:00
NewGarbo	e158704534	fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping	2015-12-04 15:58:51 +00:00
Shaun Bennett	bb382a969c	Fix heavy attribute, disable claim visualizer	2015-12-04 08:02:38 -05:00
NewGarbo	3b125dc8a5	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java	2015-12-04 11:12:19 +00:00
Shaun Bennett	2435ebba13	Disable subtasks for now	2015-12-04 05:16:14 -05:00
Shaun Bennett	5c575b41fc	Clans alpha 0.17	2015-12-04 05:15:28 -05:00
Virizion	efbabb1519	Players now look at the middle of the middle block instead of the corner.	2015-12-03 21:27:10 -05:00
Cheese	e01d30b920	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-04 13:19:07 +11:00
Cheese	ef2511434d	tuber arnk	2015-12-04 13:18:23 +11:00
Virizion	465f8c28f6	Set FixSpawnFacing to false so that out looking at the middle feature would work.	2015-12-03 21:13:33 -05:00
Virizion	bb708911d6	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-03 21:10:31 -05:00
Christopher Jozsa	fc68ce9b78	Merge pull request #87 in MIN/mineplex from virizion_utils to master * commit '9951701ded301c47bcc203c12001ef866204b78c': Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it.	2015-12-03 19:05:15 -06:00
Virizion	9951701ded	Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it.	2015-12-03 19:51:11 -05:00
fooify	b1bd2ff5ac	Gravity's icon changed to ENDER_PORTAL_FRAME	2015-12-03 16:50:27 -08:00
fooify	91aaf5f2fb	world's smallest bugfix - admin->co-host	2015-12-03 16:45:30 -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
NewGarbo	39daf969fd	clan claim visualizer	2015-12-03 22:29:36 +00:00
Sarah	19254fc4a0	Prepare Timer flag.	2015-12-03 18:06:27 +01:00
NewGarbo	584a02ae3e	fixed infinite claims	2015-12-03 10:30:06 +00:00
Virizion	ee51766e1f	Removed teleports. Made the spawns face the middle but it doesn't work yet because of GameTeam changing the direction again.	2015-12-02 22:12:53 -05:00
Virizion	f0c28e6234	Updated references to the util method.	2015-12-02 20:20:14 -05:00
Virizion	cab5c2a76d	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-02 20:12:41 -05:00
Christopher Jozsa	fc0cae8e0f	Merge pull request #85 in MIN/mineplex from virizion_utils to master * commit 'bf92af647abceb78596f9fd1922d3522e61ff053': Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames).	2015-12-02 18:53:30 -06:00
Sarah	27f335779a	adding tutorial sounds and flag for it.	2015-12-02 19:39:44 +01:00
NewGarbo	e9fd661311	disabled koth	2015-12-02 18:25:53 +00:00
NewGarbo	8fea5afdce	fixed message on tick (might be cause of laggg)	2015-12-02 06:56:58 +00:00
NewGarbo	92c1abf221	a few last touches	2015-12-02 06:04:53 +00:00
NewGarbo	8db5ffe5c7	forcejoin command for ADMIN+ and fixed auto tree replanting.	2015-12-02 05:54:00 +00:00
NewGarbo	3a4e453ac3	made it so that you can only use /reset in safe zones	2015-12-02 05:18:04 +00:00
NewGarbo	d6ca52e4a4	modifications	2015-12-02 05:11:09 +00:00
Virizion	bf92af647a	Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames).	2015-12-02 00:00:32 -05:00
fooify	b04f139883	Fixed advertisement being able to be bypassed by spec and instant join	2015-12-01 19:26:52 -08: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
NewGarbo	b8e2086928	changes to tutorial	2015-12-02 00:19:48 +00:00
NewGarbo	ba27d94158	fixed skiptutorial message not displaying	2015-12-01 23:23:11 +00:00
NewGarbo	cffb6bd62f	bunch o' changes	2015-12-01 23:01:41 +00:00
Keir	9508556d57	Refactor.	2015-12-01 22:47:51 +00:00
NewGarbo	a7d6026c07	made skip tutorial messages be seen whilst in tutorial	2015-12-01 22:33:47 +00:00
NewGarbo	69cb395f5a	made entire clan know about disband	2015-12-01 22:30:05 +00:00
NewGarbo	35ae89ab1f	fixed players from being able to eat their carrot in the making money task	2015-12-01 19:37:53 +00:00
NewGarbo	ea099d7a82	fixed some annoying bugs and fixed certain messages not showing in tutorial	2015-12-01 18:41:33 +00:00
Sarah	b0e16f6612	Zombie smash Color.	2015-12-01 17:05:55 +01:00
Sarah	d335e58652	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/gametutorial/TutorialPhase.java	2015-12-01 17:01:44 +01:00
NewGarbo	fbf9c8eb0c	made certain messages visible in tutorial that are actually required to be seen	2015-12-01 13:37:34 +00:00
NewGarbo	f536bf23e5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-12-01 12:06:25 +00:00
NewGarbo	d32e6fdb96	Got rid of deployed tasks. using different system now. (untested)	2015-12-01 11:28:14 +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
fooify	48ae23ebff	changed reference to premium ranks	2015-11-30 19:58:41 -08:00
fooify	06ef964000	removed important debug thing	2015-11-30 19:33:03 -08:00
fooify	ed96c8e3b3	fixed ssm enderman always facing south on teleport	2015-11-30 19:27:34 -08:00
Virizion	1ad534366e	Switch item dropping to the new util method.	2015-11-30 22:09:15 -05:00
Cheese	208eaf3a01	cosmetics recharge slowdown	2015-12-01 11:38:52 +11:00
Virizion	d24135771f	Fixed formatting by adding bodies to all for loops.	2015-11-30 19:10:59 -05:00
Virizion	ae8a10d55d	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-11-30 18:50:21 -05: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
Cheese	1a1fa684e4	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-01 10:44:39 +11:00
Cheese	7217cd0f33	remove conditions upon death	2015-12-01 10:44:13 +11:00
Virizion	9d380a0b31	Merge remote-tracking branch 'remotes/origin/master' into virizion_utils	2015-11-30 17:47:08 -05:00
Virizion	666b9963e4	Added an utility method in UtilBlock to get an ItemStack from a block and also handles correcting Material types and Data Values.	2015-11-30 17:42:48 -05:00
NewGarbo	18504e48f7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-30 21:00:42 +00:00
NewGarbo	1a851679c4	made it so players cannot see chat whilst in tutorial	2015-11-30 20:40:30 +00:00
Jonathan Williams	482ec8a120	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-30 14:26:37 -06:00
Jonathan Williams	513810caaa	Fixed memory leak in MarkedForDeath	2015-11-30 14:26:25 -06:00
NewGarbo	6eb44ed87b	whoops.. this isn't php hehe	2015-11-30 19:11:18 +00:00
NewGarbo	813e7ee789	made it so that no messages are shown when in tutorial	2015-11-30 19:08:16 +00:00
Keir	0bbb705654	Small method & class renames, document methods.	2015-11-30 16:35:07 +00:00
Sarah	e2cfcef55b	RunTasksSync Flag.	2015-11-30 16:58:41 +01:00
NewGarbo	0862cfce72	fixed doors getting placed in spawn and shops	2015-11-30 07:26:02 +00:00
NewGarbo	261d6dd030	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-30 07:08:34 +00:00
NewGarbo	f528531b82	removed some testing stuff	2015-11-30 07:06:36 +00:00
Keir	4aa84b9180	Store chat messages from the last 30 minutes.	2015-11-30 02:03:26 +00:00
Shaun Bennett	34c4bade06	Merge remote-tracking branch 'origin/master'	2015-11-29 19:30:51 -05:00
Cheese	02bc7ffab6	map changes	2015-11-30 11:17:23 +11:00
Shaun Bennett	981eead816	Merge remote-tracking branch 'origin/master'	2015-11-29 19:05:56 -05:00
Cheese	0f79b5814f	more color f ixes	2015-11-30 10:52:44 +11:00
Shaun Bennett	25bb913c4f	Merge remote-tracking branch 'origin/master'	2015-11-29 18:41:35 -05:00
Cheese	2ac21b1434	better colors	2015-11-30 10:40:57 +11:00
Shaun Bennett	4a9d53de50	Merge remote-tracking branch 'origin/master'	2015-11-29 18:33:43 -05:00
Cheese	18b603ec2f	map color changes	2015-11-30 10:33:08 +11:00
Shaun Bennett	f7f7d5fdef	Merge remote-tracking branch 'origin/master'	2015-11-29 18:26:40 -05:00
Cheese	e27808a011	map!	2015-11-30 10:26:07 +11:00
Shaun Bennett	125d9988c2	Merge remote-tracking branch 'origin/master'	2015-11-29 18:21:02 -05:00
Cheese	cd6ecc1e67	pt!	2015-11-30 10:20:27 +11:00
Shaun Bennett	06706da4cf	Merge remote-tracking branch 'origin/master'	2015-11-29 18:16:13 -05:00
Cheese	a886088f48	more changes	2015-11-30 10:15:50 +11:00
Shaun Bennett	2b22639d8a	Merge remote-tracking branch 'origin/master'	2015-11-29 18:03:46 -05:00
Cheese	af77a2ddeb	fix	2015-11-30 10:03:27 +11:00
Shaun Bennett	1c71efbff7	Merge remote-tracking branch 'origin/master'	2015-11-29 17:59:39 -05:00
Shaun Bennett	58d7e8562b	update clans version for next release	2015-11-29 17:58:29 -05:00
Cheese	af61b62a47	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-30 09:58:06 +11:00
Cheese	7e3cab9c87	map test	2015-11-30 09:57:47 +11:00
NewGarbo	8026ad891d	fixed king of the hill	2015-11-29 21:09:18 +00:00
Sarah	dc68375ec8	TimeBetweenPhase Flag.	2015-11-29 21:48:39 +01:00
NewGarbo	be727e6e26	fixed deployed tasks not being deregistered as Listeners after being adding to Cull	2015-11-29 19:46:08 +00:00
Virizion	e7960d65e0	Moved classes into separate packages so it is more organized.	2015-11-29 14:36:51 -05:00
Virizion	840b784239	Removed some redundant calls and replaced them with a call to one method.	2015-11-29 13:42:30 -05: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
Virizion	c6f1d29496	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-11-29 13:09:31 -05:00
xGamingDudex	2c2370f8a0	Added method to edit NoAI field on entities.	2015-11-29 19:08:26 +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
Jonathan Williams	7bdf5451d4	Upped map scan performance.	2015-11-29 02:49:12 -06:00
Jonathan Williams	1d1a1d96f8	Fixed onAbilityUsed bug with _player (presumably because it was added to cull and _player was set to null right before SkillTriggerEvent happened.)	2015-11-29 02:39:37 -06:00
Jonathan Williams	5b04a3223d	Fixed bug with Posion effect NPE (Something in champs is adding a null source). Fixed bug with Tutorial cleanup.	2015-11-29 02:29:47 -06:00
Jonathan Williams	782026556e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-29 02:24:32 -06:00
Jonathan Williams	e9da258333	Lowered scan rate significantly for ItemMapManager.	2015-11-29 02:24:17 -06:00
Shaun Bennett	f82396d485	Clans changes/fixes	2015-11-29 02:41:53 -05:00
Virizion	e09e5851a6	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-11-29 01:17:17 -05:00
Jonathan Williams	0d5fa70632	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-28 23:05:32 -06:00
Jonathan Williams	5acf6b19a4	Fixed bed checking interval. Added timing logging to map rendering.	2015-11-28 23:05:22 -06:00
Shaun Bennett	7c947ad97b	Merge master	2015-11-28 23:55:00 -05:00
Jonathan Williams	c6ff01b92d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-28 22:33:03 -06:00
Jonathan Williams	118af20f44	Updated EnjinTranslator.	2015-11-28 22:32:50 -06:00
NewGarbo	b88a842f1c	stuff	2015-11-29 03:22:52 +00:00
NewGarbo	c870d99e0e	teleport stuff	2015-11-29 02:55:45 +00:00
NewGarbo	a9afe1f068	added self clan create/delete messages	2015-11-29 02:54:40 +00:00
NewGarbo	84303234fd	fixed task 2	2015-11-29 02:48:03 +00:00
NewGarbo	392ab601c2	tutorial tasks reset	2015-11-29 02:43:12 +00:00
NewGarbo	d7658f3838	fixed stuck manager taking 0 seconds	2015-11-29 02:39:09 +00:00
NewGarbo	dc5aec33b4	tutorial ending message	2015-11-29 02:37:20 +00:00
NewGarbo	8dca384d35	force join command	2015-11-29 02:31:14 +00: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	e1be0b1dbd	dupe fix	2015-11-28 23:34:41 +00:00
Sarah	66fd85af1f	Adding Phase Event.	2015-11-28 23:32:09 +01:00
Virizion	278082caed	Finished the checklist. I might recode eliminations since I kind of don't like it right now.	2015-11-28 15:18:06 -05: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
NewGarbo	ace4548b1e	don't cull an entity if a player is nearby	2015-11-28 20:14:48 +00:00
NewGarbo	afbccba36f	added force join command for ADMIN+	2015-11-28 19:56:47 +00:00
NewGarbo	75ef42d8c9	fixed the clan claim box check	2015-11-28 19:37:03 +00:00
fooify	8cdae7ce1a	Merge remote-tracking branch 'origin/master' into foo	2015-11-28 09:33:47 -08:00
fooify	0dff0ffe1d	fixed bacon blast exloding blocks fixed sg compass pointing to teammates	2015-11-28 09:32:54 -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	46360a4b91	Updated CB	2015-11-29 02:56:53 +13:00
libraryaddict	28947643e0	More updates for dual version	2015-11-29 02:54:16 +13:00
NewGarbo	f5384a1382	staff mode	2015-11-28 09:31:18 +00:00
NewGarbo	d8ae035f84	creative scoreboard team. and fixed npe in tutorials	2015-11-28 09:20:42 +00: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
Jonathan Williams	b6f6d4458e	Fixed StaffServer.	2015-11-28 01:43:00 -06: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	bcbc5244c6	Add Clans.core to hub build (IntelliJ)	2015-11-27 23:14:54 -05: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
Sarah	ad54d28b0d	fixing teleportation issues.	2015-11-27 22:29:29 +01:00
NewGarbo	260002c9cf	final changes	2015-11-27 21:02:20 +00:00
NewGarbo	9e84029e04	fixes	2015-11-27 20:50:00 +00:00
NewGarbo	b36642b22b	remove trust command	2015-11-27 20:27:33 +00:00
NewGarbo	d5502500b6	fixes & changes	2015-11-27 20:24:07 +00:00
Sarah	fd0c5cf273	Adding some more flags.	2015-11-27 20:47:57 +01:00
NewGarbo	6ac871f04c	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-27 19:43:48 +00:00
NewGarbo	fe085c1571	loaaads of stuff	2015-11-27 19:42:15 +00:00
Sarah	e81aa72c7e	Merge branch 'rankdescriptions' of http://184.154.0.242:7990/scm/min/mineplex	2015-11-27 20:33:18 +01: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	f06ceab277	Adjustments	2015-11-27 09:33:31 -05:00
NewGarbo	0c463cf7cd	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-27 14:24:25 +00:00
NewGarbo	4d23b2a39f	fixed (I BELIEVE) chests not opening in own territory	2015-11-27 14:24:02 +00:00
Cheese	def46c715e	fixer	2015-11-28 00:52:54 +11:00
NewGarbo	627fbc7df2	add info into chat if a player is in creative	2015-11-27 13:50:18 +00:00
Cheese	b45eb53dff	remove old items	2015-11-28 00:43:01 +11:00
NewGarbo	ad0c161f16	set players time to day during tutorial	2015-11-27 13:28:37 +00:00
NewGarbo	3be2986cea	sethome command now places bed even if theres grass	2015-11-27 13:26:12 +00:00
NewGarbo	691105b2cb	force place bed on first claim	2015-11-27 13:23:37 +00:00
Cheese	fdb493d95d	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-28 00:23:32 +11:00
Cheese	ab3d2ba098	updated tutorials. added worldmanager to cull entities.	2015-11-28 00:23:18 +11:00
NewGarbo	4423baca96	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-27 13:15:46 +00:00
NewGarbo	f0669cb610	fixed undead camp item naming being italic	2015-11-27 13:15:26 +00:00
Cheese	67b9755f0d	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-27 22:27:33 +11:00
Cheese	53da9c97d0	item frame cancel!	2015-11-27 22:27:20 +11:00
Shaun Bennett	b996dc20ca	Enable tutorial, fix stuck command	2015-11-27 06:26:32 -05:00
Shaun Bennett	a5ebf9b059	Fixes for release	2015-11-27 05:53:57 -05:00
Cheese	ec0e2d2d64	fixed colors	2015-11-27 21:09:25 +11:00
Cheese	3e37a63aa8	fixed chome teleport height	2015-11-27 20:59:23 +11:00
Cheese	dda0e827e1	FGIXEXFSD	2015-11-27 20:46:33 +11:00
Cheese	9ce4440679	extra cmds	2015-11-27 20:36:00 +11:00
Cheese	6428d28275	travel hub bed fix	2015-11-27 20:31:19 +11:00
Cheese	797dcf8d8e	fxied song again T_T	2015-11-27 20:01:48 +11:00
Cheese	936e61de57	gui changes :)	2015-11-27 19:42:04 +11:00
Cheese	c501a42094	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-27 19:29:33 +11:00
Cheese	5d40a57df8	sound fix	2015-11-27 19:29:17 +11:00
Shaun Bennett	0b0710458f	Hub updates/try to fix chiss stuff	2015-11-27 03:22:17 -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	e25df8739d	EAST 2 WEST	2015-11-27 18:46:15 +11:00
Cheese	4085c998cd	MUSIC 4 LIFE	2015-11-27 18:44:33 +11:00
Shaun Bennett	408c2cf72a	im an idiot	2015-11-27 01:40:28 -05:00
Shaun Bennett	bdbb75e196	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-11-27 01:35:16 -05:00
Shaun Bennett	34368722a9	Fix gold manager again	2015-11-27 01:35:10 -05:00
NewGarbo	7efcf5426d	no hunger depletion in safe zones	2015-11-27 06:34:29 +00:00
NewGarbo	c96b0c529a	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-27 06:26:23 +00:00
NewGarbo	42d39a40e9	WIND	2015-11-27 06:25:58 +00:00
Shaun Bennett	94090c9434	adjust gold drops	2015-11-27 01:24:03 -05:00
Shaun Bennett	e211fe182d	Adjust gem conversion rate	2015-11-27 01:06:53 -05:00
NewGarbo	c33eea28a2	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-27 06:05:39 +00:00
NewGarbo	a9669ade31	Immolate fix hopefully	2015-11-27 06:05:22 +00:00
Shaun Bennett	0aeca96746	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-11-27 01:05:16 -05:00
Shaun Bennett	32c17cad7e	Shop price changes	2015-11-27 01:04:51 -05: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
NewGarbo	9082ace3f3	wind blade fall damage	2015-11-27 05:46:37 +00:00
NewGarbo	20a9ed5a6e	staff not being able to join fix	2015-11-27 05:13:47 +00:00
NewGarbo	f81d1d390a	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-27 05:04:46 +00:00
NewGarbo	b22c766c94	more clans modificatons	2015-11-27 05:04:24 +00:00
Cheese	05e7183b65	titan stuff update	2015-11-27 15:55:00 +11:00
Shaun Bennett	a46bed53fa	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-11-26 23:42:22 -05:00
Shaun Bennett	31f083387d	Use Castle icon on travel page	2015-11-26 23:42:16 -05:00
NewGarbo	174825776b	meow clams	2015-11-27 04:39:04 +00:00
NewGarbo	9dcc048953	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-27 04:23:14 +00:00
NewGarbo	6119500b68	changes	2015-11-27 04:23:02 +00:00
Shaun Bennett	faaa1fcf0b	Use castle clan icon for /c <clan>	2015-11-26 23:15:14 -05:00
Virizion	73c2f16d8b	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-11-26 23:11:12 -05:00
Virizion	3d74c9ca05	Fixed some bugs and finished some items on the checklist, too many to put down here.	2015-11-26 23:10:19 -05:00
NewGarbo	5744178286	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-27 04:06:02 +00:00
NewGarbo	dbda29e3f3	magnetic maul fixes	2015-11-27 04:05:47 +00:00
NewGarbo	73f4450fa3	clans fixes	2015-11-27 04:04:29 +00:00
Shaun Bennett	ef511f1704	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-11-26 22:38:03 -05:00
Shaun Bennett	6da10950da	Update clan icons, fix client class	2015-11-26 22:37:54 -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
NewGarbo	e849484670	bunch of changes and fixes and bugs and stuff and things	2015-11-26 23:59:47 +00: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
NewGarbo	055702b36e	changes and fixes and woo	2015-11-26 23:08:33 +00:00
NewGarbo	56d4b34969	fixed formatting on death notices. Made world event middle texts longer lasting. Fixed logout NPC timer	2015-11-26 21:57:26 +00:00
NewGarbo	5393d1d18c	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-26 21:16:21 +00:00
Shaun Bennett	6e416b1059	Merge remote-tracking branch 'origin/clans-beta' into clans-beta Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java	2015-11-26 16:12:54 -05:00
Shaun Bennett	27e214a643	Region fix	2015-11-26 16:12:29 -05:00
NewGarbo	dd33d9587d	made power recharge a tad faster with Wind Blade	2015-11-26 21:12:09 +00:00
NewGarbo	0aaee24600	fixed gear UI display stuff incorrectly	2015-11-26 21:06:33 +00:00
NewGarbo	bb3ea0115d	fixed classes not loading	2015-11-26 20:41:42 +00:00
NewGarbo	67a28a94fb	bunch of fixes	2015-11-26 20:32:01 +00:00
Keir	edf93ec43f	Initial ChatSnap implementation.	2015-11-26 16:55:27 +00:00
Sarah	9e1d522876	Increase Render distance on particles, Don't spawn mob until "protect him from evil minions" title appears and changing some timings.	2015-11-26 16:47:31 +01:00
Sarah	33383af18a	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-26 16:37:57 +01:00
Sarah	c74732af39	One more fix.	2015-11-26 16:37:18 +01:00
Sarah	cb67e42f96	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-26 16:27:24 +01:00
Sarah	21f859f579	fixing 2 seconds delay.	2015-11-26 16:26:49 +01:00
Sarah	efc05803ac	Minion spawn.	2015-11-26 16:25:44 +01:00
Sarah	40259a26f1	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-26 16:12:51 +01:00
Sarah	a653f053a5	Adding 2 Seconds delay.	2015-11-26 16:12:13 +01:00
Sarah	9f3c3589b2	Particle render distance.	2015-11-26 16:09:29 +01:00
Sarah	3128a6005b	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-26 16:06:53 +01:00
Sarah	eddbde5ebd	Changing length formula.	2015-11-26 16:06:15 +01:00
NewGarbo	2bce722539	some code polishing. fixed some mispositioning with Spawn holograms.	2015-11-26 13:29:40 +00:00
NewGarbo	e5fa59b8da	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-26 13:17:28 +00:00
NewGarbo	009ddaaee1	stop players in tutorial from receiving/sending chat.	2015-11-26 13:16:50 +00:00
NewGarbo	bbfd319bcd	Spawn holograms	2015-11-26 13:14:10 +00:00
NewGarbo	1ce2a362c6	disallow item frames being rotated in Spawn	2015-11-26 12:34:12 +00:00
NewGarbo	be19c17fee	fixed gem -> gold conversion rate	2015-11-26 12:33:29 +00:00
NewGarbo	9aaad0b4a1	fixed formatting in /spawn command	2015-11-26 12:31:55 +00:00
Shaun Bennett	bdc08676d9	Merge remote-tracking branch 'origin/clans-beta' into clans-beta Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java	2015-11-26 03:34:33 -05:00
Shaun Bennett	d4f3786b1c	Fixes	2015-11-26 03:31:03 -05:00
NewGarbo	94a0f3244d	corrected typo in WindBlade.java	2015-11-26 07:53:37 +00:00
NewGarbo	af0df835b8	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java	2015-11-26 07:52:35 +00:00
NewGarbo	97e903f403	updated regions	2015-11-26 07:51:10 +00:00
Shaun Bennett	75ff5bb3da	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-11-26 02:46:56 -05:00
NewGarbo	56d5c10481	oops util ent new method didn't commit in last commit	2015-11-26 07:29:59 +00:00
NewGarbo	c0cfdf9785	fixed windblade not recharging whilst jumping	2015-11-26 07:29:39 +00:00
NewGarbo	e80c1097b5	corrected regions	2015-11-26 07:08:30 +00:00
NewGarbo	0d43ffc7b2	fixessss	2015-11-26 06:54:49 +00:00
Shaun Bennett	6de7b8a73e	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-11-26 01:46:43 -05:00
NewGarbo	972a2d151a	simplified combat log npc title	2015-11-26 06:21:01 +00:00
NewGarbo	f92849f796	that doesn't do what i thought it did	2015-11-26 05:32:59 +00:00
NewGarbo	1e4b6b4d0f	fixed formatting error in clan tip	2015-11-26 05:30:13 +00:00
NewGarbo	7da8b8e3bf	fix players hurting each other in safe zones	2015-11-26 05:29:35 +00:00
NewGarbo	48ebfc219d	removed travel npcs from shops	2015-11-26 05:24:33 +00:00
Shaun Bennett	389956240b	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-11-26 00:20:41 -05:00
NewGarbo	76d009e0de	Unstuck (Spawn) command	2015-11-26 05:18:18 +00:00
Virizion	fdb4ae6e58	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-11-25 23:48:35 -05:00
NewGarbo	33cdd5400d	fixed some coloring issues	2015-11-26 04:32:41 +00:00
Cheese	193c5fe487	fixed static	2015-11-26 15:26:57 +11:00
Shaun Bennett	8f14c8beae	Merge remote-tracking branch 'origin/clans-beta' into clans-beta Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java	2015-11-25 23:26:29 -05:00
Shaun Bennett	7a663b4f7b	Fix legendaries	2015-11-25 23:24:07 -05:00
NewGarbo	8bd1f4b3c8	reduced hyper axe damage. OP as heck	2015-11-26 04:21:30 +00:00
NewGarbo	abcee009dd	stuff	2015-11-26 04:07:33 +00:00
Virizion	de82806fc0	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-11-25 22:53:06 -05:00
Cheese	059a9a32cd	fixed method	2015-11-26 14:51:45 +11:00
Cheese	83a7b398bc	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-26 14:47:24 +11:00
Cheese	1a5dbc073d	recursive block find method	2015-11-26 14:47:01 +11:00
Virizion	6a6807d6f0	- Added time left progress bar - Added subtitle to countdown 5, 4, 3, 2, 1, TIME'S UP when a build is about to end - Added an elder guardian who floats and shoots lasers at the losers builds and blows the blocks up with an explosion - Added a subtitle to show who was eliminated - Prevented players from entering other build areas	2015-11-25 22:45:23 -05:00
NewGarbo	670afc17ef	clans chat is being weird	2015-11-26 03:26:15 +00:00
NewGarbo	5230b25dfd	fixed suicide command (?)	2015-11-26 03:24:48 +00:00
NewGarbo	4f275d79fa	fixed staff tags only displaying if player is in clan	2015-11-26 03:19:40 +00:00
NewGarbo	5fb58b1dad	added suicide command	2015-11-26 03:17:05 +00:00
NewGarbo	8a64a2f4ce	fixed world events spawning floating on grass and other boundless blocks	2015-11-26 03:06:27 +00:00
NewGarbo	b43cf0b28a	got rid of enchanted effect on rare items	2015-11-26 03:00:59 +00:00
libraryaddict	55ff04ca93	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-11-26 15:49:54 +13: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
NewGarbo	7e23f896ca	changes	2015-11-26 02:49:01 +00:00
Cheese	55f5f95869	added no ammo display	2015-11-26 13:05:27 +11:00
Cheese	65a1441e1f	-Fixed smoke being removed when bomb was planted in it -Fixed being unable to defuse bomb in smoke -Fixed older smokes removing newer intersecting smokes -Grenades will still detonate after being burned -Bizon now gives $600 per kill -Added replacement smoke on gun fire -Added shell ejecting particles on gun fire -Removed gun bobbing when firing -Changed ammo display location	2015-11-26 12:56:26 +11:00
NewGarbo	a19ade0739	rain rain go away	2015-11-26 00:53:01 +00:00
NewGarbo	11deec75dd	fixed illusion	2015-11-26 00:44:13 +00:00
Shaun Bennett	c150ea6175	Potatoes and Tornadoes	2015-11-25 19:08:13 -05:00
Sarah	32ee1c285a	merging pregametutorial into type wars.	2015-11-26 00:29:28 +01:00
Sarah	063299ab3a	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-26 00:23:02 +01:00
Sarah	809faf3098	changing teleport mechanic.	2015-11-26 00:14:15 +01:00
Shaun Bennett	cc75bafb4c	Bugs and thugs	2015-11-25 16:45:04 -05: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	c5211e0368	buuugs	2015-11-25 17:40:12 +00:00
NewGarbo	9a8fba543d	auto-replanting trees	2015-11-25 17:03:48 +00: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	84fde1c087	Fixed double jump and entity ground tool. Fixed isGrounded so that it doesn't return false positives when too close to a wall. Added 500ms recharge to double jump, preventing instant recharge allowing players to jump twice before having to touch the ground again.	2015-11-25 16:42:32 +01:00
Sarah	de9262882a	fixing "enemy's" and some merge isssues.	2015-11-25 16:03:13 +01: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
Cheese	360f3db2ed	fixed grenade vertical rebound bug	2015-11-25 17:48:32 +11:00
Cheese	8ceb6ccfca	minestrike update!	2015-11-25 17:41:00 +11:00
NewGarbo	7e9dc7968e	gear gui fixes and legendaries changes	2015-11-25 01:32:05 +00:00
NewGarbo	bbdbb209c5	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-25 00:55:37 +00:00
NewGarbo	3a6dab7224	stuff	2015-11-25 00:55:11 +00:00
NewGarbo	3cb22c8cb7	uuid bug fixed finally!	2015-11-25 00:47:35 +00:00
libraryaddict	ecf42803f9	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-11-25 13:42:31 +13:00
libraryaddict	ca81265b9e	Readded PacketHandler debug message	2015-11-25 13:42:11 +13:00
NewGarbo	aa52c1be27	custom item stuff	2015-11-25 00:14:34 +00:00
NewGarbo	6220ce14fe	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-24 23:04:24 +00:00
NewGarbo	98edd0a452	dissallow chests, doors, furnaces, etc. from being accessed in territories that are not yours	2015-11-24 23:03:19 +00:00
NewGarbo	81c2d2a11f	just pushing my current changes so that i can start fresh on recoding custom item serialization stuff	2015-11-24 22:49:28 +00:00
NewGarbo	31afe9f886	removed debug message from undead camp	2015-11-24 22:29:20 +00:00
Shaun Bennett	57302221df	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-11-24 17:27:46 -05:00
Shaun Bennett	cb7422b4fe	Re-enable world events	2015-11-24 17:27:35 -05:00
NewGarbo	befe4d129d	formatted PlayerGear.java (to avoid further confusion)	2015-11-24 22:21:01 +00:00
NewGarbo	459e1beeff	clans buggy fixers	2015-11-24 22:18:48 +00:00
Sarah	fac7d152ae	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/gametutorial/TutorialPhase.java	2015-11-24 16:25:44 +01:00
Sarah	2a64d06bdd	removing some debug.	2015-11-24 16:24:22 +01:00
Sarah	95b4ad74e8	fixed silencing and adding possibilty to change text.	2015-11-24 16:23:03 +01:00
Sarah	7708f879dc	Fixing attack damage.	2015-11-24 16:15:07 +01:00
Sarah	49f6679537	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-11-24 15:43:59 +01: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	d66bad572f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-24 22:19:59 +11:00
libraryaddict	5799edae50	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-11-24 23:45:42 +13:00
libraryaddict	ddf7528796	Updated CB	2015-11-24 23:45:22 +13: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
Cheese	7e2f5f0657	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-24 21:30:45 +11:00
Cheese	11a60a86a9	Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-24 21:30:17 +11:00
Jonathan Williams	fbea0e702b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-24 02:56:40 -06:00
Cheese	c5b5d07627	evade timing	2015-11-24 16:07:11 +11:00
Cheese	913d079623	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-24 15:23:53 +11:00
Cheese	7454cf7443	MS + Champs bugs, balance and more	2015-11-24 15:23:37 +11:00
fooify	f8401e0eeb	fixed shield smash and fissure affecting spectators	2015-11-23 17:08:24 -08:00
fooify	f300fd2c98	Merge remote-tracking branch 'origin/master' into foo	2015-11-23 15:34:27 -08:00
NewGarbo	8559a63887	Added all rank names to Clans name blacklist	2015-11-23 22:10:29 +00:00
NewGarbo	3fa0beceb7	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-23 21:39:53 +00:00
Shaun Bennett	ef7c26c04c	Clans changes	2015-11-23 15:57:13 -05:00
NewGarbo	91067535db	changed getting started tutorial gold reward to be proper (5000 now)	2015-11-23 18:09:50 +00:00
NewGarbo	175a6bc31a	cleaned up world event times stuff	2015-11-23 17:24:17 +00:00
NewGarbo	9bae314278	fixed null pointer exception when interacting with a block when your clan home is null	2015-11-23 17:19:00 +00:00
NewGarbo	6ca4d12d98	fixed potential nofall exploit with logout npc	2015-11-23 17:09:51 +00:00
NewGarbo	ce2e616c74	fixed /skiptutorial bugs, removed safe log out command, fixed tutorial bugs, and much more i can't remember ;-;	2015-11-23 16:57:50 +00:00
Sarah	66598ce97e	adding teleport flag.	2015-11-23 16:16:33 +01:00
NewGarbo	da2c7d84a4	tutorial code cleanup. removed qa reset command	2015-11-23 11:19:23 +00: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
NewGarbo	58ed9e586c	turned ClansTips into it's own miniplugin, as it doesn't fit as a subclass of Tutorial	2015-11-23 09:04:30 +00:00
Jonathan Williams	875b87e0e4	Fixed memory leak crashing servers.	2015-11-23 02:41:38 -06:00
NewGarbo	47abbfbedf	implemented skip tutorial being permanent	2015-11-22 20:01:54 +00:00
Morten	19803a00ab	Added the Wither Assault fixes to it's own Branch	2015-11-22 19:06:24 +01: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
NewGarbo	2e047b54c2	removed stone weapons from loot	2015-11-22 11:54:38 +00:00
NewGarbo	0cdee95b87	formatted some classes	2015-11-22 11:23:19 +00:00
libraryaddict	cfeafff2f6	EntityDismountEvent stuff	2015-11-22 14:44:32 +13: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
fooify	205643028e	fixed slab issue with Assassin's Flash	2015-11-21 11:00:51 -08:00
Sarah	171696ff0d	final tutorial implementation.	2015-11-21 18:24:17 +01:00
Sarah	15032ac7ff	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-21 18:19:12 +01:00
Sarah	cba5aef9f1	small fix	2015-11-21 18:18:13 +01:00
Sarah	e10a63254a	saving typewars state	2015-11-21 18:16:24 +01:00
AlexTheCoder	3bb11bba08	- Fixed Stats [caused by bad communication between chiss and I]	2015-11-21 11:30:53 -05:00
Sarah	746cc597ab	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-21 17:02:27 +01:00
Sarah	6a29d2a2d6	adding some getters.	2015-11-21 17:01:17 +01:00
Sarah	d0b5f6d8ac	starting implementation of Type wars tutorial.	2015-11-21 16:56:56 +01:00
Sarah	01f67e9d3e	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-21 16:37:49 +01:00
Cheese	91e40d0e61	hide testing server MOTD	2015-11-21 13:37:19 +11:00
Cheese	5b8191e57c	fixed kick history stack direction	2015-11-21 11:42:59 +11:00
Cheese	02d09f2843	fixed slime dying bug removed morphs	2015-11-21 11:37:17 +11:00
Cheese	9ef99cee20	fixed merge issues	2015-11-21 11:21:54 +11:00
Cheese	6eb1bef1c6	Merge branch 'master' into minestrike-update Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java	2015-11-21 11:09:28 +11:00
Cheese	87a30513de	Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-21 11:08:23 +11:00
Cheese	4a0cc79abf	fixed silence not working in non-champs servers	2015-11-21 11:08:09 +11:00
AlexTheCoder	8b480cc32b	Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-20 18:40:42 -05:00
AlexTheCoder	1274dc860d	- Stuff for chiss	2015-11-20 18:40:20 -05:00
Cheese	2f91ca5a8a	fixed errors	2015-11-21 10:35:17 +11:00
Cheese	4a70e4da90	more fixies	2015-11-21 10:34:08 +11:00
Cheese	4d128d9c7a	fixed some skills and wierd hitbox error	2015-11-21 10:29:48 +11:00
Keir	5bbf5bcce5	Only log to the database when the report has been closed.	2015-11-20 23:05:42 +00:00
Cheese	c7297a7a38	fixed invalid proxies exploding	2015-11-21 09:45:01 +11:00
Cheese	d5076b1c47	CTF fix	2015-11-21 09:41:02 +11:00
Cheese	e0885feea6	Merge branch 'master' into alex-ctf	2015-11-21 09:40:07 +11:00
Cheese	04be896ff6	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-21 09:39:50 +11:00
Sarah	97471b0d9c	Finalizing Game Tutorials.	2015-11-20 23:38:02 +01:00
Keir	07b6c7cde7	Display message informing a report handler on how to close a report, when clicked this message will also fill out as much of the command as it can on the clients side.	2015-11-20 22:38:00 +00:00
Cheese	0bc64fec16	Proxy limit fixes	2015-11-21 09:28:15 +11:00
Keir	435f2b643d	Fix fetching player report stats.	2015-11-20 22:20:56 +00:00
Keir	ad16c59ab7	Forgot to commit this crucial part...	2015-11-20 22:05:10 +00:00
Keir	470ff67f86	Replace ReportProfile by using statistics to track total reports and accepted, denied & abusive reports. 1 or more abusive reports results in being banned from the report system.	2015-11-20 22:03:57 +00:00
Cheese	cfc0aa7d05	reverted to size 2 ball	2015-11-21 08:20:02 +11:00
Keir	fc6e1fe003	Notify the handler of a report (if any) when the report they are handling is purged.	2015-11-20 21:10:03 +00:00
NewGarbo	17e62f1f5a	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-20 18:31:37 +00:00
NewGarbo	fb04fac0f6	removed debug message	2015-11-20 18:31:14 +00:00
Sarah	6f7d49b71b	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-20 19:04:51 +01:00
Sarah	2a4d20650a	Saving for branch switching.	2015-11-20 19:04:11 +01:00
AlexTheCoder	386032a4f5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-20 06:03:30 -05:00
AlexTheCoder	f51358552a	-B	2015-11-20 05:57:29 -05:00
NewGarbo	521aa8d965	fixed furnaces in undead camp	2015-11-20 09:14:57 +00:00
NewGarbo	08f683aa98	gave Archers in undead camps the barbed arrows effect	2015-11-20 07:49:28 +00:00
Cheese	3067d9f281	final push for the day	2015-11-20 15:22:43 +11:00
Jonathan Williams	700e4c9a1f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-19 22:12:08 -06:00
Jonathan Williams	411d6fdb22	Made PlayerTracker use existing code for determining region.	2015-11-19 22:11:45 -06:00
Cheese	ed2f3a064c	MORE ML!	2015-11-20 14:31:01 +11:00
Mysticate	3f37b893d3	Worked on double.	2015-11-19 20:29:20 -05:00
Keir	80c87fa1fc	Make reports timeout after 15 minutes of inactivity.	2015-11-20 00:51:21 +00:00
Cheese	3a5ab3f17c	Merge branch 'master' into monster-league	2015-11-20 11:51:07 +11:00
Cheese	1cc92cea1b	and the files	2015-11-20 11:50:33 +11:00
Cheese	c4745c18b6	ML update	2015-11-20 11:50:20 +11:00
Mysticate	f7011032bc	Switching branches	2015-11-19 19:49:46 -05:00
Keir	bceb69bc12	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	2015-11-19 23:52:02 +00:00
Mysticate	f02e2b2e72	Formatting	2015-11-19 18:02:07 -05:00
Mysticate	e816a79f37	Reformatted	2015-11-19 17:51:25 -05:00
Mysticate	502f12f00f	Fixed paintball to the max. :>>	2015-11-19 17:46:07 -05:00
Cheese	e14f5a36bd	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-20 08:34:19 +11:00
Cheese	f33eedf36d	text fix	2015-11-20 08:33:51 +11:00
Sarah	0fedb99660	Changing the tutorial visuals and texts.	2015-11-19 21:04:50 +01:00
Shaun Bennett	c29fd242ca	Forgot to remove the unnecessary check	2015-11-19 14:46:01 -05:00
Sarah	ad280c96c9	adding interactive Chat elements.	2015-11-19 20:45:40 +01:00
Shaun Bennett	f47a61e38e	Use bounds for energy tracker messages aren't displayed multiple times	2015-11-19 14:44:03 -05:00
Shaun Bennett	63e580404c	Merge remote-tracking branch 'origin/clans-beta' into clans-beta # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyTracker.java	2015-11-19 14:36:08 -05:00
Shaun Bennett	3820035762	Cleaning up duplicate code/small optimizations (untested)	2015-11-19 14:35:59 -05:00
NewGarbo	b0c60fd1f4	sparkly rare items! woo. and fixed gold dropping waaayyy too much	2015-11-19 19:03:51 +00:00
NewGarbo	7d8e1b517d	Fixed dropped gold stacking...	2015-11-19 08:56:07 +00:00
NewGarbo	f262a22913	Fixed loot dropping in King of the Hill not dropping correct items/	2015-11-19 08:54:59 +00:00
NewGarbo	6372dfd629	fixed ArithmeticException / 0 in ClansEnergyTracker.	2015-11-19 08:29:50 +00:00
Virizion	975b1df477	Added the title message when a perfect match. Turns out having a '%' in the text caused it not to appear.	2015-11-18 22:03:04 -05:00
fooify	6d0879a175	Re-fixed Barbarian bug	2015-11-18 17:31:28 -08:00
Virizion	796f116cfd	Merge branch 'master' into virizion_speed_builder	2015-11-18 19:27:42 -05:00
Virizion	937d024ea5	Empty builds are auto eliminated. Damage player 9001 so the elimination is handled by the managers and not us. If there are not enough build areas for the players, the game ends. Shows a message that you completed the build if you complete it correctly. It also plays a sound. It would have a title but the title wasn't showing up for some reason...	2015-11-18 19:26:19 -05:00
NewGarbo	0a667afeb1	finally fixed beds. major cleanup of code, much more organized now, thank you, Me!!!! oh my god both of my eyes are twitching	2015-11-18 22:27:01 +00:00
William Burns	4620a5a162	Hub fix	2015-11-18 21:47:52 +00:00
Sarah	a8ba1f1ea6	some perspektive changes to the tutorial and removing prepare timer.	2015-11-18 22:33:47 +01:00
Virizion	76db2710ae	It should have been all got the build 100% correct not all got the same score.	2015-11-18 16:10:44 -05:00
NewGarbo	eded09b1a9	fixed yet another bug with beds... argh it seems to be working fine now.	2015-11-18 21:02:39 +00:00
Keir	cb5672b94c	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report	2015-11-18 20:34:24 +00:00
NewGarbo	6f3693f804	more bug fixes	2015-11-18 19:32:20 +00:00
NewGarbo	924504ac9f	fixed clans home NPE. also added GRASS to UtilItem's item property system.	2015-11-18 19:03:44 +00:00
William Burns	6fa2a58f5d	Merge branches 'master' and 'william-global' of ssh://184.154.0.242:25565/min/mineplex into william-global	2015-11-18 18:50:09 +00:00
William Burns	0e1c72e25d	testing excludes	2015-11-18 18:46:51 +00:00
Sarah	f2830e653e	Making last changes to the tutorial	2015-11-18 19:25:12 +01:00
NewGarbo	16eecdd112	fixed clan energy alerts going off incorrectly	2015-11-18 17:30:45 +00:00
Sarah	bff9a065d9	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java # Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java # Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java # Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java	2015-11-18 18:08:51 +01:00
Sarah	64970ab8d6	adding little tutorial at the start of the game.	2015-11-18 17:53:35 +01:00
NewGarbo	5c2569e822	revert certain permissions from being ALL or containing JR.DEV (that were used for testing)	2015-11-18 16:20:27 +00:00
Shaun Bennett	1eff698a34	Merge pull request #75 in MIN/mineplex from william-global to master * commit 'a11ca138e764417c23a0060dd134ef7c49741295': ranks woops easy fix rawr and fixes Added the ability to give out game loot. Reformatting titles Added GlobalGiveCoins. Changes Gems a little and the manager. More global stuff! Added GlobalGiveGems. Global Packet work. Added giveitem sub-command.	2015-11-18 10:15:33 -06:00
William Burns	a11ca138e7	ranks	2015-11-18 16:01:53 +00:00
William Burns	04a4b072af	woops easy fix	2015-11-18 15:48:25 +00:00
William Burns	2e223d0660	rawr and fixes	2015-11-18 15:42:33 +00:00
William Burns	e16ee9036a	Added the ability to give out game loot.	2015-11-18 14:35:40 +00:00
William Burns	e83b49d490	Reformatting titles	2015-11-18 13:43:22 +00:00
NewGarbo	5c383a1df3	cleaned up /sethome old bed removal, as previous way would delete any beds around the home bed, which would destroy	2015-11-18 12:24:28 +00:00
NewGarbo	9eaffc8acf	Added methods into UtilBlock to place beds and doors. updated /sethome to use the new method for placing beds. i'm sure they'll come in handy later on.	2015-11-18 12:17:00 +00:00
NewGarbo	cd0ce57691	replaced useless looping with just checking the rotation of the bed.	2015-11-18 09:58:06 +00:00
NewGarbo	1ea87b8354	Fixed an NPE when destroying a Clan's Home	2015-11-18 09:37:32 +00:00
NewGarbo	03764ad480	removed the disallowing of interaction in ClansGame.java if the block that the player is hitting, is a Clan's Home. This was messing up the other code for Clan Home bed stuff.	2015-11-18 08:40:24 +00:00
NewGarbo	f5e12e5014	formatted ClansGame.java (separate commit because confusion otherwise)	2015-11-18 08:37:34 +00:00
NewGarbo	77f234e5f5	Made energy warnings stay for longer	2015-11-18 08:32:48 +00:00
NewGarbo	185f19fb6a	fixed clan energy warnings being sent to all players on the server instead of the clan.	2015-11-18 08:13:13 +00:00
NewGarbo	6da628abe1	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-18 07:40:35 +00:00
NewGarbo	f79c282225	Clan energy warnings implemented. (not tested yet)	2015-11-18 07:39:00 +00:00
Virizion	8145b127ba	Changed the score algorithm so if all players have the same score, nobody is eliminated.	2015-11-17 20:04:23 -05:00
fooify	4198e73120	Fixed SG Barbarian bug	2015-11-17 16:05:49 -08:00
Shaun Bennett	4f63d90bac	Only show player location for allies/self	2015-11-17 18:42:06 -05:00
Shaun Bennett	01a57dde2f	Fix formatting of ally messages	2015-11-17 18:39:15 -05:00

... 21 22 23 24 25 ...

7222 Commits