Mineplex2018-withcommit

JarvisBigBalls/Mineplex2018-withcommit

Author	SHA1	Message	Date
xXVevzZXx	0fb84e57c1	Merge branch 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java	2016-05-20 23:26:54 +02:00
cnr	d6750c7d91	Disable /unlockCosmetics on production servers	2016-05-20 03:23:27 -05:00
LCastr0	22fb507871	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-20 05:14:29 -03:00
LCastr0	c58e0f3e30	Fixes for the 1 Shard thing (Next time, for testing, use /unlockCosmetics)	2016-05-20 05:11:59 -03:00
Shaun Bennett	efb264dd75	Hook into Booster API	2016-05-20 16:58:58 +10:00
Thanos Paravantis	28f1d45b1c	Update achievement category game enum	2016-05-19 20:55:22 +03:00
Thanos Paravantis	472d3881a0	Merge branch 'develop' into thanos-mineware	2016-05-19 20:49:45 +03:00
Thanos Paravantis	87c8c7efa4	Merge branch 'master' into thanos-mineware	2016-05-19 20:42:43 +03:00
cnr	7f44281441	Merge branch 'develop' into project-cosmetics	2016-05-19 10:04:19 -05:00
Shaun Bennett	012edfed45	Use loaded schematics to display fountain progress	2016-05-18 18:04:21 +10:00
LCastr0	11db05b6bf	Fixes spelling of MineStrike gun Fixes spectators not being sent to the winroom	2016-05-18 03:58:50 -03:00
Shaun Bennett	e3833b95ad	Update Gem Fountain purchase gui	2016-05-18 15:59:04 +10:00
TadahTech	3479d6e318	Fix incognito.	2016-05-17 18:12:05 -05:00
TadahTech	38a0b593ee	Fix height for 1.9 and 1.8 users. Thanks QA for not fully testing....	2016-05-17 18:11:28 -05:00
Ben	35c7b9a2bd	Incognito Updates: -ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish]) -ADD: Make it so /stats don't work on vanished staff. -ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.	2016-05-17 18:10:07 -05:00
Ben	8a75a5098c	Remove hub invisibility preference for all but Admins and higher.	2016-05-17 18:08:01 -05:00
Ben	014ce137fc	If a player uses /a regardless of if staff are online, offline, or vanished, making it always yield a response telling the player that if there are staff currently online, they will receive a reply soon - removing the "there are no staff online" message. Also a 60s Recharge for this.	2016-05-17 18:03:18 -05:00
Ben	6760c07e6c	Fix staff members getting stuck in both Incognito mode and the Hub Invisibility preference, and not being able to toggle either off them off because Incognito would stop Hub Invisibility from getting toggled (on OR off), and vice versa.	2016-05-17 18:00:20 -05:00
AlexTheCoder	141cafcf28	Implement initial game code and add skeleton for full play	2016-05-17 17:29:23 -04:00
xXVevzZXx	6e9b0e4fa5	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java	2016-05-17 14:41:17 +02:00
TadahTech	43cadf564e	Fix Carl the Creeper. Fix Bridges TNT exploit.	2016-05-16 22:03:27 -05:00
LCastr0	fb63b3a1a4	Fixes for winroom command, and illuminated chest	2016-05-15 22:49:10 -03:00
LCastr0	42eef838b3	Fixes podium not being enabled by default	2016-05-15 21:33:36 -03:00
xGamingDudex	a27a618b2f	Made debugging tools only available on test servers	2016-05-16 02:04:15 +02:00
xGamingDudex	816a7ca232	Re-Activated chest buttons	2016-05-16 01:57:58 +02:00
xGamingDudex	d92ad9c53f	Made illuminated chest purchasable and added appropriate lore	2016-05-16 01:51:40 +02:00
LCastr0	511726f72a	Treasure chest coin checker for test servers	2016-05-15 20:43:46 -03:00
xGamingDudex	4ebf48bd45	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics	2016-05-16 01:34:08 +02:00
xGamingDudex	8ad7646128	Edits to treasure chests	2016-05-16 01:33:54 +02:00
xGamingDudex	f8d5bd3c11	Fixed treasure chests Items would sometimes pop out of chest blocks You could open illuminated chests before they were converted to real chests	2016-05-16 00:51:33 +02:00
LCastr0	09b7fbdbbe	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-15 18:48:00 -03:00
LCastr0	4f79ec6551	Pinata fixes	2016-05-15 18:47:09 -03:00
xGamingDudex	b4aad690e5	Fixed some rewards and added party trail to chests	2016-05-15 23:31:10 +02:00
xGamingDudex	fdf167953f	Fixed emerald set order	2016-05-15 23:30:17 +02:00
xGamingDudex	1e6dda2d7d	Cleaned up some win effect backend code & fixed kits working in winroom	2016-05-15 23:28:12 +02:00
xGamingDudex	d850bed725	Minor code tweaking * Made reward manager ammo multiplier private final field * Removed old commented code from WinEffectPodium, WinEffectLavaTrap, ParticleMusic, ParticleEmerald, ParticleBlood * Cleaned up the GameModifierMineStrikeSkin filter * Removed unused Math#isBetween(double, double, double) method * Changed Animator to use PriorityQueue	2016-05-15 19:43:07 +02:00
xGamingDudex	97f82e422d	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/AnimatorEntity.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ICosmeticShape.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java	2016-05-15 16:03:36 +02:00
xGamingDudex	22e54557d8	Fixed cleaning method for WineffectRiseOfTheElderGuardian The class contained commented code, removed when debugging	2016-05-15 15:33:42 +02:00
xGamingDudex	abddc446fd	Added java docs and tweaked code * Fixed possible duplication bug in MulitBlockUpdaterAgent * Tweaked some of the factor methods for Shape.java * Cleaned some code in ShapeWings.java	2016-05-15 15:32:44 +02:00
LCastr0	1cc44d1b3e	Fixes for the following classes: KitGameModifier KitModifierType MultiBlockUpdaterAgent Shape GadgetManager KitModifierType HatLovestruck HatSecretPackage SetLove Animator AnimatorEntity AnimationPoint ICosmeticShape UtilText KitGameModifier KitModifierType Removed build.xml and org.eclipse.jdt.ui.prefs	2016-05-15 00:20:07 -03:00
xGamingDudex	24f7a4b409	Added "(Minestrike Weapon Skin)" suffix to MS skins in treasure rewards	2016-05-14 18:53:09 +02:00
samczsun	b2e92fdf15	Don't pass on INTERACT_AT as INTERACT. Fixes PC-114	2016-05-14 09:42:28 -05:00
LCastr0	20b9f428b4	Fixes Illuminated Chest's Lore Fixes Pinata Burst not being saved Fixes AWP Asiimov and XM1014 Tranquility materials Removes Fireworks WinRoom Changes prices of things from 1 shard to Treasure Chest More unused imports removed Fixed ANGLE_WING_PATTERN -> ANGEL_WING_PATTERN Adds javadoc to UtilColor.applyColor() Adds javadoc to UtilColor.getNextColor() defaultLeatherColor -> DEFAULT_LEATHER_COLOR Adds suggestions for UtilColor Adds final modifier to _worldBorders (UtilPlayer) Changed _worldBorders key from String to UUID Adds suggestion for UtilPlayer Adds final modifier to _type (GameModifierSubPage) Adds final modifier to _type and _kitType (KitGameModifierPage) DefaultDencity -> DefaultDensity (Shape) Changed <Vector> to <> (Shape) dencity -> density (ShapeBox, ShapeGrid, ShapeSphere) Using speed and count in constructor (ShapeWings) Removed empty constructor (WorldGenCleanRoom, MultiBlockUpdaterAgent) Adds final modifier to all fields (AnimationPoint)	2016-05-14 01:18:37 -03:00
Shaun Bennett	b802cdec6d	Rename shop to "Fountain Keeper"	2016-05-14 14:01:28 +10:00
xXVevzZXx	63c44afa10	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/game-variants	2016-05-13 22:05:27 +02:00
xXVevzZXx	df5c628c35	add new gamemodes Tiny Winners, Random Kit SSM, UHC SW, UHC SG and improve OP SG, OP SW, OP Bridges, Dukes of decoration, OP Gladiators, Faster than Light, Bunny Hopper and Countdown	2016-05-13 20:23:04 +02:00
xGamingDudex	2cc609b67e	Moved some rewards from normal to valentines	2016-05-13 01:28:26 +02:00
xGamingDudex	35ab155756	Removed unnecessary lore from minestrike game modifiers	2016-05-13 01:20:06 +02:00
xGamingDudex	d34f77a381	Moved some rewards from normal to winter chest	2016-05-13 01:19:06 +02:00
xGamingDudex	9c2c415eb2	Fixed the emerald trail leaving from idle to moving	2016-05-13 01:14:00 +02:00
xGamingDudex	3bb3821fa9	WinEffect gadget disable and MineStrike name and data update	2016-05-13 01:04:35 +02:00
xGamingDudex	4958ab8149	Bug Fixes * Fixed Menu page adding glow to win effects if game modifiers were active * MineStrike skins were not properly applying material and data * Skinned knife was not dealing damage	2016-05-13 00:38:56 +02:00
xGamingDudex	06e583c05e	Added flat podium to Firework and Punchman	2016-05-12 23:50:41 +02:00
xGamingDudex	956d64d750	Git Merge Import Fix	2016-05-12 23:46:39 +02:00
xGamingDudex	29d4db0bfd	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics Conflicts: Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java	2016-05-12 23:46:17 +02:00
xGamingDudex	2db98613ab	Cosmetic Update * Redid the Reward manager Added new rewards to the chest and changed some values * Fixed some MineStrike skin bugs * Removed particles/death effects from Minestrike * Removed old test minestrike skins * Moved minestrike skins to correct package * Changed the illuminated chest animation a bit * Fixed other minor bugs	2016-05-12 23:42:37 +02:00
LCastr0	6f4c6bc545	Fixes counter on WindUp suit Removes kit modifier categories	2016-05-12 15:00:43 -03:00
Keir Nellyer	13ff2e5263	Fix query for pulling report profiles Previously we didn't check that the user actually reported an issue so in effect we were creating a report from every single logged incident (regardless of whether the user in question was involved).	2016-05-12 14:38:04 +01:00
Keir Nellyer	814f3516de	Make the chat abuse color easier on the eyes Dark blue [bold] is hard to read, dark aqua [bold] should be easier to read.	2016-05-12 14:22:19 +01:00
xGamingDudex	276f572009	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics Conflicts: Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java	2016-05-10 20:21:37 +02:00
xGamingDudex	1b0b9a894b	Tweaked some cosmetics * Changed Party Death to firework icon * Removed idle spark from Emerald Trail * Changed wing style to pixie from angle on infernal wings * Added black dots to YinYang Started some work on the RewardManager	2016-05-10 20:20:44 +02:00
LCastr0	4fada6de49	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-10 12:45:22 -03:00
LCastr0	5b8ff933b1	Removed more unused imports Fixed some lores and names for cosmetics Renamed some classes to match Set name Commented out the Lovely set (Duplicate of Cupid's Love) Fixed set descriptions Added 'Comming soon...' to set bonuses	2016-05-10 12:44:45 -03:00
Keir Nellyer	7c80c3826b	Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report	2016-05-08 21:49:16 +01:00
Conrad	ac86f3ac8c	Merge pull request #55 from Mineplex-LLC/alex-mcl Change the visuals of the Billboards and of ELO's display in the stat…	2016-05-08 13:29:23 -04:00
AlexTheCoder	34e8d65f4d	Change the visuals of the Billboards and of ELO's display in the stats menu to be more user friendly	2016-05-07 21:16:12 -04:00
Keir Nellyer	b68127b111	Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report	2016-05-08 00:37:59 +01:00
Keir Nellyer	b1a41c3cb3	Make chat abuse colour easier on the eyes Dark blue [bold] is hard to read, dark aqua [bold] should be easier to read.	2016-05-07 22:48:49 +01:00
xGamingDudex	5649939f8c	Removed some old disabled code.	2016-05-06 21:59:18 +02:00
xGamingDudex	e04a897488	Added some pre-animation to chicken win effect. Removed some comments.	2016-05-06 21:58:31 +02:00
xGamingDudex	0fea90516b	Alternative emerald trail for full set	2016-05-06 13:24:06 +02:00
xGamingDudex	f58db6ee3b	Removed firework from party death Replaced the death effect with item drops instead	2016-05-06 13:12:28 +02:00
xGamingDudex	d60fea4f76	Added chicken and guardian win room schematic handlers	2016-05-06 13:00:45 +02:00
LCastr0	97ef801e3d	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-05-06 00:40:55 -03:00
LCastr0	49c45628a2	Removed more unused imports Fixed some lores and names for cosmetics Renamed some classes to match Set name Commented out the Lovely set (Duplicate of Cupid's Love)	2016-05-06 00:40:22 -03:00
Shaun Bennett	93c2886601	Add boosters to inventory menu	2016-05-06 13:31:59 +10:00
Conrad	55d40a1a6b	Merge pull request #53 from Mineplex-LLC/feature/logitech-brand Changed design of billboard and fixed its centering in hubs	2016-05-05 18:33:15 -04:00
AlexTheCoder	f329051399	Changed design of billboard and fixed its centering in hubs	2016-05-05 18:25:51 -04:00
xGamingDudex	17a4517e71	Merge remote-tracking branch 'origin/develop' into project-cosmetics Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java	2016-05-05 21:03:15 +02:00
xGamingDudex	1a96ea3c18	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics	2016-05-05 20:29:28 +02:00
xGamingDudex	db21c7dd22	EGit FTW! Git, you are the greates, randomly deciding not to include everything when I spesify you to do so.... This should have been part of prev commit.	2016-05-05 20:26:00 +02:00
xGamingDudex	9fca9283e2	Fixed skin layers for Player/Human disguises	2016-05-05 10:39:00 +02:00
Keir Nellyer	e1f2bb9740	Use all-man style braces here to be compliant with the coding standards (cherry picked from commit `e553ac5`)	2016-05-04 16:02:39 +01:00
Keir Nellyer	a663cb3e01	Revert "Revert "Report system (version 1)"" This reverts commit `d0d2de1e21`. # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2016-05-04 15:24:29 +01:00
Conrad	145ea9221a	Merge pull request #40 from Mineplex-LLC/clans/beta Clans/beta	2016-05-03 16:57:07 -04:00
LCastr0	cfc6f3703d	Merge pull request #50 from Mineplex-LLC/develop Merge from develop	2016-05-03 13:24:32 -03:00
Conrad	3c482e38cc	Merge pull request #47 from Mineplex-LLC/feature/logitech-brand Convert over to System.out.println() for error messaging and add prot…	2016-05-02 16:34:58 -04:00
Conrad	2cd76fbf72	Merge pull request #48 from Mineplex-LLC/alex-mcl Add catch for rare occurrence where players have no stored data	2016-05-02 16:34:50 -04:00
AlexTheCoder	ccd5b47d75	Convert over to System.out.println() for error messaging and add protection for billboards in Hub via a new manager	2016-05-02 16:20:41 -04:00
LCastr0	055b8684c2	- Added action bar message when booster is ready (Wind Up Suit) - Moved each suit to an individual package, to make it easier to work with - Removed some unused imports - Added util to get entity egg data - Added kit modifiers: Beastmaster, Horseman and Necromancer (SG), Apple (Bridges) - Added specific kit pages to game modifier menu	2016-05-02 00:13:06 -03:00
Keir Nellyer	fa017c185d	Add method to load ReportProfile from database	2016-05-01 22:48:02 +01:00
Keir Nellyer	41bc9672ab	Remove un-needed imports	2016-05-01 21:49:08 +01:00
Keir Nellyer	ccf14d0d2a	Declare final variables in ReportCategory	2016-05-01 21:12:01 +01:00
Keir Nellyer	132f431a94	Map each ReportResult to its id in the database We no longer use the statistic system to store the results of reports but rather store the result of each ticket in a database table.	2016-05-01 21:10:55 +01:00
Keir Nellyer	1d36d4c4b9	Map each ReportCategory to it's id in the database	2016-05-01 21:04:20 +01:00
AlexTheCoder	7e97bd346e	Change an internal method to private and add missing class JavaDoc	2016-05-01 15:16:42 -04:00
AlexTheCoder	335c5a4510	Clean up billboard generation and clearing, rewrite MapRender for logos, and add JavaDocs to comply with code standard	2016-05-01 14:58:40 -04:00
AlexTheCoder	48c8a5a630	Force structure to spawn correctly, complete with maps on item frames	2016-05-01 01:56:07 -04:00
Ben	189f9ad524	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-05-01 01:42:32 +01:00
Ben	2337e89a93	Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well.	2016-05-01 01:42:11 +01:00
AlexTheCoder	070326e72d	Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding	2016-04-30 19:26:16 -04:00
Keir Nellyer	e553ac5aab	Use all-man style braces here to be compliant with the coding standards	2016-04-30 23:12:25 +01:00
Keir Nellyer	bce218a65e	Merge branch 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-04-30 23:11:35 +01:00
AlexTheCoder	39c105f0cf	Add catch for rare occurrence where players have no stored data	2016-04-30 15:34:04 -04:00
Conrad	d0d2de1e21	Revert "Report system (version 1)"	2016-04-30 14:53:59 -04:00
Conrad	e0e30a8b7f	Merge pull request #43 from Mineplex-LLC/alex-mcl Fix Async Elo Ranked Bans	2016-04-30 14:46:49 -04:00
AlexTheCoder	37a815d52a	Update JavaDocs to fit Mineplex standard	2016-04-30 14:41:28 -04:00
AlexTheCoder	2e4bae6915	Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla	2016-04-30 14:14:14 -04:00
AlexTheCoder	2dc5c46624	Fix naming convention on checkRankBannedAsync	2016-04-30 14:13:21 -04:00
AlexTheCoder	41e26f283c	Fix all async elo ranked ban methods and switch to callback system for API hooks	2016-04-30 14:10:09 -04:00
TadahTech	6e35bc0989	Stop spamming the chat.	2016-04-30 00:55:59 -05:00
Keir Nellyer	2490e3df82	Previous git merge cause this single line to be deleted I literally have no idea why or how this happened.	2016-04-29 23:47:01 +01:00
Keir Nellyer	6a00f26d5f	Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-04-29 23:42:27 +01:00
Keir Nellyer	81cebc4ce7	Swap static helpers for a much better solution This allows for easier refactoring in the future when we move away from retrieving the CoreClientManager from a static instance. Mineplex coding standards are also against the use of static helpers in scenarios such as this, therefore this commit brings this branch to be in-line with the coding standards.	2016-04-29 23:37:40 +01:00
Shaun Bennett	184d247fc9	Start adding BoosterPage. Move Boosters to core to support UI's	2016-04-29 17:37:34 +10:00
AlexTheCoder	a8d9745320	- Fixed order of Top Elo	2016-04-29 00:12:25 -04:00
TadahTech	26f6a1189f	Prettyfy EloCommand	2016-04-28 21:34:43 -05:00
TadahTech	e83e4b270c	Prettyfy EloCommand	2016-04-28 21:34:07 -05:00
TadahTech	00efb7d72e	Fix ELO query	2016-04-28 21:20:48 -05:00
TadahTech	84ca13c0d3	Fix ELO query	2016-04-28 21:09:28 -05:00
TadahTech	80ea7b7a4c	Fix ELO query	2016-04-28 21:09:07 -05:00
TadahTech	5a4f89b484	Fix ELO query	2016-04-28 21:04:07 -05:00
AlexTheCoder	7c279998ec	- Changed top elo queries	2016-04-28 21:55:51 -04:00
AlexTheCoder	8e68d62356	- Added documentation for new EloManager methods	2016-04-28 21:16:18 -04:00
AlexTheCoder	2887630cf8	- Added javadoc headers	2016-04-28 21:11:38 -04:00
AlexTheCoder	4b7684da4c	Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla	2016-04-28 21:05:56 -04:00
AlexTheCoder	e032b81842	- Made SQL calls async	2016-04-28 20:59:49 -04:00
TadahTech	562e950361	Remove File headers.	2016-04-28 19:46:13 -05:00
TadahTech	680e579223	Merge Alex's branch into mine. Convert to Java 8 Remove unneeded comments.	2016-04-28 19:39:24 -05:00
TadahTech	168483a9fc	Communities work	2016-04-28 19:30:05 -05:00
TadahTech	725481f310	Top Elo data for Webpage	2016-04-28 19:23:57 -05:00
TadahTech	84c0b1b389	Top Elo data for Webpage	2016-04-28 19:22:45 -05:00
AlexTheCoder	156982460f	- Fixed water permanently [MCL] - Fixed team balancing [MCL] - Fixed overjoining [MCL] - Changed bans for quitting ranked matches [MCL]	2016-04-28 20:03:09 -04:00
Keir Nellyer	5dbb3744d1	Improve reputation map initialization logic	2016-04-28 23:52:26 +01:00
Keir Nellyer	c82dd27b64	Make getValueOf method more robust	2016-04-28 23:36:41 +01:00
Keir Nellyer	bff5751691	Remove very last @author tag	2016-04-28 14:41:44 +01:00
AlexTheCoder	dcd376b837	- Improved graphics for Elo display in /stats	2016-04-28 01:01:14 -04:00
AlexTheCoder	189296a586	- Fixed using water in restricted zones in MCL - Implemented Elo in /stats menu	2016-04-28 00:53:04 -04:00
AlexTheCoder	b4c5be81f3	- Fixed random weather in MCL - Added Elo Division display to /stats for applicable games - Made fishing rods kept on death in MCL	2016-04-27 23:12:38 -04:00
AlexTheCoder	a16145479e	- Disabled picking up lava - Leaving ranked matches temp bans players from rejoining them	2016-04-27 03:18:44 -04:00
LCastr0	d0e7590b2a	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-04-26 23:23:45 -03:00
LCastr0	a7ef8bec49	Adds new constructor to NotePlayer, to be able to send the song to specific players Some WindUp costume fixes Added actionbar and song to WindUp suit Created new booster manager	2016-04-26 23:21:59 -03:00
xGamingDudex	38d03b8468	Merge branch 'project-cosmetics' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into project-cosmetics	2016-04-27 00:03:29 +02:00
xGamingDudex	79f210e242	Schematic and WinEffect update +Added better schematic support +Fixed schematics not sending block updates to nearby players +Added win room schematics *Tweaked some of the win rooms +Added sounds to the Lava Trap win effect.	2016-04-27 00:01:30 +02:00
Shaun Bennett	714000163b	Add messages when fountain is complete and resets	2016-04-26 16:19:27 +10:00
Shaun Bennett	4a8c38e1c8	Add fountain reset command	2016-04-26 15:33:52 +10:00
Shaun Bennett	cabf4c4c8b	Add BlockProgressBar for Gem Fountain	2016-04-26 15:26:07 +10:00
Shaun Bennett	e8370579c0	Counter refactoring	2016-04-26 13:55:06 +10:00
Thanos Paravantis	d0336be7b7	Add new achievements and modify current ones	2016-04-25 22:59:24 +03:00
LCastr0	28de514d1a	Adds some utils for UtilColor Small changes in Wind Up suit	2016-04-24 21:39:35 -03:00
Thanos paravantis	856eb6059b	Update statistics and implement data tracker	2016-04-24 22:39:56 +03:00
Keir Nellyer	8969ec172b	Merge branch 'feature/report' into feature/report-v2	2016-04-24 18:26:10 +01:00
Keir Nellyer	949f9ca712	Don't allow players to report themselves I left this to last minute to make testing easier, as with this check in place it means at least two players are required to test the report mechanism.	2016-04-24 18:10:01 +01:00
Keir Nellyer	dab1f9485c	Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report	2016-04-24 17:17:17 +01:00
Keir Nellyer	9df4dac023	Remove dead code This was left over from before I took over development of the report feature.	2016-04-24 17:16:36 +01:00
Keir Nellyer	713263214f	Run ReportPurgeTask asynchronously This prevents the task from hanging the server which may be an issue when a large amount of reports exist.	2016-04-24 17:15:12 +01:00
Keir Nellyer	57e9cd6e19	Add class headers and remove @author tags This makes the PR compliant with with the Mineplex coding style. Class headers are used to describe the function of a class and git history will be used to determine the author of a class.	2016-04-24 17:10:29 +01:00
Keir Nellyer	84f5bd2f31	Handle abusive report types	2016-04-24 16:51:01 +01:00
Thanos paravantis	e2a6500bce	Update game achievements	2016-04-24 13:37:39 +03:00
Shaun Bennett	b21dfad12e	Merge remote-tracking branch 'remotes/origin/develop' into feature/gems # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java	2016-04-24 13:37:45 +10:00
Shaun Bennett	c60beec68c	Implement Fountain GUI	2016-04-24 12:40:38 +10:00
LCastr0	491c509317	Added UnlockCosmetics command (/unlockCosmetics <type>) Added Ammo command (/ammo <gadget> <ammo> [player]) Added util for red world border screen (UtilPlayer.sendRedScreen) Added new costume -> Wind Up Removed test gadget (ItemBouncyBall)	2016-04-23 22:16:02 -03:00
xGamingDudex	ccd630e2ae	Leftovers from merge	2016-04-23 00:56:19 +02:00
xGamingDudex	b7099088a9	Merge remote-tracking branch 'origin/develop' into project-cosmetics Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java	2016-04-23 00:55:48 +02:00
Thanos paravantis	fa75bc15ad	Merge branch 'develop' into thanos-mineware Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java	2016-04-22 22:03:15 +03:00
Jonathan Williams	fe0cee65e8	Added gem and coin rewards back into bonus.	2016-04-22 05:33:25 -05:00
Jonathan Williams	260c617007	Merge remote-tracking branch 'remotes/origin/alex-mcl' into develop	2016-04-22 05:12:30 -05:00
Jonathan Williams	e28621ae26	Set oldElo equal to new elo on new row.	2016-04-22 05:04:13 -05:00
AlexTheCoder	70541fd6f2	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla	2016-04-22 05:41:24 -04:00
Jonathan Williams	d73b720323	Merge branch 'features/elo' into develop	2016-04-22 04:34:35 -05:00
Jonathan Williams	477acf044e	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop	2016-04-22 04:34:21 -05:00
Jonathan Williams	6db7e648f5	Don't insert new row if the update doesn't succeed because of elo mismatch on loss.	2016-04-22 04:20:59 -05:00
Jonathan Williams	7b18efa7b0	Prevent farming elo up with multiple games by dc and joining new game.	2016-04-22 04:05:07 -05:00
Jonathan Williams	ddd1c5af9b	Removed EloSettings and fixed scoreboard.	2016-04-22 03:10:09 -05:00
Jonathan Williams	a31eccc15b	Multiply new rating by team size. MIssed that undo!	2016-04-22 02:53:02 -05:00
Jonathan Williams	757c945320	Added in kFactor ratio application to rating delta.	2016-04-22 02:35:37 -05:00
Jonathan Williams	aa6d25139f	Tweaked elo for team games.	2016-04-22 02:04:57 -05:00
Jonathan Williams	776093288a	Fixed rating not setting in EloPlayer constructor.	2016-04-22 01:11:48 -05:00
Jonathan Williams	977fbe684a	Fixed elo query.	2016-04-22 01:06:33 -05:00
Jonathan Williams	6d00e8b41f	Refactored Elo to work correctly.	2016-04-22 00:21:11 -05:00
Shaun Bennett	8a5fdccb60	Add to fountain button	2016-04-22 11:26:05 +10:00
AlexTheCoder	d0e3b094c1	- cleaned up and prepped for live update	2016-04-21 20:57:35 -04:00
Shaun Bennett	e46798f20e	Fix NPE in AdminCommand from IncognitoManager being null	2016-04-22 10:49:34 +10:00
Shaun Bennett	435d3968a2	Fix Fountain string being changed to Counter from refactor	2016-04-21 19:46:20 +10:00
AlexTheCoder	d57cc48f0f	- Added new features!	2016-04-20 22:31:54 -04:00
Joseph Prezioso Jr.	f86b18b603	Elo Works Now Ready to move on to MCL implementation	2016-04-20 22:09:18 -04:00
Shaun Bennett	54f0b99756	Add fountain gui command	2016-04-21 11:41:16 +10:00
Joseph Prezioso Jr.	6a5c8336cf	Elo and Division fixed Elo and Division should be displaying properly Cleaned the code up a bit Added endElo() to Game.java to handle team Elo code Added event listener to check for GameState.End in TDM to call endElo()	2016-04-20 14:52:06 -04:00
AlexTheCoder	588e6f08c2	- Removed TypeWars achievements to make room	2016-04-19 18:07:20 -04:00
LCastr0	793f5b3f41	Test gadget added by LCastr0, to get used to the code	2016-04-19 15:20:31 -03:00
LCastr0	2b80ebabf7	Test gadget added by LCastr0, to get used to the code	2016-04-19 15:14:22 -03:00
Shaun Bennett	cb48df6a3d	Update fountain count every 5 seconds. Display Hologram	2016-04-19 14:30:38 +10:00
Shaun Bennett	5a667a7d31	Add /fountain command. Fountain implementation	2016-04-19 13:57:19 +10:00
AlexTheCoder	6c20427395	- Fixed some bugs and added final achievements	2016-04-18 22:32:15 -04:00
xGamingDudex	d9b6434bad	Typo in description	2016-04-18 23:24:59 +02:00
xGamingDudex	534a5dee4e	Forgot to remove debug message	2016-04-18 22:18:42 +02:00
xGamingDudex	591d3cadc9	Cleaned up some GUI stuff, mostly lores on items	2016-04-18 22:16:10 +02:00
AlexTheCoder	44263beb87	- Make elo store/recover properly	2016-04-17 17:34:18 -04:00
AlexTheCoder	ee30012011	Merge branch 'feature/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix	2016-04-17 12:27:23 -04:00
AlexTheCoder	d623d0982b	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge	2016-04-17 12:02:08 -04:00
AlexTheCoder	4c35e35fc0	- More polish and bugfixes	2016-04-16 23:59:44 -04:00
Shaun Bennett	4477a215f4	Update to Redis 2.8.1 and clean up repositories (#26 )	2016-04-16 22:51:20 -05:00
Shaun Bennett	fed9f675d3	Implementation for basic Fountains	2016-04-17 13:51:15 +10:00
Shaun Bennett	9c2cd6a883	Merge branch 'feature/redis-update' into feature/gems	2016-04-17 13:08:11 +10:00
Shaun Bennett	16dacbe3b3	Update to Redis 2.8.1 and clean up repositories	2016-04-17 12:58:44 +10:00
AlexTheCoder	b0d30a4ff4	- cleaned everything up - renamed game	2016-04-16 20:32:14 -04:00
Joseph Prezioso Jr.	bbb81dd663	Elo calls migrated to Game.java Consequently, elo code is actually being called now Bukkit.broadcastMessage calls have shown where things are breaking handleElo() added to EloManager to facilitate movement of team elo code preparing to use EloManager's getNewRatings() method to calculate team elos	2016-04-15 20:48:56 -04:00
xGamingDudex	ffc0459e5a	Cosmetic Update + Support for relative copy position from with //copy from worledit in schematics + Better block selection in bounding box in UtilBlock + Goal selector utils for entities + Global hide and show methods for players + Win effects and game modifiers + Tweaked player disguises + Added clean room generator to arcade games, previously normal flat world + Animation utils * Edited some particles, hats and death animations	2016-04-16 02:24:41 +02:00
Jonathan Williams	2b2b251548	Merge branch 'clans/beta' into develop	2016-04-15 12:41:14 -05:00
Jonathan Williams	b43953439e	Properly store teamId locally after registering for tournament. Use team id when unregistering for the tournament.	2016-04-15 12:36:28 -05:00
Jonathan Williams	cf3141ddc0	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop	2016-04-15 12:30:32 -05:00
AlexTheCoder	33b557eb10	- Huuuuuuuge amount of changes for chiss	2016-04-14 22:45:21 -04:00
Joseph Prezioso Jr.	4a4e64a3ff	EloRepository overhaul started Tinkering with EloRepository, using AccountRepository as a base	2016-04-14 20:09:09 -04:00
Jonathan Williams	64d5f91e8f	Remove TeamInvite table.	2016-04-14 18:49:20 -05:00
Joseph Prezioso Jr.	742807d80e	Added generatePlayerElos and updated saveDivision Added method to fill EloManager's playerElos hashmap with values --This may not work as intended --Currently only implemented in Team Death Match	2016-04-14 17:17:26 -04:00
Joseph Prezioso Jr.	eb67c12108	Added getRepoElo to EloRepository Added Bukkit.broadcastMessage() calls to test code Methods that needed to throw SQLExceptions now throw SQLExceptions	2016-04-14 15:21:28 -04:00
Jonathan Williams	3a26225ce2	Finished main tournament calendar UI. Added registration for tournaments.	2016-04-14 12:21:24 -05:00
cnr	ab21efd2ca	Give the correct amount of old/ancient chests for bonuses	2016-04-13 18:51:52 -05:00
Joseph Prezioso Jr.	9e8a7b582b	Elo updates EloRanking turned on for Domination, Team Deathmatch, Turf Wars, CTF Database QoL changes made to EloManager and EloRepository --Unfortunately, Database still seems to not be updating properly --Something on my end, or something to do with the queries? Unsure.	2016-04-13 18:35:56 -04:00
cnr	6d01e235fd	Fix online friends list Previously, it was incorrectly asserting that all players were incognito. If we want to exclude incognito players, we'll have to find a different way.	2016-04-13 17:24:46 -05:00
Jonathan Williams	85f4ff1299	Starting on Tournaments.	2016-04-13 17:14:48 -05:00
cnr	91c97e38b8	Prevent players from naming their pets "ULTRA" This was being used to fool support into thinking the player had won Ultra from a chest	2016-04-13 16:37:13 -05:00
Keir Nellyer	eb01cd41f1	Move display item responsibility over to ReportResultButton Previously ReportResultPage handled this.	2016-04-09 00:51:05 +01:00
Keir Nellyer	51b5e50c20	Use pre-existing util method for item building Removes util method added in previous commit.	2016-04-09 00:44:00 +01:00
Ben	4bf19eebad	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-09 00:37:40 +01:00
Keir Nellyer	56b0a886bf	Add helper method for setting common item meta values	2016-04-09 00:36:04 +01:00
Keir Nellyer	6efb8d806d	Re-enable category threshold check This was disabled for testing reasons.	2016-04-09 00:02:59 +01:00
Keir Nellyer	cb434b7518	We no longer need to store IDs or notify thresholds (new system will work differently)	2016-04-09 00:00:11 +01:00
Keir Nellyer	bd7e26ef08	Fix error causing enum readable names to fail to generate correctly	2016-04-08 23:49:07 +01:00
Ben	a04f7c23c6	Disable incognito for staff in hub invisibility, and vice-versa	2016-04-08 20:18:56 +01:00
Conrad S	8a2efa2f0b	Make sure a user has enough gold to make a purchase.	2016-04-08 10:48:55 -04:00
Keir Nellyer	95507a740c	Move button specific values from ReportCategory to ReportCategoryButton This is done to separate the code out so that we can add a GLOBAL value to the enum for handling of ABUSIVE reports (these types of reports do not have a specific category). In its current state it's is very closely inter-twined.	2016-04-08 00:33:29 +01:00
Keir Nellyer	c1354081ea	Implement ReportProfile This class is used to hold report-specific data about a user, such as the amount of successful or failed reports the user has filed. It also contains the total amount of abusive reports a user has filed, all this data will be used to calculate the user's reputation.	2016-04-07 22:45:15 +01:00
Ben	79a2ef3608	Fix staff members getting unhidden when in incognito whenever players are shown to the player (can happen when a regular player toggles player vision, and the staff member gets shown to all other players.)	2016-04-07 22:24:47 +01:00
Joseph Prezioso Jr.	59001bdef6	Fix merge-related errors Fix, polish, and re-implement Elo code.	2016-04-07 16:40:30 -04:00
Keir Nellyer	36e79a1504	Add header to every class as per new coding standards.	2016-04-07 14:44:27 +01:00
Keir Nellyer	390b2878dc	Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC 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-04-07 14:28:30 +01:00
Ben	eed3df720a	Disable incognito mode for staff members that have been demoted whilst using it. Also fixes a bug that caused IncognitoHidePlayerEvent fire even if the player logging in does not have incognito mode enabled.	2016-04-07 07:00:46 +01:00
Ben	3a8ab581dd	Add JavaDoc to new classes to comply with the new standards	2016-04-07 06:52:52 +01:00
Joseph Prezioso Jr	91e550bdcc	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/FinishCommand.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/TutorialCommand.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java	2016-04-06 19:40:01 -04:00
Joseph Prezioso Jr	f030f78f08	Add headers to new classes, so as to comply with coding standards. To that end, change methods to camel case and refactor them, so that the newly-renamed methods do not result in errors.	2016-04-06 16:20:26 -04:00
Ben	d75d63a81a	some missing files and blacklist barrier block from block toss	2016-04-06 18:26:56 +01:00
Joseph Prezioso Jr	09db5a8131	I'm committing this so I can checkout to a different branch	2016-04-05 16:41:50 -04:00
Ben	876a7a8eb6	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-04-05 12:37:23 +01:00
Ben	7f92a3c048	incognito changes	2016-04-05 00:38:27 +01:00
Jonathan Williams	2d296d9226	Removed debug ResourcePack Message	2016-04-04 17:45:34 -05:00
Jonathan Williams	efa18d394b	Fixed Incognito not saving status.	2016-04-04 17:45:10 -05:00
Jonathan Williams	02459c6a10	Fixed bad implementation of IncognitoManager that was locking up threads. Temporarily disabled MessageManager's handling of Incognito.	2016-04-04 13:48:26 -05:00
Jonathan Williams	1b1e6f6ef5	Moved the redis operation before asking for a mysql connection	2016-04-04 13:45:20 -05:00
Shaun Bennett	ff929a8515	Merge remote-tracking branch 'remotes/origin/develop' into clans/beta # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java # Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java	2016-04-05 00:57:28 +10:00
Shaun Bennett	e11a9379b9	More tutorial tweaking	2016-04-04 12:32:22 +10:00
Jonathan Williams	401127caa9	Reworked Monthly bonuses so they always succeed and it logs them.	2016-04-03 01:36:30 -05:00
Jonathan Williams	ff41ad248a	Removed PvpTimer Fixed issue where StatManager and FriendManager were created twice.	2016-04-02 02:47:17 -05:00
Jonathan Williams	fa6d18b0fa	Fix sync db call inside sendMessage	2016-04-01 22:43:09 -05:00
Cheese	8f959a73eb	debug	2016-04-02 12:46:25 +11:00
Cheese	9969b7d783	support for resource packs for different MC versions	2016-04-02 11:39:40 +11:00
Joseph Prezioso Jr	6e23a17acb	Removed unnecessary code.	2016-04-01 16:01:57 -04:00
William Burns	4ec833727f	PC-20 - Detailed Objective Text	2016-03-31 18:45:17 +01:00
Joseph Prezioso Jr	cbb9798c35	Added AdjustPlayertElo method to increment/decrement the Elo's of individual players at the end of a game. Currently calling the new method in AnnounceEnd.	2016-03-31 12:49:22 -04:00
Joseph Prezioso Jr	b1c29a4fa6	Setup proper Elo brackets with the top 1% being placed in diamond. Also changed starting Elo to 1400 (middle of Iron 1), leaving Coal as a purely regressive division.	2016-03-30 16:06:30 -04:00
Joseph Prezioso Jr	00ee594f28	Missed one file last time	2016-03-29 17:50:45 -04:00
Joseph Prezioso Jr	6048c97b52	Tweaks to clean/clarify things	2016-03-29 17:50:06 -04:00
Joseph Prezioso Jr	51cd770d38	Changes to help smooth the transition into using EloSettings.	2016-03-29 16:00:57 -04:00
Joseph Prezioso Jr	35fc5223b1	reverted previous changes back to lastIndexOf (and altered comments accordingly) on the advice of SJSampson (with whom Sigils agreed)	2016-03-29 14:03:21 -04:00
Joseph Prezioso Jr	0c479e1562	Made change to Elo calculation under Sigils' advisement. Now using indexOf, rather than lastIndexOf to find Elo	2016-03-29 14:00:59 -04:00
Joseph Prezioso Jr	f496392c5a	EloDivision class created. EloManager can now calculate division ranking (EloDivision can also do this once we are ready for it to)	2016-03-29 13:49:59 -04:00
Joseph Prezioso Jr	38a079846d	Some basic ideas for Elo I will be experimenting with	2016-03-28 18:14:52 -04:00
Shaun Bennett	caf8170a32	Tutorial Changes	2016-03-27 08:47:34 +11:00
William Burns	c1adb7e1bc	Remove Slack attachment functionality (for now).	2016-03-26 13:12:59 -04:00
William Burns	29966195ee	Create an API for sending Slack message to multiple teams and channels.	2016-03-26 13:07:41 -04:00
AlexTheCoder	6678dffb61	- Updated everything for Sigils and chiss	2016-03-25 20:25:43 -04:00
Ben	f000360565	missing a few files	2016-03-24 19:29:45 +00:00
Shaun Bennett	3d473ad00a	Merge remote-tracking branch 'origin/clans/beta' into clans/beta	2016-03-23 20:39:21 +11:00
git	4dd756286e	Fix small resource pack bug	2016-03-23 20:32:13 +13:00
Shaun Bennett	e8dcc4a3e2	Merge branch 'develop' into clans/beta # Conflicts: # Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java # Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java # Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2016-03-23 11:02:20 +11:00
Shaun Bennett	1e73adf2af	Increase ram and cpu for event server	2016-03-23 10:23:04 +11:00
Shaun Bennett	656780d027	Change runAsync in MiniPlugin to use our own thread pool This allows the tasks to run immediately. Using Bukkit's scheduler the async task wont start until the next server tick	2016-03-23 10:22:40 +11:00
Shaun Bennett	da9a642a6d	Process item for treasure before opening	2016-03-23 10:21:36 +11:00
Shaun Bennett	309b5464f2	Clean up Account Repository, attempt to load account ID from cache	2016-03-23 10:21:02 +11:00
Shaun Bennett	85cb065d5c	Merge pull request #14 from Mineplex-LLC/Dual_1.9 1.9 Bugfixes + Ring game	2016-03-22 19:25:37 +11:00
Shaun Bennett	61b79fab9d	Merge pull request #13 from Mineplex-LLC/PC-15 Fix PC-13, PC-15, PC-16, PC-17	2016-03-21 20:31:58 +11:00
md_5	55e64a09b9	Test Gem Booster Item	2016-03-21 20:08:40 +11:00
Jonathan Williams	b4dfeb224b	Reduced NCP exempt time by .5s.	2016-03-21 02:06:11 -05:00
Jonathan Williams	8427ead097	Changed how currency types is initialized to avoid possible NPE	2016-03-19 15:33:16 -05:00
Ben	995d454f87	tutorial additions.	2016-03-18 02:47:51 +00:00
Ben	a4cbe54c78	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java	2016-03-18 01:21:25 +00:00
Ben	2cf59ced8b	new pvp timer management, fixed build house task, fixed incognito	2016-03-18 01:18:35 +00:00
md_5	4899d56c09	Implement local gem boosters that can be activated on a joined arcade server.	2016-03-17 19:49:05 +11:00
Ben	add651780b	priority chat filters, fixed siege weapon clicking listeners being incorrect	2016-03-17 01:06:07 +00:00
Ben	93767b7a90	tutorial changes, chat filter system, commented out all web stuff for analytics.	2016-03-16 22:46:18 +00:00
Ben	0d237370e1	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-03-15 23:33:09 +00:00
Keir Nellyer	25075597f2	Only allow Ultra+ players to use /report whilst it's in beta testing.	2016-03-15 17:43:16 +00:00
Shaun Bennett	e53b8616d1	A ton of tutorial work	2016-03-15 10:29:43 -05:00
Ben	813a3833ae	implement temporary holograms	2016-03-15 00:48:50 +00:00
Ben	e08ba29ac1	Final fixing of cannon saving/loading	2016-03-14 22:48:31 +00:00
Ben	422df69335	incognito async stuff and updated alpha holograms	2016-03-11 21:50:48 +00:00
Ben	86c50cc3cd	updates	2016-03-11 19:03:32 +00:00
Shaun Bennett	1228ca227e	Add support for 1.9 resource packs, Text Tutorials	2016-03-11 11:50:08 -06:00
Ben	a27fb90c2a	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito	2016-03-11 02:21:03 +00:00
Ben	0e276474c5	fixerroooniissssss	2016-03-11 02:20:18 +00:00
Ben	01ba099d74	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito	2016-03-11 01:52:38 +00:00
Ben	c9eb2c9559	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito	2016-03-11 01:52:31 +00:00
Ben	57c65cf5ff	some changes and vanish fixes maybe?	2016-03-11 01:47:14 +00:00
Ben	a568db6d90	remove eclipse file	2016-03-11 00:43:30 +00:00
Ben	bcfe4a42c0	changerooonis	2016-03-11 00:41:28 +00:00
Ben	33d978c6d6	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-03-10 22:12:41 +00:00
Ben	20ade492a8	tnt generator changes	2016-03-10 22:09:45 +00:00
Shaun Bennett	76782fd420	Fix issues	2016-03-10 15:07:22 -06:00
git	557b0bf978	Fix Wither disguise	2016-03-11 01:55:49 +13:00
Ben	5b3da3d06f	Consistency. (Changed Vanish to Incognito)	2016-03-09 01:53:01 +00:00
Ben	befb27d3db	Finalized Vanish system	2016-03-09 01:45:17 +00:00
Virizion	b1c8158e2f	Added @a argument to /shard, /gem and /giveitem PC-13	2016-03-08 19:52:31 -05:00
Ben	abdf61de0a	more fixes	2016-03-08 21:02:25 +00:00
Ben	af8f0fff16	vanish error fixes	2016-03-08 21:00:19 +00:00
Ben	69091c079f	Merge branch 'feature/incognito' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta	2016-03-08 20:58:11 +00:00
Shaun Bennett	9b65926d42	Fix rank monthly rewards description	2016-03-08 13:26:26 -06:00
Ben	1f09616784	chat packet listener	2016-03-08 18:28:54 +00:00
Shaun Bennett	99c2fefed2	Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java	2016-03-08 12:27:45 -06:00
Ben	86ef10456c	packet hnadler beginning, switching to clans to fix errors	2016-03-08 18:10:57 +00:00
Ben	f24e196efd	Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito	2016-03-08 18:07:57 +00:00
Ben	036565abb7	more	2016-03-08 17:44:15 +00:00
Ben	0ff434cf91	progress	2016-03-08 16:49:32 +00:00
git	0f752fb7e3	Fix custom names in 1.9	2016-03-08 16:11:12 +13:00
git	280d03daa7	Fix names	2016-03-08 09:52:30 +13:00
git	496983ee04	Untested bugfixes	2016-03-07 22:29:14 +13:00
NewGarbo	ae2da31544	Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java	2016-03-05 23:14:32 +00:00
NewGarbo	d92f817efc	fixed some teleportation bugs and a bit of cleanup	2016-03-05 22:50:06 +00:00
git	6d0ca4f813	Merge branch 'Dual_1.9' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9 Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java	2016-03-03 13:49:31 +13:00
git	0ffa67dfb8	Ring game	2016-03-03 13:48:22 +13:00
NewGarbo	73d8870daf	nether work (forgot to commit days ago oops)	2016-03-02 19:42:53 +00:00
Shaun Bennett	3447354814	Dual 1.9 Fixes	2016-03-02 12:58:30 -06:00
Thanos paravantis	9a4f4dbd7c	Merge branch 'master' into thanos-mineware	2016-03-02 18:47:30 +02:00
Thanos paravantis	1e08e1a5db	Update player death handling, add aggressive chicken behavior, minor changes and refactoring.	2016-02-26 18:17:03 +02:00
Thanos paravantis	0e697e279b	Player death handling and chicken attack changes.	2016-02-25 23:35:38 +02:00
git	2a9d49ccd9	Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9	2016-02-25 18:11:12 +13:00
Thanos paravantis	27daace524	Rename game type to Bawk Bawk Battles, change item display to Egg.	2016-02-24 21:43:10 +02:00
NewGarbo	2956b18821	some hologram work	2016-02-23 18:45:04 +00:00
Keir Nellyer	70260754ff	Reset these files to their previous state (IDE added tabs).	2016-02-23 00:26:10 +00:00
Keir Nellyer	c923745f5f	Add required import.	2016-02-23 00:25:37 +00:00
Keir Nellyer	99150db2d7	Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java	2016-02-22 19:02:54 +00:00
xGamingDudex	33b3d121b3	Merge branch 'develop' into project-cosmetics Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatLovestruck.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSecretPackage.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleGreen.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHeart.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHelix.java	2016-02-20 15:30:26 +01:00
AlexTheCoder	3b7a7e457c	Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2016-02-20 03:20:27 -05:00
Shaun Bennett	82d51a896f	Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS	2016-02-19 19:54:06 -06:00
NewGarbo	67c355bf65	remove more eclipse files	2016-02-19 07:22:54 +00:00
NewGarbo	441cf702c7	Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha	2016-02-19 07:22:09 +00:00
NewGarbo	d5583b93f2	remove eclipse files	2016-02-19 07:14:13 +00:00
Shaun Bennett	7714e4960c	Use DBPool for everything	2016-02-19 00:17:38 -06:00
Shaun Bennett	eab992e621	Delete SimpleStats	2016-02-18 23:01:23 -06:00
md_5	6d81e43b30	Don't print db config to System.out	2016-02-19 15:30:30 +11:00
NewGarbo	8507bb1bd8	all progress over this week	2016-02-18 21:29:42 +00:00
libraryaddict	8b1b63c8b3	Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9 Conflicts: Patches/craftbukkit.jar	2016-02-18 16:45:37 +13:00
AlexTheCoder	9e2840b3b5	Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2016-02-16 21:28:07 -05:00
xGamingDudex	10e89a228e	Added some extra checks to Blood Should resolve possible NPE and Material.AIR issues along	2016-02-16 18:48:27 +01:00
md_5	8893db60d7	Fix highly annoying exception in Reindeer mount.	2016-02-16 12:46:39 +11:00
AlexTheCoder	53ac1827bc	Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2016-02-15 19:13:20 -05:00
Shaun Bennett	95c22a59fd	Use DNS for chat filter	2016-02-15 16:30:57 -06:00
Shaun Bennett	15ed2570e2	Valentines final changes, Change Gift Giver achievement	2016-02-15 20:43:46 -06:00
xGamingDudex	85b8937801	Hats, supposed to go in the previous one	2016-02-15 16:39:04 +01:00
xGamingDudex	7d8ffa1311	Small stuff	2016-02-15 16:38:18 +01:00
NewGarbo	e25accfba4	outpost saving and loadi9ng	2016-02-15 11:24:29 +00:00
AlexTheCoder	f6c38903f2	Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2016-02-13 14:34:11 -05:00
AlexTheCoder	ea893bfa48	- Fixed update	2016-02-12 23:03:38 -05:00
AlexTheCoder	197bcc9dbf	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla Conflicts: Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java	2016-02-12 21:23:58 -05:00
NewGarbo	e6eb43ada8	PUSHING CODE BECAUSE MY HDD MIGHT BE BREAKING DOWN. THIS CODE IS UNTESTED PROBABLY DOESN'T WORK	2016-02-12 19:58:40 +00:00
Shaun Bennett	0d19a8017f	Update Featured arcade game, various bug fixes	2016-02-12 06:51:30 -06:00
Shaun Bennett	1e596a6969	Valentines rewards	2016-02-12 04:54:09 -06:00
Shaun Bennett	66aa89b5e0	Fix sheep look bug, valentines gift effects, valentines achievements	2016-02-12 04:32:26 -06:00
Shaun Bennett	dfd61833b7	Valentines changes	2016-02-12 03:03:47 -06:00
Shaun Bennett	d8965179f7	More valentines adjustments/fix gladiators tutorial being enabled	2016-02-11 23:01:59 -06:00
Shaun Bennett	2eeddb828b	Merge pull request #165 in MIN/mineplex from virizion_speed_builder to develop * commit '51d152d48473f820ab6d03586fb41f890750f645': Perfect build all fix Only eliminated players are guardians. Broken blocks/mobs go directly into inventory. Stop mid game joiners from getting participation gems. Mob egg baby fix. Also fixed non build entities from being "broken" spec command add guardian The infamous look direction bounce bug Chiss' double jump mechanic Moar fixes Hopper item pickup fix.	2016-02-11 22:59:35 -06:00
Cheese	eebe25040e	cleaned the particle effects a bit	2016-02-10 16:31:25 +11:00
Shaun Bennett	e3ff25526b	Merge pull request #164 in MIN/mineplex from valentines/game to develop * commit '6800e4ef478e2d1eea5c19ec52a8368ec0bd520a': valentines final push bug fixes more valentines :) many valentine, such wow val1	2016-02-09 20:28:58 -06:00
Shaun Bennett	f6e091f029	Merge pull request #163 in MIN/mineplex from feature/valentines-cosmetics to develop * commit '57638ff68496b6f10012f8782633066b52a8a715': More work on valentines Valentines gifts Added love potion and hub sheep thing. Started on Love Potion system. Switching branches. Varius tweaks and changes. Added sheep mount to index. Added various cosmetic items for Valentines day.	2016-02-09 20:28:37 -06:00
Shaun Bennett	57638ff684	More work on valentines	2016-02-09 16:26:17 -06:00
Shaun Bennett	a868b8b2b8	Valentines gifts	2016-02-08 22:26:33 -06:00
xGamingDudex	c4da8ef636	Cosmetic Update + Set Storm + Set Shadow + Set Music + Set Emerald + Set Blood + Set Enchant + Particle Ying and Yang + Particle Wings Angel + Particle Wings Infernal + Particle Wings Pixie + Shape Utils * Particle Party Time * Particle Heart * Double Jump Firecracker	2016-02-08 00:21:47 +01:00
Virizion	008fc587b0	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2016-02-07 15:33:37 -05:00
Shaun Bennett	c059425e9d	Remove GiveawayManager (not used anymore)	2016-02-07 13:18:29 -06:00
Shaun Bennett	f502c2a693	Fix filtermessage sync calls	2016-02-07 12:15:08 -06:00
Mysticate	a8ff714ee4	Added love potion and hub sheep thing.	2016-02-07 10:19:40 -05:00
Mysticate	c1393697f8	Started on Love Potion system. Switching branches.	2016-02-06 14:08:17 -05:00
Mysticate	b414642990	Varius tweaks and changes.	2016-02-04 21:58:55 -05:00
Virizion	a76e570b8a	Moar fixes	2016-02-04 21:43:17 -05:00
Mysticate	e94222a68e	Added sheep mount to index.	2016-02-04 13:13:22 -05:00
Mysticate	c0d6cbbb85	Added various cosmetic items for Valentines day. - Heart arrow trail - Heart death animation - Heart double jump animation - Heart set - Cupid's bow gadget - Pink Sheep mount	2016-02-04 13:12:53 -05:00
Cheese	5c22c841fe	val1	2016-02-04 10:55:29 +11:00
Keir Nellyer	27fc81dd8b	Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report	2016-02-03 17:23:40 +00:00
Keir Nellyer	a8f9c91534	ReportServer: update package name and configure Maven to generate a META-INF file with the main class name included.	2016-02-02 22:28:18 +00:00
Thanos paravantis	854ebf70c4	Merge branch 'master' into thanos-mineware Conflicts: Plugins/Mineplex.Core/.classpath Plugins/Mineplex.Queuer/.settings/org.eclipse.jdt.core.prefs Plugins/Nautilus.Game.Arcade/.classpath Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java	2016-02-02 17:11:22 +02:00
Shaun Bennett	86917fb146	Fix treasure stair orientation	2016-02-02 05:50:03 -05:00
Shaun Bennett	af27944a39	add a shard queue to DonationManager, use that for TreasureShardReward	2016-02-02 05:34:33 -05:00
Shaun Bennett	1a9c36d0a1	Merge pull request #153 in MIN/mineplex from master to bugfix/duplicates * commit '3a945f190dca9f558cbcb6052b3eaa2816d112b3': (308 commits) Commons codec is not included in BungeeCord. Pooling with later jedis versions doesn't work on Bungee. Gitignore redundant Eclipse files. Add Eclipse magic. Speed up LobbyBalancer to 500ms Add example maven settings.xml Remove setTestOnBorrow Tone down lobby balancer too. Emergency patch to slow down redis player count updates. Fixed explosions dropping right items. sapling fix Update fixes - @Teddy! Made block define its own drops. Removed an nunnecesarry method Fixed items not dropping their regular counterpart. Final changes Prep for update Update CB.jar Prevent hearts changing colors in UHC tab. Fixed ForTheKing achievement. ...	2016-02-01 15:49:34 -06:00
Keir Nellyer	9601eabfeb	Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2016-01-31 17:38:08 +00:00
NewGarbo	cc857da88e	Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java	2016-01-31 16:27:14 +00:00
NewGarbo	002be01ef1	MAVEN TEST COMMIT	2016-01-31 16:21:04 +00:00
Shaun Bennett	c23855bd65	Merge with develop	2016-01-30 02:44:24 -05:00
md_5	7ed0ab442f	Emergency patch to slow down redis player count updates.	2016-01-30 12:36:20 +11:00
Keir Nellyer	8cf32ef8bf	Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report	2016-01-30 00:46:43 +00:00
Shaun Bennett	1c3c800a66	Update fixes - @Teddy!	2016-01-29 14:05:09 -05:00
Shaun Bennett	50fc1f5a10	merge with develop	2016-01-29 03:44:04 -05:00
Shaun Bennett	a1f9f41910	Merge remote-tracking branch 'origin/develop' into develop	2016-01-29 03:37:03 -05:00
Shaun Bennett	2e2a08bea8	Merge pull request #142 in MIN/mineplex from bugfix/coal-particles to develop * commit 'd1d3382ec065bb7c508044d53124266fda142c00': Prevented Coal particles from showing during the game	2016-01-29 02:33:57 -06:00
Mysticate	d1d3382ec0	Prevented Coal particles from showing during the game	2016-01-28 22:44:33 -05:00
Shaun Bennett	60ee5d1da0	Move disable custom inside of IsActive check	2016-01-28 22:33:48 -05:00
Shaun Bennett	40f6969413	Merge remote-tracking branch 'origin/develop' into develop # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2016-01-28 22:16:15 -05:00
Shaun Bennett	051d70771b	Facebook Command	2016-01-28 22:15:35 -05:00
Shaun Bennett	f72ee95759	Merge pull request #139 in MIN/mineplex from virizion_speed_builder to develop * commit 'b6db99806ab171774ffd9c9db11cf361ad76dc94': (83 commits) Remove debug message. Fix flickering judge laser. Borders for spec are fixed. Leaves fix. Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket. Make dependable require 50 perfect builds instead of 10. Multiply by less negative! Trying different hologram location Fix messages, fix /stats Center hologram Make achievement category classics hologram changes Holograms maybe? Chiss' checklist. Remove unnecessary tabs. Make the judge guardian use it's own laser again. Fixed builds with only mobs not loading. Fixed mobs. TICK TICK TICK TICK. all players equal, no one loses ...	2016-01-28 21:02:23 -06:00
NewGarbo	a0cc0b7ec9	Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/gameplay/Gameplay.java	2016-01-28 13:28:00 +00:00
NewGarbo	b5f04011e5	fixed chatslow not working + filter not working for players not in clan	2016-01-28 13:24:30 +00:00
Keir Nellyer	ac37417fca	Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report # Conflicts: # Plugins/.idea/modules.xml	2016-01-27 21:44:04 +00:00
Virizion	a1eec79b3b	Make dependable require 50 perfect builds instead of 10.	2016-01-25 16:43:43 -05:00
Shaun Bennett	616be8aea7	Fix messages, fix /stats	2016-01-25 03:59:37 -06:00
Virizion	2dcc356aab	Make achievement category classics	2016-01-25 04:33:25 -05:00
NewGarbo	33845cbc72	Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta	2016-01-25 08:48:13 +00:00
NewGarbo	5b32911a42	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha	2016-01-25 08:46:26 +00:00
NewGarbo	0252436990	cannons updates	2016-01-24 20:56:47 +00:00
Thanos paravantis	70588d81a8	Update /stats menu to display mineware achievements item.	2016-01-23 14:51:47 +02:00
Shaun Bennett	650d586e0f	Add perfect build count to stats	2016-01-23 02:49:08 -05:00
Shaun Bennett	231b8cb19a	Merge pull request #133 in MIN/mineplex from bugfix/foo to develop * commit '376f719c261bd2152a6646a152472a2485e1b689': fixes important bug, fixed a scary typo! Lots of typo fixes and such i before e! fixed cosmetic menu item dropping bug more grammatical errors hast been fixed Grammatical errors hath been fixed!	2016-01-22 18:38:26 -06:00
Shaun Bennett	ddc86f0897	Add Speediest Builderizer achievement	2016-01-22 19:13:23 -05:00
Virizion	5c83f5c1e5	Renamed to Speed Builders from Speed Builder.	2016-01-22 00:20:58 -05:00
Virizion	69825893c9	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2016-01-21 19:11:36 -05:00
Virizion	6ab6307f74	Pushing all my stuff for Shaunpai.	2016-01-21 19:08:38 -05:00
Shaun Bennett	877ec4710e	Removing duplicate NCP hooks	2016-01-21 17:22:10 -05:00
Shaun Bennett	3803a3d82e	Add player heads back to friends lsit	2016-01-21 17:19:51 -05:00
Shaun Bennett	0fd5540de6	Merge pull request #132 in MIN/mineplex from bugfix/give-item-offline to develop * commit '404e049c31df6d4278ee3ed46e7f0b8e2f92ee16': Give item fix for offline players	2016-01-21 15:44:34 -06:00
Shaun Bennett	a41816ca22	Include version.properties in Mineplex.Core	2016-01-21 16:37:35 -05:00
Shaun Bennett	a0f39bf36e	Merge remote-tracking branch 'origin/develop' into develop	2016-01-21 16:31:52 -05:00
Shaun Bennett	64ec092d09	Rename coin command to shard command	2016-01-21 09:10:39 -05:00
Keir Nellyer	dd0fc23467	Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report	2016-01-21 10:12:02 +00:00
md_5	447583624e	Fix ascii.png duplication.	2016-01-21 17:47:21 +11:00
Shaun Bennett	359655f417	Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop * commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa': Fix some misc suspicious calls to Collection methods.	2016-01-20 12:23:55 -06:00
Shaun Bennett	0a5791a92f	Go back to compile scope, need to talk to md_5 about this	2016-01-20 13:13:20 -05:00
Shaun Bennett	037a2f8353	Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command	2016-01-20 13:04:31 -05:00
Shaun Bennett	ea315a1447	Merge remote-tracking branch 'remotes/origin/md_5/maven' into develop # Conflicts: # Plugins/Libraries/craftbukkit.jar	2016-01-20 10:19:09 -05:00
Shaun Bennett	77d9f7cf32	Merge branch 'master' into develop	2016-01-20 10:12:20 -05:00
fooify	376f719c26	fixes important bug, fixed a scary typo!	2016-01-19 18:52:54 -08:00
md_5	bb4091c7a6	Use Maven for Compilation	2016-01-20 11:20:58 +11:00
Shaun Bennett	2b6074a210	Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command'	2016-01-17 22:46:56 -05:00
Thanos paravantis	821ff58ab0	Merge branch 'master' into thanos-mineware Conflicts: .gitignore	2016-01-17 14:03:00 +02:00
md_5	4927bb8c0b	Fix some misc suspicious calls to Collection methods.	2016-01-17 20:20:48 +11:00
Sarah	4a5d6b5f2a	Mysticates OCD....	2016-01-17 02:48:15 +01:00
xGamingDudex	6e6f46671b	Merge remote-tracking branch 'origin/develop' into project-cosmetics Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilColor.java Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCandyCane.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java	2016-01-16 14:46:47 +01:00
xGamingDudex	8ee485e44c	Progress	2016-01-16 14:43:14 +01:00
Shaun Bennett	404e049c31	Give item fix for offline players	2016-01-14 08:06:27 -05:00
Keir	53133d51ee	Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-01-13 11:47:13 +00:00
fooify	63897b9b54	Merge remote-tracking branch 'origin/develop' into bugfix/foo	2016-01-12 20:05:34 -08:00
Virizion	528a7435e7	Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder	2016-01-12 20:25:08 -05:00
NewGarbo	f3003e795e	Implemented Outpost MK III	2016-01-12 18:59:01 +00:00
NewGarbo	d3452772ed	outposts work (grr git is weird trying to switch over to clans/beta)	2016-01-12 07:02:03 +00:00
Shaun Bennett	3693a2b2c5	Merge pull request #122 in MIN/mineplex from bugfix/thanos to develop * commit 'ed439569453dc248623834af6fb553341779e46c': Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats. Remove unused imports. Prevent players from stacking others with a menu inventory opened. Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.	2016-01-11 16:26:09 -06:00
Shaun Bennett	025b87c806	Merge pull request #121 in MIN/mineplex from feature/mutedsign to develop * commit 'fa7eef504597011da14093fb76a8e088524eafd0': Muted players can't write on signs.	2016-01-11 16:23:34 -06:00
Keir	1c49e3a111	Make chat log clickable, only close report instruction line suggests command.	2016-01-10 21:28:57 +00:00
Mysticate	fa7eef5045	Muted players can't write on signs.	2016-01-10 13:13:38 -05:00
Thanos paravantis	ed43956945	Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.	2016-01-10 16:37:51 +02:00
Shaun Bennett	83e5c7399e	Fix YOUTUBE_SMALL preferences	2016-01-09 18:41:19 -05:00
Shaun Bennett	cd3037e7e5	Fix treasure purchases	2016-01-09 18:37:24 -05:00
Keir	bd865c7e64	Fix command permissions.	2016-01-09 23:12:08 +00:00
Keir	5f362a878a	Run some Redis functions async (as it sometimes blocks).	2016-01-09 22:21:15 +00:00
Keir	8b3bc7ca18	Fix timezone, correct url prefix and remove old debug code.	2016-01-09 21:51:54 +00:00
fooify	942460b471	Merge remote-tracking branch 'origin/develop' into bugfix/foo	2016-01-09 13:05:44 -08:00
xGamingDudex	f8e8669b5c	Added Party and Cupid set (arrow, jump, death, particle + full set effect)	2016-01-09 14:07:40 +01:00
Thanos paravantis	ba3e7cb197	Merge branch 'master' into bugfix/thanos	2016-01-09 12:23:54 +02:00
Shaun Bennett	2df626b35e	Fix CustomDataManager crash	2016-01-08 18:06:33 -05:00
Shaun Bennett	511b39caa7	Merge branch 'master' into develop	2016-01-08 17:05:54 -05:00
Keir	7ce028203b	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report	2016-01-08 13:59:43 +00:00
Teddy	43fb04b482	Import clean up	2016-01-08 13:46:57 +00:00
Teddy	78405749a4	Changed TreasureShard rewarding, removed Queue	2016-01-08 13:46:39 +00:00
Shaun Bennett	a75e2c15b8	Merge remote-tracking branch 'origin/develop' into develop	2016-01-08 06:35:37 -05:00
Shaun Bennett	15109707f3	Merge pull request #119 in MIN/mineplex from clans/alpha to develop * commit '025615d080b8b925f319a2f7707d2c3fa4755a88': Clans Alpha 0.18b fixes	2016-01-08 05:34:35 -06:00
NewGarbo	025615d080	Clans Alpha 0.18b fixes	2016-01-08 11:24:36 +00:00
Shaun Bennett	0a56a838d2	Fix ClansLoginManager, Remove pointless code in CoreClientManager	2016-01-08 05:45:49 -05:00
Shaun Bennett	1d2f61db8c	Disable purchasing Christmas Treasure	2016-01-08 03:15:05 -05:00
Shaun Bennett	b6b455c1c0	Merge pull request #117 in MIN/mineplex from clans/alpha to develop * commit '15d2118bc1701b79576f6d73dc1d4aeca500f11e': (23 commits) Added C.Mod rank, and started on rank info. changed outpost forcefields to be a bit larger to surround the outpost more. made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request. added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around. fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost) fixed outpost being built instantly on output block place. holograms above outpost block should be centered in the block and made them despawn on outpost death legendary pickkup message fix (FINALLY FIXED NOW ) quick modification to outposts, and fixed the legendary announcements being weird updated clans version quikc change outpost changes, and some other things lots of work on outposts, fixed gold dupe glitch, fixed clans ban gui title being "Customize New Gear". fixes (?) lots of changes that i can't remember at this point Lots of changes, specifics: Fixed clans having more than max energy. Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory. /c <clan> now works with clans with 18+ players. player gold exploit checking. i know this code is strange but please don't delete it. we need it for now. a couple more prettificatons to pvp timer messages. one more quick message change/fix qa changes to pvp safety ...	2016-01-08 00:35:15 -06:00
Teddy	6bf0970dbe	Unused import removed	2016-01-07 19:52:04 +00:00
NewGarbo	d88b14d9d6	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha	2016-01-07 09:35:07 +00:00
NewGarbo	52c4a55180	outpost changes, and some other things	2016-01-06 22:32:36 +00:00
libraryaddict	c920d4efa1	Modify MapText to actually work, modify UtilText to save the images of characters	2016-01-07 04:48:44 +13:00
Teddy	99f0404fff	Queue speed up	2016-01-05 21:05:02 +00:00
Teddy	e2824dd0e0	Debugs removed	2016-01-05 21:01:51 +00:00
Teddy	d4fd6a6bf7	Treasure not giving Shards when dupes occur, fixed.	2016-01-05 21:00:43 +00:00
Thanos paravantis	101caf12ff	Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.	2016-01-05 20:48:28 +02:00
Sarah	db2cddc443	Fixing Join/Quit messages	2016-01-05 19:10:40 +01:00
Teddy	d819671d16	Queue implemented for duplicate shard reward	2016-01-05 16:21:34 +00:00
Shaun Bennett	a73309fc11	Merge remote-tracking branch 'origin/develop' into develop	2016-01-04 18:14:10 -05:00
Shaun Bennett	f749300d48	Fix team stats not displaying properly	2016-01-04 18:13:54 -05:00
Shaun Bennett	10eb65a8d6	Merge pull request #114 in MIN/mineplex from bugfix/disguise-command to develop * commit 'dd6d7b1b96947a400911bc5fa310039ab147c159': updating denial message Love you Sarah <3 Fixing Disguise File update /Disguise for Hub as well updating /disguise	2016-01-04 15:58:43 -06:00
Shaun Bennett	ed81411373	Fix carl bonus messages	2016-01-04 15:58:27 -05:00
Keir	7d16aeb84d	Cache private messages for chatsnap reports.	2016-01-04 18:04:47 +00:00
Keir	80c389faf4	Make private message event implement cancellable.	2016-01-04 17:59:16 +00:00
Thanos paravantis	5ac841dbf1	Merge branch 'master' into thanos-mineware	2016-01-02 16:34:30 +02:00
NewGarbo	b47665e115	lots of work on outposts, fixed gold dupe glitch, fixed clans ban gui title being "Customize New Gear".	2016-01-02 14:02:50 +00:00
Morten	7e1b0b9110	Love you Sarah <3	2016-01-02 03:19:39 +01:00
Shaun Bennett	8232d11cd1	Remove in game notifications, change sale message	2015-12-31 15:07:26 -06:00
Shaun Bennett	456b0dbeb7	Merge pull request #110 in MIN/mineplex from feature/MasterBuilder-Unban to develop * commit 'f83016e0074ce810f727276a0feb127ecd69098f': Also really quickly fixed the Invisibility in lobby bug (hopefully) Removed a weird query :/ Finished up the Unban feature... Added a feature to unban clients across the network But there still a bug when you type a username of a none registered member. Will fix ASAP - likely after Mineware	2015-12-31 11:27:08 -06:00
Keir	3496abe227	Java 8 goodness.	2015-12-30 21:41:24 +00:00
libraryaddict	92c4450eea	Update the dual version	2015-12-30 21:12:11 +13:00
Keir	2716039d07	Small cleanup.	2015-12-29 23:49:57 +00:00
Keir	5841ab1101	Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2015-12-29 23:47:00 +00:00
Keir	dffd7d95ec	Don't include sender in recipients.	2015-12-29 23:35:54 +00:00
Shaun Bennett	55cdf4148a	Merge branch 'develop'	2015-12-29 03:21:03 -06:00
Shaun Bennett	7104f1363a	Give YT rank access to extra preferences	2015-12-29 00:34:18 -06:00
Keir	278932b9b8	Use CST timezone.	2015-12-29 05:23:18 +00:00
Keir	912b4aa4c8	Get Redis connection data from redis-servers.dat file.	2015-12-29 05:19:56 +00:00
Thanos paravantis	317f5799fe	Fix classpath on mineplex core.	2015-12-26 12:54:47 +02:00
Thanos paravantis	499ad655c9	Merge branch 'MortensRawBugFixes' into thanos-mineware Conflicts: Plugins/Mineplex.Core/.classpath	2015-12-26 12:29:26 +02:00
Thanos paravantis	dcff689faf	Merge branch 'master' into thanos-mineware Conflicts: Plugins/Mineplex.Core/.classpath Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2015-12-26 11:55:57 +02:00
Keir	cc421c1435	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report # Conflicts: # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2015-12-24 21:19:30 +00:00
fooify	41f56e9853	Lots of typo fixes and such	2015-12-24 11:13:54 -08:00
libraryaddict	2d974a781f	Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9 Conflicts: Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2015-12-24 14:06:59 +13:00
NewGarbo	369687b5dd	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha Conflicts: Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs	2015-12-23 18:31:51 +00:00
NewGarbo	ff24ebc9f4	lots of changes that i can't remember at this point	2015-12-23 18:22:20 +00:00
Morten	8c399f03da	Removed a weird query :/ Status: Finished	2015-12-22 21:36:19 +01:00
Morten	9336eb19fa	Finished up the Unban feature...	2015-12-22 21:31:57 +01:00
fooify	0ac2158988	i before e!	2015-12-22 11:02:57 -08:00
fooify	255dd0bdb3	fixed cosmetic menu item dropping bug	2015-12-22 11:02:37 -08:00
fooify	592fcbd282	Merge remote-tracking branch 'origin/develop' into bugfix/foo	2015-12-22 10:55:11 -08:00
fooify	a8d9956846	more grammatical errors hast been fixed	2015-12-22 10:35:20 -08:00
Virizion	0322ae1217	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java	2015-12-22 00:02:21 -05:00
Shaun Bennett	2ccd7a5de0	Fix Type Wars stat icon	2015-12-21 13:20:04 -05:00
Shaun Bennett	c63014b51f	Type-Wars merge	2015-12-21 12:49:10 -05:00
Sarah	a5436d63c0	Updating Holiday Achievements	2015-12-21 18:45:26 +01:00
Sarah	7c66bdbbde	Updating Stats GUI	2015-12-21 18:25:44 +01:00
Sarah	010b1b0a5d	Achievements....	2015-12-21 18:08:11 +01:00
Sarah	6e3274ff2f	changing Category	2015-12-21 18:06:00 +01:00
Sarah	f15c318e5c	adding PM message.	2015-12-21 18:02:25 +01:00
Sarah	590da2128c	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java	2015-12-21 17:43:51 +01:00
Morten	1726aa2530	Added a feature to unban clients across the network But there still a bug when you type a username of a none registered member. Will fix ASAP - likely after Mineware	2015-12-21 12:58:19 +01:00
Shaun Bennett	fae2a5d2bf	Update game display	2015-12-21 04:40:30 -05:00
Shaun Bennett	a235103066	Merge pull request #106 in MIN/mineplex from update-menu to develop * commit 'f4050fb1ff54dbe4639b0258eff53360d800d0b9': Adjust GUI, fix beta button Yo shaun debug this m8 ty	2015-12-21 03:36:46 -06:00
Shaun Bennett	99285b2ac8	Merge remote-tracking branch 'remotes/origin/type-wars' into develop # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java	2015-12-21 03:50:55 -05:00
Mysticate	0f5be6444b	Yo shaun debug this m8 ty	2015-12-21 02:23:59 -05:00
Morten	c683ce5f0a	Improved minors bugs and implemented a more efficient Challenge rotation system	2015-12-20 21:08:32 +01:00
fooify	fe658b30a1	Grammatical errors hath been fixed!	2015-12-19 15:03:42 -08:00
Morten	7c52b813f9	Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes # Conflicts: # Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBouncingBlock.java	2015-12-19 23:32:21 +01:00
AlexTheCoder	66c9fa122c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2015-12-18 21:33:59 -05:00
Virizion	a5c18f4677	Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder	2015-12-18 20:05:03 -05:00
William Burns	c2e88c2794	Merge branch 'develop' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data	2015-12-18 18:16:32 +00:00
William Burns	13cfc0e12a	Updated to a better check	2015-12-18 18:16:20 +00:00
NewGarbo	1840572c49	Lots of changes, specifics: Fixed clans having more than max energy. Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory. /c <clan> now works with clans with 18+ players.	2015-12-18 11:13:38 +00:00
Shaun Bennett	298ea1e5e6	Merge pull request #101 in MIN/mineplex from update-paintball to develop * commit 'd561915fd32885036b55cc6a05899934a544e131': FORMATTING CHANG EI'M GOING TO CRY UGH DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D Changed dns api key to new key. Prevent server monitor redis calls to cause restarts. Added winter chests to customer support. Epic chnage that saved the day omg Die player cache Quick changes to improve things. Uncommented bouncy balls Final tweaks to random armorstand Quick thing before merge Worked on double. Switching branches Formatting Reformatted Fixed paintball to the max. :>> Class Switching branches c: Sniper work Work. Deemed unsuitable due to an issue with the paintballs flying wide. Added a sniper kit! :D	2015-12-17 23:32:22 -06:00
Shaun Bennett	f80648bfbc	Update DBPool to load from file	2015-12-18 00:32:07 -05:00
Mysticate	2bf734a15c	DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D	2015-12-17 23:08:07 -05:00
Virizion	806b656dcf	Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder	2015-12-17 21:56:01 -05:00
Virizion	7621fe793d	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-17 21:50:32 -05:00
Mysticate	066d0a861f	Merge remote-tracking branch 'origin/master' into update-paintball	2015-12-17 21:00:15 -05:00
Jonathan Williams	c2fb6e6c15	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-17 18:34:25 -05:00
Jonathan Williams	2953fe395f	Changed dns api key to new key. Prevent server monitor redis calls to cause restarts. Added winter chests to customer support.	2015-12-17 18:33:49 -05:00
William Burns	3e8c3cb928	Changed to setData in PlayerCustomData	2015-12-17 22:16:05 +00:00
William Burns	2ac28c4fd5	Merge branches 'develop' and 'feature/player-data' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2015-12-17 21:44:31 +00:00
William Burns	5c045bfce4	Changes to core client manager, and finishing custom data!	2015-12-17 21:27:44 +00:00
libraryaddict	7f188072ad	Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop	2015-12-18 10:03:41 +13:00
libraryaddict	66372c397b	First version of ResourcePackManager that handles all resource packs globally	2015-12-18 10:03:03 +13:00
Thanos paravantis	9a1a652e85	Merge branch 'master' into thanos-mineware Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerTypePage.java Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs	2015-12-17 20:54:28 +02:00
William Burns	7d9b97180d	Testing ArcadePlayer implementation	2015-12-17 01:48:55 +00:00
William Burns	ee202bc7f5	Add MineplexPlayer -> ArcadePlayer	2015-12-16 22:32:34 +00:00
William Burns	370c59ce75	Added custom data	2015-12-16 21:52:41 +00:00
Sarah	4e9e0243cd	Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into type-wars # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java # Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java	2015-12-16 18:16:08 +01:00
Keir	db5327d2e4	Online reports can now be updated without re-sending all the data (ie we don't want to update all the chat messages when a member of staff handles a report). Misc. changes and fixes.	2015-12-16 15:51:01 +00:00
Keir	cd18d2a94f	ReportServer fixes and improvements.	2015-12-16 15:05:00 +00:00
William Burns	baf0f254bb	Custom data, waiting for JLO	2015-12-16 14:41:57 +00:00
Morten	ba7c4dc4ce	Small fixes	2015-12-16 15:41:08 +01:00
Keir	6f82f8349d	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report # Conflicts: # Plugins/.idea/modules.xml # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java	2015-12-16 14:07:56 +00:00
Virizion	7fa1963268	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-15 23:06:13 -05:00
Mysticate	d16dd4a9d2	Merge remote-tracking branch 'origin/master' into update-paintball	2015-12-15 19:35:55 -05:00
Keir	b5149d2da7	Implemented williams frontend design.	2015-12-16 00:22:55 +00:00
Mysticate	b36bf37197	Merge remote-tracking branch 'origin/master' into update-paintball	2015-12-15 19:22:38 -05:00
Keir	6d9bcb8e66	Reworked serialization and store more data in json files for later parsing. Internally store UUIDs for reports and convert them as needed for display to user. Many other misc. changes and refactorings.	2015-12-15 21:30:45 +00:00
Shaun Bennett	211e440e67	Merge remote-tracking branch 'remotes/origin/master' into develop # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java	2015-12-15 15:00:14 -05:00
Shaun Bennett	aef704d972	Slight winter reward rarity changes	2015-12-15 14:58:09 -05:00
Shaun Bennett	5f14d6675f	Fix shard values	2015-12-15 14:56:19 -05:00
Shaun Bennett	07f610d4bd	More Fixes	2015-12-15 14:45:12 -05:00
Shaun Bennett	607c164753	Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop	2015-12-15 13:55:01 -05:00
Shaun Bennett	b9a688c4e7	Update monthly bonuses	2015-12-15 13:07:49 -05:00
Shaun Bennett	e3e757da8a	Fix mounts owned count	2015-12-15 13:06:11 -05:00
Shaun Bennett	3edba0fac6	Fix Grinch Hat	2015-12-15 12:28:06 -05:00
Shaun Bennett	f2107b7b79	Merge remote-tracking branch 'origin/develop' into develop	2015-12-15 12:07:40 -05:00
Shaun Bennett	2216fdc52c	Dont disable new gadgets in games	2015-12-15 12:07:34 -05:00
NewGarbo	c63bac6433	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-12-15 11:42:16 +00:00
libraryaddict	47ad563596	Spawn nametags far far away from players	2015-12-15 22:46:30 +13:00
Cheese	871c97f7af	changed chest %'s	2015-12-15 09:25:44 +11:00
NewGarbo	9137fcfe40	loads of changes (pvp timer, unsafe stuff)	2015-12-14 12:39:00 +00:00
AlexTheCoder	73c84c530e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2015-12-14 06:40:16 -05:00
Cheese	0f38c7b287	increased minimum coal	2015-12-14 22:12:50 +11:00
Cheese	951cd65903	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-14 22:05:22 +11:00
Cheese	045bc760c2	increassed cooldown, people getting trapped perm	2015-12-14 22:05:08 +11:00
Cheese	809ff649be	lowered rarities a bit	2015-12-14 22:03:09 +11:00
Shaun Bennett	7181a26e58	Remove pointless equals()	2015-12-14 05:56:39 -05:00
Cheese	9e72e5adf1	nicer text	2015-12-14 21:43:11 +11:00
Cheese	daa9f165b1	removed coins from gadgets	2015-12-14 21:41:47 +11:00
Cheese	0ecd5a05f5	fixed hat ownership reduced coal cost	2015-12-14 21:32:06 +11:00
Cheese	00de6880ba	fixed wrong types	2015-12-14 21:25:30 +11:00
Cheese	342e9f2345	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-14 20:53:49 +11:00
Cheese	1189535748	icon fixes	2015-12-14 20:53:34 +11:00
Shaun Bennett	816c057eb3	Notify server about opening chest	2015-12-14 04:49:44 -05:00
Shaun Bennett	daf1d29ce0	Fix Carl	2015-12-14 04:44:11 -05:00
Shaun Bennett	50bf97ae4a	Fancy treasure changes	2015-12-14 04:19:15 -05:00
Cheese	670eaa1954	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-14 19:16:03 +11:00
Shaun Bennett	e4fd97467f	More treasure changes	2015-12-14 03:14:52 -05:00
Cheese	288c20fc74	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-14 19:13:05 +11:00
Cheese	9e35399d1d	rarities tweaked + shards	2015-12-14 19:09:55 +11:00
Shaun Bennett	db9db558a0	Update GUI slots	2015-12-14 02:56:07 -05:00
Shaun Bennett	4afca01ad0	Treasures!	2015-12-14 02:49:51 -05:00
Cheese	c508b5ea96	chest visuals	2015-12-14 18:13:19 +11:00
Shaun Bennett	063c87c4fe	Merge remote-tracking branch 'origin/master'	2015-12-14 00:29:11 -05:00
Shaun Bennett	cdbcae7e3e	Cosmetic Menu Update	2015-12-14 00:28:28 -05:00
Cheese	048a9a81b8	gadget ammo should no logner be purchasable	2015-12-14 16:20:39 +11:00
Virizion	09643d3e61	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-14 00:08:32 -05:00
Cheese	7f9e5c4ec9	more coal	2015-12-14 16:06:49 +11:00
Cheese	f6f04fe256	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-14 16:04:05 +11:00
Cheese	55fffdad59	fixed some colors	2015-12-14 16:03:51 +11:00
Virizion	b3b41e453b	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-14 00:01:41 -05:00
Shaun Bennett	e8b0e5dd8e	Fix IntellIJ Files	2015-12-13 23:51:47 -05:00
Cheese	bccade55bc	reduced coal fumes size	2015-12-14 15:43:45 +11:00
Shaun Bennett	5be91de006	Merge master	2015-12-13 23:40:18 -05:00
Shaun Bennett	fe3431ba04	Cosmetic Menu Update	2015-12-13 23:31:21 -05:00
Cheese	1073981778	Merge branch 'master' into update-xmaschaos	2015-12-14 15:30:15 +11:00
libraryaddict	b5bdf7ced4	Remove custom name on players on join and arcade spectator	2015-12-14 15:42:32 +13:00
Mysticate	90145bf8e7	Merge branch 'master' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into update-xmaschaos Conflicts: Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java	2015-12-13 18:57:35 -05:00
Mysticate	35ab40727b	XMAS UPDATE OMG :O	2015-12-13 18:55:21 -05:00
xGamingDudex	64fb2b11d8	Added fake skin data +Moved hats to use fake non-changing skin data +Added Rudolph hat +Added Grinch hat +Added suport for fake skins on DisguisePlayer +Tweaked PartyPopper	2015-12-13 23:09:25 +01:00
Virizion	8bcc36adb1	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-13 01:39:42 -05:00
libraryaddict	e7213fdb7e	Remove project specific settings	2015-12-13 16:41:37 +13:00
libraryaddict	9058428484	Change ItemBuilder to have ItemFlag, change hub icons to not display weapon damage	2015-12-13 16:40:46 +13:00
AlexTheCoder	cf05cf5d7b	- All finished - Added method for disabling explosion manager miniplugin	2015-12-12 05:12:17 -05:00
AlexTheCoder	49186680f0	- Game ID conflict resolution	2015-12-12 00:31:13 -05:00
AlexTheCoder	31be60bdb4	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2015-12-12 00:25:24 -05:00
Virizion	7a82cf04f0	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-11 23:02:16 -05:00
Shaun Bennett	c470ad880d	Merge pull request #77 in MIN/mineplex from foo to master * commit 'd7497ec09881047d7461630fac2c3b51bf37a06c': (23 commits) Fixed Micro Battle icon not appearing in stats menu Gravity's icon changed to ENDER_PORTAL_FRAME world's smallest bugfix - admin->co-host Fixed advertisement being able to be bypassed by spec and instant join fixed naming pets non-alphanumeric characters changed reference to premium ranks removed important debug thing fixed ssm enderman always facing south on teleport fixed bacon blast exloding blocks fixed shield smash and fissure affecting spectators fixed slab issue with Assassin's Flash Re-fixed Barbarian bug Fixed SG Barbarian bug SSM bug fix: magma cube flame dash doesn't make player invisible fixed several smash bugs and one global issue Slightly bumped Monster Maze jump time value fixed bridge bug "Death Bomber counts suicides as well" typo fix in legendary aura description Update achievement kit reference text Fixed tnt bug (SG) ...	2015-12-11 18:57:18 -06:00
Morten	5ca997f2a8	Merge branch 'BotspamImprovement' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes # Conflicts: # Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java	2015-12-12 00:11:27 +01:00
Morten	cecc7d8141	Updated to JAVA 8... Weird bugs happened :(	2015-12-12 00:06:28 +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
xGamingDudex	ba087d119a	Small tweaks	2015-12-11 17:31:05 +01:00
Thanos paravantis	d4fd466029	Update local workspace with new Eclipse version.	2015-12-11 17:10:00 +02: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
Thanos paravantis	3f4980a90f	Merge branch 'master' into thanos-mineware	2015-12-11 13:32:24 +02:00
Thanos paravantis	0b56c01c2f	Commit before pulling from master.	2015-12-11 13:30:20 +02:00
Shaun Bennett	ac6d3c2c8f	merge with master	2015-12-11 06:27:23 -05:00
Cheese	7c432461c9	changed coal item rewards to 3 tier :)	2015-12-11 22:25:14 +11:00
Cheese	e01a5369fd	set bonuses item gadget gui update	2015-12-11 21:53:39 +11:00
Cheese	40c2fdc3fc	fixed suits	2015-12-11 21:11:35 +11:00
Cheese	d7f39bdfd8	costume sets	2015-12-11 20:59:55 +11:00
Cheese	7fc08f34a7	fixed typo	2015-12-11 20:34:01 +11:00
Cheese	f717a5f8cc	more set stuff	2015-12-11 20:30:41 +11:00
Cheese	0cda29e135	improved cosmetic set implementation	2015-12-11 20:08:36 +11:00
Cheese	a6f664006f	set display in gui	2015-12-11 20:01:54 +11:00
Cheese	d8a5edf9e9	fixed up gui items	2015-12-11 19:24:19 +11:00
Cheese	61a8d2825e	gadget gui overhaul	2015-12-11 19:20:13 +11:00
Jonathan Williams	95a81ef368	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java	2015-12-11 01:26:20 -05:00
Jonathan Williams	222173ab17	Improved and implemented GameProfile caching.	2015-12-11 01:24:59 -05:00
Jonathan Williams	b5c157c123	Changed PlayerCache to Cache	2015-12-11 01:24:16 -05:00
Cheese	98e91d29f6	more cosmetic stuff :)	2015-12-11 17:21:54 +11:00
Cheese	7f8c9c02bc	and the mounts	2015-12-11 16:38:44 +11:00
Cheese	fe7ce40783	finished cosmetic names	2015-12-11 16:31:15 +11:00
Cheese	05a80b23a1	converting gadget text. (kill me now)	2015-12-11 16:07:02 +11:00
Cheese	88f44a293b	candy!	2015-12-11 15:31:35 +11:00
Cheese	3447de9a92	Merge branch 'master' into project-cosmetics Conflicts: Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java	2015-12-11 15:20:50 +11:00
Cheese	a5b28422cd	cosmetics	2015-12-11 15:19:20 +11:00
AlexTheCoder	33f73aebe5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2015-12-10 23:17:59 -05:00
Shaun Bennett	4588091c5b	Merge remote-tracking branch 'origin/master'	2015-12-10 23:15:42 -05:00
Shaun Bennett	21c8a66917	Fix imports	2015-12-10 23:15:35 -05:00
Shaun Bennett	1ab13d2ef5	Treasure Shards!	2015-12-10 22:52:15 -05:00
AlexTheCoder	6878e4489d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2015-12-10 22:49:19 -05:00
AlexTheCoder	fe933913e8	- Fixed maps - Spawners	2015-12-10 22:48:57 -05:00
Virizion	14b5a9453a	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-10 22:18:00 -05:00
William Burns	a760dba783	i lied.	2015-12-11 02:59:16 +00:00
William Burns	7a597d90b7	final push goodnight	2015-12-11 02:48:06 +00:00
Shaun Bennett	5a1892e1ed	Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics	2015-12-10 21:32:14 -05:00
Shaun Bennett	d6aed5dff7	More work	2015-12-10 21:32:10 -05:00
Cheese	31cea3342e	some gadget stuff	2015-12-11 13:17:38 +11:00
Shaun Bennett	ffd4658740	Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics	2015-12-10 21:06:50 -05:00
Shaun Bennett	2694787590	Reverting	2015-12-10 20:59:57 -05:00
Shaun Bennett	cf73d27a84	Merge remote-tracking branch 'origin/master'	2015-12-10 20:53:42 -05:00
Shaun Bennett	4d05bd5c50	Player count for chiss	2015-12-10 20:53:38 -05:00
Shaun Bennett	16f39c1e71	Pushing changes to go help william	2015-12-10 20:51:34 -05:00
William Burns	626a812844	Many changes	2015-12-11 00:40:54 +00:00
Shaun Bennett	4d8b8bd58b	Fix errors, update cosmetic menu	2015-12-10 19:27:32 -05:00
Shaun Bennett	a9e6224eca	Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2015-12-10 19:21:33 -05:00
Shaun Bennett	7b4f5d5b75	Christmas chest in gui	2015-12-10 19:19:20 -05:00
Shaun Bennett	72a8aaf556	Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2015-12-10 19:18:49 -05:00
xGamingDudex	44a244caf4	Merge branch 'project-cosmetics' of http://JustSomeDude@184.154.0.242:7990/scm/min/mineplex.git into project-cosmetics	2015-12-11 01:10:54 +01:00
xGamingDudex	a6a4c8be36	Cosmetic Update + Added GadgetDisable Event + Renamed GadgetActivateEvent to GadgetEnable event + Added hat framework, and some example hats + Added sets and Frost Lord set + Fixed some imports + Added new way of checking ownership of gadgets + Added some utility methods to GadgetManager + Added support for alternative package name of gadgets + Fixed coal + New Blood Helix particle	2015-12-11 01:05:32 +01:00
Shaun Bennett	d16d9a36e9	Use Account ID from client manager instead of PlayerCache	2015-12-10 17:25:39 -05:00
Shaun Bennett	851b613d2e	Now playing fix	2015-12-10 17:04:15 -05:00
Sarah	0f8028f6e6	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java	2015-12-10 12:24:11 +01:00
Thanos paravantis	e17669427e	Merge branch 'master' into thanos-mineware Conflicts: Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs	2015-12-10 10:03:41 +02:00
Sarah	c94c84f203	Some fixes	2015-12-10 02:59:22 +01:00
Sarah	76b29756ff	Fixing some stats and disabling Chat spam messages.	2015-12-10 02:02:36 +01:00
Keir	8459cf0f95	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java	2015-12-09 18:13:26 +00:00
Keir	54157024f7	Committing current progress, can't afford to lose this again	2015-12-09 18:06:04 +00:00
Virizion	507761d5b0	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-08 21:24:21 -05:00
William Burns	d709071feb	Much fix, many wow.	2015-12-08 23:20:42 +00:00
Shaun Bennett	7f75749194	Merge remote-tracking branch 'origin/master'	2015-12-08 16:55:14 -05:00
Sarah	484dce18e1	Changing some Achievement things, to allow double values and dividing, Adding WPM, fixing some bugs.	2015-12-08 22:34:42 +01:00
Cheese	fba88ec231	mount stuff is fixed	2015-12-09 08:19:55 +11:00
Virizion	8051486fcb	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-08 16:14:41 -05:00
Shaun Bennett	ca71f1f64f	Merge remote-tracking branch 'origin/master'	2015-12-08 14:32:17 -05:00
William Burns	f8f95c64e5	Fixing arena moving	2015-12-08 15:10:29 +00:00
Shaun Bennett	a1915e324c	Some java 8 code	2015-12-08 08:42:45 -05:00
xGamingDudex	b1536547d3	Cosmetic Update 2 + Item Coal + Freeze Cannon + Party Popper / Party Bomb + Snowball + Coal Fumes Particle + Snowman sneak trail/glide + Teaked stuff	2015-12-08 00:50:08 +01:00
Keir	529eab5aef	Improved the report php code, made it more object orientated. Commented out debug code.	2015-12-07 23:43:29 +00:00
Shaun Bennett	42a0354c9e	Now Playing, Preference to disable ads	2015-12-07 18:28:05 -05:00
William Burns	55f0453897	Start of re-write	2015-12-07 23:20:03 +00:00
Virizion	ec4a21a282	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-07 18:19:16 -05:00
Keir	d38ce9ef1e	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report	2015-12-07 18:54:53 +00:00
Shaun Bennett	8ff034fb5d	Merge pull request #89 in MIN/mineplex from clans-beta to master * commit 'eed6966a5b39d1fc9544055a5b5801758a62a56a': Winter MOTD, Stat fixes (maybe?!) made use ability teleport player back to where they should be Forgot to push these changes last update! fixed tnt blowing up in claims when offline fixed task not getting cleanup up after /skiptutorial fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping Fix heavy attribute, disable claim visualizer Disable subtasks for now Clans alpha 0.17 clan claim visualizer fixed infinite claims	2015-12-07 12:22:10 -06:00
Shaun Bennett	c3ace42a68	Winter MOTD, Stat fixes (maybe?!)	2015-12-07 13:21:11 -05:00
Keir	31d05cdb3b	Fix error from last commit (git forced me to commit unfinished files due to the merge).	2015-12-07 18:13:48 +00:00
Keir	67b3fe1d23	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java	2015-12-07 18:11:40 +00:00
Shaun Bennett	ffbb057d23	Merge pull request #88 in MIN/mineplex from iKeirNez_Bugfix to master * commit '9bd7869e2260e23a0ff981b7084ff9b4a3768b43': Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.	2015-12-07 11:25:17 -06:00
Shaun Bennett	c6c012031f	Less ugly formatting	2015-12-07 04:44:19 -05:00
Shaun Bennett	4354133de9	Add Minecraft timings to /lag	2015-12-07 04:40:34 -05:00
Cheese	e1efcabfbf	chat sale msgs	2015-12-07 20:39:31 +11:00
Shaun Bennett	44a5bcb793	remove titan chest message, update pumkin message, holiday MB/DMT words	2015-12-07 02:06:00 -05:00
Shaun Bennett	7b5db2d4fb	Hub Music, HubMusic Preference	2015-12-07 00:58:44 -05:00
Shaun Bennett	488895ea53	Note block player	2015-12-06 21:12:10 -05:00
xGamingDudex	c36182b8d4	Cosmetic Update New: + New GUI System + Candy Cane Particle + Candy Cane Double Jump + Candy Cane Death Effect + Candy Cane Arrow Trail + Snowman Morph + Baby Reindeer Mount + Pet Coal Apparition Fixed/Updated: * Added getTick to UpdateEvent and UtilTime * Added more methods to UtilParticle * Gadget manager isMoving now counts flying as moving * Updated some cosmetics	2015-12-07 02:53:14 +01:00
Mysticate	09f7a03444	Quick changes to improve things.	2015-12-06 20:00:22 -05:00
Mysticate	88dcdaa445	Merge remote-tracking branch 'origin/master' into update-paintball Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java	2015-12-06 12:00:06 -05:00
AlexTheCoder	4278f3fa99	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2015-12-06 03:51:08 -05:00
AlexTheCoder	430de10008	- Everything except maps [probably should've committed sooner]	2015-12-06 03:47:07 -05:00
Cheese	ccb6456110	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java	2015-12-06 18:09:24 +11:00
Cheese	35c362b8bf	small youtuber perms	2015-12-06 18:08:36 +11:00
Shaun Bennett	b7b5235f59	Fix error	2015-12-06 00:57:43 -05:00
Cheese	d095e14b4c	Merge branch 'monster-league'	2015-12-06 16:33:21 +11:00
Cheese	9880e9a3c7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-06 16:32:59 +11:00
Cheese	040e94f1fb	bouncy	2015-12-06 16:32:45 +11:00
Shaun Bennett	618105b4c8	Add minimum rank to Announcement Command	2015-12-06 00:15:49 -05:00
Shaun Bennett	8d831d5228	Fix END_PORTAL bug causing gui's to break	2015-12-06 00:06:31 -05:00
Shaun Bennett	32a6d572ee	Disable gadgets in arcade for player count > 40	2015-12-05 22:56:15 -05:00
libraryaddict	b98944b0a0	Handle attach entity	2015-12-06 14:38:00 +13:00
Virizion	5b49c4adc3	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-05 19:58:55 -05:00
libraryaddict	d5606f55ea	Modified CustomTagFix to support player name titles	2015-12-06 10:18:35 +13:00
Thanos paravantis	b64f561659	Merge branch 'MortensRawBugFixes' into thanos-mineware Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java	2015-12-05 22:54:50 +02:00
Morten	e8f7b140df	Added Achievements and fixed bugs.	2015-12-05 21:47:13 +01:00
Keir	9bd7869e22	Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.	2015-12-05 01:08:21 +00:00
Keir	2e72e46242	Add report preferences to exclusive preferences.	2015-12-05 01:05:43 +00:00
Keir	ef6fd0eaa3	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2015-12-05 00:05:05 +00:00
fooify	d7497ec098	Fixed Micro Battle icon not appearing in stats menu	2015-12-04 15:56:48 -08:00
Cheese	49c735e43c	removed duplicate code	2015-12-05 10:34:06 +11:00
Keir	ddf6037fc4	Wrote standalone chatsnap handler and implemented required changes in Core.	2015-12-04 23:30:27 +00:00
Cheese	4a53667539	gadget restructure converted frost lord and titan particles into 4 subcategories.	2015-12-05 10:22:00 +11:00
Keir	c19baf5750	Make periodic handler message display close command and clicking it suggests the command.	2015-12-04 22:08:44 +00:00
Thanos paravantis	91e0547612	Merge branch 'master' into thanos-mineware Conflicts: .gitignore	2015-12-04 22:04:46 +02:00
Shaun Bennett	5c575b41fc	Clans alpha 0.17	2015-12-04 05:15:28 -05:00
fooify	b1bd2ff5ac	Gravity's icon changed to ENDER_PORTAL_FRAME	2015-12-03 16:50:27 -08:00
Virizion	c3a564faa7	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-03 19:31:24 -05:00

... 13 14 15 16 17 ...

3497 Commits