Mineplex2018-withcommit

JarvisBigBalls/Mineplex2018-withcommit

Author	SHA1	Message	Date
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
fooify	348f2d8e4c	Merge remote-tracking branch 'origin/master' into foo	2015-12-03 16:31:16 -08:00
Christopher Jozsa	8717f962e6	Merge pull request #83 in MIN/mineplex from mrsomeone12_SmallFixes to master * commit 'c98b427fdebb0d8abcce3a17731c0f9b35eece01': Added missing MountData and SingleEntityMountData files. Mount bug fix. Added method to edit NoAI field on entities. Implemented new mount data system replacing instead of entities as data. We only need to add the "Go Back" page once... TitanMount fixes	2015-12-03 17:15:21 -06:00
Virizion	cab5c2a76d	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-02 20:12:41 -05:00
NewGarbo	d6ca52e4a4	modifications	2015-12-02 05:11:09 +00:00
Virizion	1810defd2d	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-01 20:39:54 -05:00
fooify	338e0f1892	fixed naming pets non-alphanumeric characters	2015-12-01 16:23:07 -08:00
Keir	9508556d57	Refactor.	2015-12-01 22:47:51 +00:00
Jonathan Williams	633697dc7a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-30 23:49:32 -06:00
Jonathan Williams	03a1f19df9	Fixed memory leaks in Disguise and Recall. Removed debug messages in ItemMapManager	2015-11-30 23:49:16 -06:00
Cheese	51023a7630	cosmetic cooldown fix	2015-12-01 15:38:54 +11:00
Cheese	208eaf3a01	cosmetics recharge slowdown	2015-12-01 11:38:52 +11:00
xGamingDudex	c98b427fde	Added missing MountData and SingleEntityMountData files. For some reason, git decided that it was a good idea to remove these two files from the index...	2015-12-01 00:46:20 +01:00
Keir	0bbb705654	Small method & class renames, document methods.	2015-11-30 16:35:07 +00:00
Keir	4aa84b9180	Store chat messages from the last 30 minutes.	2015-11-30 02:03:26 +00:00
xGamingDudex	6120c8246b	Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes	2015-11-29 19:11:24 +01:00
xGamingDudex	d1d58919f4	Mount bug fix. Mount was put in map before removed, resulting in new mount being half disabled.	2015-11-29 19:09:55 +01:00
xGamingDudex	509835ea64	Implemented new mount data system replacing instead of entities as data. + Removed some unnecessary code + Made StackManager use new mount system This system also fixes a bug allowing players "hijack" some of the mounts as it was not properly persistent.	2015-11-29 19:08:00 +01:00
xGamingDudex	327bf8d09b	We only need to add the "Go Back" page once...	2015-11-29 18:32:24 +01:00
fooify	61df87b446	Merge remote-tracking branch 'origin/master' into foo	2015-11-29 06:37:30 -08:00
Virizion	e09e5851a6	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-11-29 01:17:17 -05:00
Shaun Bennett	7c947ad97b	Merge master	2015-11-28 23:55:00 -05:00
NewGarbo	9ff9724fc8	tutorial revamp 2.0	2015-11-29 02:10:39 +00:00
Cheese	5cefe27257	cosmetic fixes	2015-11-29 11:40:19 +11:00
NewGarbo	aa68701ebd	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-28 20:16:49 +00:00
fooify	8cdae7ce1a	Merge remote-tracking branch 'origin/master' into foo	2015-11-28 09:33:47 -08:00
xGamingDudex	dc0da3987b	TitanMount fixes Added so that the magma cube is looking in the direction of which the player is flying. Removed players ability to unequipt the armorstand that take out the netherrack block from their head slot.	2015-11-28 17:22:17 +01:00
Cheese	51227ae4f3	fixed leak	2015-11-29 01:25:15 +11:00
libraryaddict	28947643e0	More updates for dual version	2015-11-29 02:54:16 +13:00
NewGarbo	0dceca5cfc	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-11-28 09:04:15 +00:00
NewGarbo	a0ae500876	tutorial revamp [clans]	2015-11-28 09:03:58 +00:00
libraryaddict	d4ab57e4e7	Update for 1.9 dual version	2015-11-28 19:38:58 +13:00
Cheese	700cf51206	titan stuff almost done	2015-11-28 16:35:11 +11:00
Cheese	963caae719	Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes'	2015-11-28 16:00:28 +11:00
Cheese	8af545af80	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java	2015-11-28 15:59:26 +11:00
Cheese	0871663498	titan stuff I HATE YOU SNAKE.	2015-11-28 15:57:07 +11:00
Shaun Bennett	1a87d85174	Merge remote-tracking branch 'remotes/origin/master' into clans-beta	2015-11-27 23:13:43 -05:00
xGamingDudex	24f8a98545	Added titan particle trail.	2015-11-28 02:22:41 +01:00
NewGarbo	fe085c1571	loaaads of stuff	2015-11-27 19:42:15 +00:00
libraryaddict	636dcdf9f7	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitan.java	2015-11-28 05:28:04 +13:00
libraryaddict	5f8f643d95	What snake mount code I did	2015-11-28 05:26:43 +13:00
Shaun Bennett	a5ebf9b059	Fixes for release	2015-11-27 05:53:57 -05:00
Cheese	4e2f48b37e	Merge branch 'master' into clans-beta Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java	2015-11-27 19:16:30 +11:00
Cheese	f55b6761a8	disabled titan gadgets!	2015-11-27 19:14:35 +11:00
Cheese	77be81c216	pet changes	2015-11-27 16:50:22 +11:00
Cheese	2b047cdde8	more titan stuff	2015-11-27 16:46:48 +11:00
Cheese	05e7183b65	titan stuff update	2015-11-27 15:55:00 +11:00
Virizion	73c2f16d8b	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-11-26 23:11:12 -05:00
NewGarbo	0274bf2847	loads of changes.	2015-11-27 03:28:19 +00:00
libraryaddict	3c98243201	Some more guardian stuff	2015-11-27 15:56:56 +13:00
libraryaddict	0a4416381b	Fix guardian	2015-11-27 15:55:02 +13:00
Cheese	98d988584d	titan cosmetics	2015-11-27 13:35:25 +11:00
Keir	0ee042f192	Implement equals and hashCode, move compareTo into MessageSnap class.	2015-11-26 23:59:17 +00:00
Keir	3e06451ac1	Whoops, this should be 30 SECONDS, not MINUTES.	2015-11-26 23:50:45 +00:00
Keir	d47b494628	Add /chatcache (mainly for debugging). Fix cache not being able to store more than 1 value per sender. Add comparator to sort all messages chronologically.	2015-11-26 23:29:43 +00:00
Keir	edf93ec43f	Initial ChatSnap implementation.	2015-11-26 16:55:27 +00:00
NewGarbo	0d43ffc7b2	fixessss	2015-11-26 06:54:49 +00:00
Virizion	de82806fc0	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-11-25 22:53:06 -05:00
libraryaddict	3e8a53562e	Add new hologram interaction thingy so holograms can catch interactions that they would normally block	2015-11-26 15:49:28 +13:00
Thanos paravantis	db8781cacb	Merge branch 'master' into thanos-mineware	2015-11-25 23:05:14 +02:00
Shaun Bennett	1306137cb2	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-11-25 14:51:00 -05:00
Shaun Bennett	ff5d828dd7	Merge with master, lots of clans fixes/work	2015-11-25 14:50:49 -05:00
NewGarbo	2adfef41ca	bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 )	2015-11-25 16:46:53 +00:00
xGamingDudex	3b89d65a09	Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java	2015-11-25 15:59:18 +01:00
libraryaddict	ca81265b9e	Readded PacketHandler debug message	2015-11-25 13:42:11 +13:00
Sarah	46362a3d5f	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java	2015-11-24 15:38:52 +01:00
Cheese	837be048a6	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-24 21:38:47 +11:00
Jonathan Williams	f8d8b75586	Changed how timings is used.	2015-11-24 04:36:18 -06:00
fooify	f300fd2c98	Merge remote-tracking branch 'origin/master' into foo	2015-11-23 15:34:27 -08:00
Shaun Bennett	ef7c26c04c	Clans changes	2015-11-23 15:57:13 -05:00
NewGarbo	a551e89310	fixed clans tips preferences, and changed World Event commands perms from being ALL to EVENT	2015-11-23 09:44:35 +00:00
Keir	f0e24468d5	Enable reporting functionality for Arcade and Clans plugins.	2015-11-22 14:23:17 +00:00
Keir	dcca67e571	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report	2015-11-22 13:54:16 +00:00
Virizion	ddc5427ae3	Merge branch 'master' into virizion_speed_builder # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java	2015-11-21 14:20:53 -05:00
AlexTheCoder	3bb11bba08	- Fixed Stats [caused by bad communication between chiss and I]	2015-11-21 11:30:53 -05:00
Cheese	6eb1bef1c6	Merge branch 'master' into minestrike-update Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java	2015-11-21 11:09:28 +11:00
Keir	5bbf5bcce5	Only log to the database when the report has been closed.	2015-11-20 23:05:42 +00:00
Cheese	d5076b1c47	CTF fix	2015-11-21 09:41:02 +11:00
Keir	07b6c7cde7	Display message informing a report handler on how to close a report, when clicked this message will also fill out as much of the command as it can on the clients side.	2015-11-20 22:38:00 +00:00
Keir	435f2b643d	Fix fetching player report stats.	2015-11-20 22:20:56 +00:00
Keir	470ff67f86	Replace ReportProfile by using statistics to track total reports and accepted, denied & abusive reports. 1 or more abusive reports results in being banned from the report system.	2015-11-20 22:03:57 +00:00
Thanos paravantis	473f0ebcc7	Add first work in progress version of Fishing Day challenge.	2015-11-20 23:27:32 +02:00
Keir	fc6e1fe003	Notify the handler of a report (if any) when the report they are handling is purged.	2015-11-20 21:10:03 +00:00
Sarah	6f7d49b71b	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-20 19:04:51 +01:00
AlexTheCoder	386032a4f5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-20 06:03:30 -05:00
AlexTheCoder	f51358552a	-B	2015-11-20 05:57:29 -05:00
Jonathan Williams	700e4c9a1f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-19 22:12:08 -06:00
Keir	80c87fa1fc	Make reports timeout after 15 minutes of inactivity.	2015-11-20 00:51:21 +00:00
Cheese	3a5ab3f17c	Merge branch 'master' into monster-league	2015-11-20 11:51:07 +11:00
Shaun Bennett	3820035762	Cleaning up duplicate code/small optimizations (untested)	2015-11-19 14:35:59 -05:00
Virizion	796f116cfd	Merge branch 'master' into virizion_speed_builder	2015-11-18 19:27:42 -05:00
Keir	cb5672b94c	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report	2015-11-18 20:34:24 +00:00
Sarah	bff9a065d9	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java # Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java # Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java # Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java	2015-11-18 18:08:51 +01:00
NewGarbo	5c2569e822	revert certain permissions from being ALL or containing JR.DEV (that were used for testing)	2015-11-18 16:20:27 +00:00
Shaun Bennett	1eff698a34	Merge pull request #75 in MIN/mineplex from william-global to master * commit 'a11ca138e764417c23a0060dd134ef7c49741295': ranks woops easy fix rawr and fixes Added the ability to give out game loot. Reformatting titles Added GlobalGiveCoins. Changes Gems a little and the manager. More global stuff! Added GlobalGiveGems. Global Packet work. Added giveitem sub-command.	2015-11-18 10:15:33 -06:00
William Burns	a11ca138e7	ranks	2015-11-18 16:01:53 +00:00
William Burns	04a4b072af	woops easy fix	2015-11-18 15:48:25 +00:00
William Burns	2e223d0660	rawr and fixes	2015-11-18 15:42:33 +00:00
William Burns	e16ee9036a	Added the ability to give out game loot.	2015-11-18 14:35:40 +00:00
William Burns	e83b49d490	Reformatting titles	2015-11-18 13:43:22 +00:00
NewGarbo	f79c282225	Clan energy warnings implemented. (not tested yet)	2015-11-18 07:39:00 +00:00
William Burns	e19d4e11e1	Added GlobalGiveCoins. Changes Gems a little and the manager.	2015-11-17 18:54:39 +00:00
William Burns	a28adc9673	More global stuff! Added GlobalGiveGems.	2015-11-17 18:26:19 +00:00
Mysticate	448dd33c1a	Switching branches c:	2015-11-17 11:38:02 -05:00
Keir	6ee40aa1ce	No longer close reports when the player quits, instead alert the handler and alert again when (and if) the player re-joins if the report is still active.	2015-11-17 15:08:35 +00:00
Keir	a1713ca866	If someone is currently handling a report, re-direct all messages relating to that report to them.	2015-11-17 14:21:05 +00:00
William Burns	0f7c52391f	Global Packet work. Added giveitem sub-command.	2015-11-17 08:19:36 +00:00
Cheese	adfc2f19eb	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-17 09:20:15 +11:00
Cheese	46505a8e8e	converted to new res pack locations	2015-11-17 09:19:33 +11:00
libraryaddict	208d90c4bc	Fixed getTargetBlock being 0 when its infinite	2015-11-17 10:18:42 +13:00
Virizion	2e9ac8df4d	First commit.	2015-11-15 22:06:11 -05:00
Jonathan Williams	ac792dcd02	Removed some unnecessary code in updateRank and opened up all ranks to be used.	2015-11-15 18:33:43 -06:00
AlexTheCoder	217509b75a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf Conflicts: Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java Conflicts Resolved	2015-11-15 18:58:20 -05:00
AlexTheCoder	ecaa4a49b4	- Fix for stats	2015-11-15 17:48:00 -05:00
NewGarbo	24dee0ebf6	updated ScoreboardElement to use the interface instead of the implementation. PLEASE NEVER USE THE IMPLEMENTATION FOR DEFINING THE TYPE!!!	2015-11-15 20:52:45 +00:00
NewGarbo	c247fe9317	World event prettification and fixes	2015-11-15 18:19:28 +00:00
fooify	db21d627d8	Merge remote-tracking branch 'origin/master' into foo	2015-11-14 09:13:51 -08:00
Jonathan Williams	daee44d262	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-14 02:01:24 -06:00
Jonathan Williams	4a73bce586	Added gadget and projectileUser logging.	2015-11-14 00:36:34 -06:00
Cheese	259397b6ae	READY 2 GO	2015-11-14 12:52:14 +11:00
Keir	bf81c26874	Only notify staff when a report count reaches a certain amount (3 for hacking, 1 for chat abuse).	2015-11-13 01:27:34 +00:00
Keir	a6d3ba10c2	Show the handler of the report a message every 10 seconds whilst they are handling a report. Any part of the message is clickable and when clicked shows the close report GUI. Jazz-up messages sent to players. Rename Category to ReportCategory.	2015-11-13 01:23:33 +00:00
Shaun Bennett	bbc7bf770c	1.8 Fixes - Still doing map fix	2015-11-12 19:18:42 -05:00
Shaun Bennett	639d2d110f	Merge remote-tracking branch 'remotes/origin/master' into clans-beta	2015-11-12 17:55:33 -05:00
Shaun Bennett	0b41450603	Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" This reverts commit `6c17b2926c`.	2015-11-12 17:51:13 -05:00
Cheese	3122397f7a	Merge branch 'master' into minestrike-update Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java	2015-11-13 09:19:44 +11:00
Shaun Bennett	6c17b2926c	Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta" This reverts commit `ce1c09b88f`, reversing changes made to `1aef7fe0b9`.	2015-11-12 16:35:31 -05:00
AlexTheCoder	bc1b185f0e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-12 02:44:54 -05:00
AlexTheCoder	a8b27e66d1	- Finalized game to chiss and sigils' requirements minus flag status in scoreboard, will add next commit - Fixed items ever being lost from treasurechests	2015-11-12 00:06:21 -05:00
fooify	8a0906587d	Merge remote-tracking branch 'origin/master' into foo	2015-11-11 20:15:31 -08:00
Shaun Bennett	875c399c9f	Merge branch 'master' into clans-beta	2015-11-11 21:31:03 -05:00
Keir	27d5c76376	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report	2015-11-12 02:01:01 +00:00
libraryaddict	25f299b490	Fix interact types	2015-11-12 14:34:12 +13:00
Keir	3c419b3217	Small fixes from last commit.	2015-11-12 00:24:31 +00:00
Keir	6295a8ce08	Closing a report will now display a GUI in which the closer can decide on the result of the report. Some of these options will yield additional options, such as punishment options if a report is indeed valid. Store count of a players accepted, denied and abusive reports. The previous partially implemented reputation system has been removed, at least for now.	2015-11-12 00:02:38 +00:00
Shaun Bennett	e66bebcfb1	Give all treaure items when opening the chest	2015-11-11 18:13:47 -05:00
NewGarbo	ce1c09b88f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta Conflicts: Plugins/.idea/compiler.xml Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java Plugins/Libraries/craftbukkit.jar Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java	2015-11-11 19:35:44 +00:00
Keir	9573751a87	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report	2015-11-11 19:24:34 +00:00
Keir	727da2c6b5	Embarrassing typo.	2015-11-11 19:23:10 +00:00
Keir	f2e88c1c54	Only allow 1 player at a time to handle a report.	2015-11-11 19:05:29 +00:00
Keir	d7ba2e4731	Fix infinite gson loop by separating dependencies.	2015-11-11 16:12:28 +00:00
libraryaddict	b915131407	Fix some armorstands and interaction bugs	2015-11-12 04:26:55 +13:00
Keir	9c45a48a26	Add confirmation message when a report is successful.	2015-11-11 15:05:36 +00:00
Keir	2722aeaaec	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report	2015-11-11 14:53:49 +00:00
Keir	191fa0ec53	Actually fetch the showUserReports value from the database.	2015-11-11 14:53:22 +00:00
Cheese	ef2411b7d5	Merge branch 'master' into minestrike-update	2015-11-11 13:43:36 +11:00
libraryaddict	3e6d73221b	Disabled a fix	2015-11-11 15:21:17 +13:00
Cheese	a47752cfe2	disabled usage of /minecraft: commands in 1..8	2015-11-11 12:49:19 +11:00
Keir	f1c8564263	Fix preference inventory.	2015-11-10 21:40:35 +00:00
Keir	7d63a95ec9	Remove ALTER statement, modifications have been done.	2015-11-10 21:22:21 +00:00
Cheese	59a054eeba	fixed merge erorr	2015-11-11 07:52:02 +11:00
Cheese	520eb55b88	Merge branch 'master' into minestrike-update Conflicts: Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java	2015-11-11 07:43:50 +11:00
Keir	a81da156ac	Load show user reports value from database.	2015-11-10 16:08:16 +00:00
Keir	e59b5c2549	Actually show the report toggle action.	2015-11-10 16:07:32 +00:00
fooify	394d680470	Merge remote-tracking branch 'origin/master' into monster-league	2015-11-10 07:09:19 -08:00
fooify	ca1177685f	totally WIP commit	2015-11-10 07:08:08 -08:00
Keir	217ac78d49	Alter "accountPreferences" table to include a new column "showUserReports".	2015-11-10 11:38:13 +00:00
Keir	e00c11ae28	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report	2015-11-10 11:17:49 +00:00
AlexTheCoder	e165cad50f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-10 04:53:32 -05:00
Shaun Bennett	2707173a8b	Merge with 1.8 Branch	2015-11-10 01:48:33 -05:00
Keir	47c509c975	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java	2015-11-09 22:55:00 +00:00
Keir	03a5954224	Handle saving and loading of the ShowUserReports setting.	2015-11-09 18:35:03 +00:00
Shaun Bennett	ec3427bcc0	Giveaway manager bug fix	2015-11-09 04:08:26 -05:00
NewGarbo	7a8a5918c0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta Conflicts: Plugins/.idea/dataSources.xml Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java CONFLICTS ALL FIXED	2015-11-09 08:59:37 +00:00
Shaun Bennett	05b52614fe	Forgot to remove debug code for testing	2015-11-09 03:49:12 -05:00
Shaun Bennett	2eaa326929	Merge remote-tracking branch 'origin/master'	2015-11-09 03:27:50 -05:00
Shaun Bennett	2c54e9e59a	Giveaway extras	2015-11-09 03:27:42 -05:00
Jonathan Williams	fb4978305f	Fixed up EnjinTranslator Added extra overload for inventoryManager if you have the accountId already.	2015-11-09 02:26:45 -06:00
Jonathan Williams	283a774e03	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-09 00:04:55 -06:00
Jonathan Williams	4915ebc5ad	Added Purchase logging manager for Enjin. Added extra callback method for SaveRank.	2015-11-09 00:04:38 -06:00
libraryaddict	d466005c35	Fix custom names not changing	2015-11-09 05:08:08 +13:00
libraryaddict	752d8152d2	Merge pull request #72 in MIN/mineplex from iKeirNez_Bugfix to master * commit '783bec75db7592dc191698b8dfbb89be08a818aa': Fix for some preferences not applying correctly.	2015-11-08 08:23:20 -06:00
AlexTheCoder	dfbf19c66a	Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-08 01:02:06 -05:00
libraryaddict	c4d6bcba02	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8	2015-11-08 17:56:34 +13:00
Cheese	cc2e5bc6e4	minestrike update!	2015-11-08 11:30:19 +11:00
Shaun Bennett	addde570bb	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-11-07 14:53:35 -05:00
Shaun Bennett	bf97cf5d77	Remove debug code	2015-11-07 13:53:34 -05:00
libraryaddict	79d0466355	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2015-11-07 21:36:36 +13:00
Shaun Bennett	ec7600a4a2	Giveaway tweaks	2015-11-07 01:10:27 -05:00
Shaun Bennett	4add7449eb	Merge remote-tracking branch 'origin/master'	2015-11-06 21:15:45 -05:00
Shaun Bennett	3893617d58	Logitech Giveaway (still needs testing)	2015-11-06 21:15:37 -05:00
AlexTheCoder	fafc92606c	Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java	2015-11-06 18:43:11 -05:00
Keir	783bec75db	Fix for some preferences not applying correctly.	2015-11-06 23:04:51 +00:00
Keir	fd2a543418	Add "ShowUserReports" preference (however currently not visible to players nor does it get saved to the DB currently). Fix variable names in ReportManager.	2015-11-06 16:46:10 +00:00
libraryaddict	cc0f12f6c8	Fix player interactions packets not working properly on armorstand and when clicking block behind entity	2015-11-07 04:45:02 +13:00
NewGarbo	b835823230	Preferences page changes to free up space, as the current preferences layout is completely full. Removed unnecessary Spawn variable in Clans.java, as it was causing a warning and warnings look ugly.	2015-11-06 13:19:02 +00:00
Keir	0c0b3708c6	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report	2015-11-06 01:34:13 +00:00
Keir	e449e47b9a	Document ReportNotification.	2015-11-06 01:33:46 +00:00
AlexTheCoder	87d7ff8a8f	- Synced up expire times for proximity weapons	2015-11-05 02:21:36 -05:00
AlexTheCoder	61653347c7	- Fixed proximity weapons not being able to detonate	2015-11-05 02:11:20 -05:00
AlexTheCoder	9c49ab0408	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-05 01:23:40 -05:00
NewGarbo	3ff044fddb	Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips	2015-11-04 11:32:06 +00:00
libraryaddict	b3f86ba638	Fixing bugs	2015-11-04 18:34:22 +13:00
NewGarbo	ecd3b0ef76	removed a multiple Mineplex.Core.Common import thingy in the core project or something. i dunno, it was causing errors so i fixed it, yay!	2015-11-03 22:06:23 +00:00
NewGarbo	7f03ca0936	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta Conflicts: Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java	2015-11-03 21:19:17 +00:00
NewGarbo	78ab895a14	Added heart particles to the GiantsBroadsword healing feature, also added some strong sounds. Made it so that players using the broadsword's effects cannot attack anything. Added small smoke particle to UtilParticle. Added a burnout feature to the WindBlade, disallowing players to speed around on the ground for ever. Moved the Lapis Lazuli block particles from infront of the player, to the feet of the player when using the AlligatorsTooth, as per SamitoD's request. Removed some debug messages thrown around the code.	2015-11-03 19:49:14 +00:00
Keir	72b650086d	Instantiating a page shouldn't cause it to automatically open.	2015-11-03 17:03:09 +00:00
Keir	bd6ce21cf7	Make use of foreign keys in table creation and drop "INDEX" statements (foreign keys are auto-indexed).	2015-11-03 16:40:31 +00:00
Keir	6054bfaac4	Do all database operations asynchronously.	2015-11-03 15:37:39 +00:00
Keir	9030b4f264	Remove unused column 'date'.	2015-11-03 15:27:32 +00:00
libraryaddict	3de906ab19	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java	2015-11-03 14:57:25 +13:00
Shaun Bennett	4794cc6924	Clans Gui	2015-11-02 20:41:08 -05:00
Keir	95c38b1939	Don't use static instances.	2015-11-02 23:30:06 +00:00
Jonathan Williams	8838ea75e4	Some code cleanup for tasks.	2015-11-02 09:37:11 -06:00
Jonathan Williams	3b38302429	Optimized TaskManager task locks and calls. Run all player messages on the main thread.	2015-11-02 09:35:35 -06:00
Jonathan Williams	55d028d706	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-01 22:09:58 -06:00
Shaun Bennett	9cf62cfe7f	Don't use player skulls until caching is setup and working properly	2015-11-01 22:58:22 -05:00
Jonathan Williams	cb96124feb	Added extra cleanup for FriendsGUI and AddFriendPage	2015-11-01 17:42:23 -06:00
Keir	4b5ddf5385	Disable SQL create table queries until they are approved.	2015-11-01 19:14:29 +00:00
Keir	d09ed2a823	Small changes and missed changes from last commit.	2015-11-01 16:47:54 +00:00
Keir	93a5ebf0eb	Pass server name to ReportManager.	2015-11-01 16:44:02 +00:00
NewGarbo	baa4a744fb	Fixed a whole load of bugs: Fixed the next button occasionally displaying a blank page in the gear GUI. Fixed not being able to click the back button when selecting a bow in the gear GUI. Made selectable items glowing in the gear GUI.	2015-10-31 23:11:12 +00:00
Jonathan Williams	073321fb14	Refactored TrickOrTreat Stuff.	2015-10-31 14:45:42 -05:00
Cheese	b8b260bca1	fixed expire time on projectiles	2015-10-31 19:01:49 +11:00
Cheese	c463b80fe0	fixed insta-expire	2015-10-31 19:00:28 +11:00
Cheese	3636fdfba0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-31 18:23:06 +11:00
Cheese	225f067ab3	fixed some projectile stuff	2015-10-31 18:22:53 +11:00
Shaun Bennett	cd15df0238	Merge remote-tracking branch 'origin/master'	2015-10-31 02:13:24 -04:00
Cheese	23be8aa1dd	removed unncessary stuff balanced rewards	2015-10-31 14:33:41 +11:00
Cheese	a92a52f009	Merge branch 'Myst_TRICKORTREAT'	2015-10-31 14:27:06 +11:00
Mysticate	4884032a1a	Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3	2015-10-30 23:24:32 -04:00
Cheese	b9d7c80f80	cow kit	2015-10-31 13:25:57 +11:00
libraryaddict	301b8012ff	Final commit	2015-10-30 19:30:17 +13:00
libraryaddict	ea1e4b79f7	Changes from SnD branch	2015-10-30 19:25:02 +13:00
libraryaddict	ed18588a6a	Fix missing code and stuff	2015-10-30 19:12:04 +13:00
Cheese	c4e93180fa	Merge branch 'master' into smash-champs-balance	2015-10-30 13:00:30 +11:00
Keir	ec5cbbe684	This method is not required, "Plugin" is protected, not private as I previously assumed.	2015-10-30 01:05:45 +00:00
Keir	e266acaf44	Store report categories with a TINYINT to save space and increase lookup performance.	2015-10-29 23:33:23 +00:00
Keir	e8c01a1733	Cleanup imports.	2015-10-29 23:29:38 +00:00
AlexTheCoder	0be51d5629	- Even more bugfixes	2015-10-29 16:48:51 -04:00
Keir	1857afa826	Log report category to database. Allow report to easily be handled by clicking text to fire the reporthandle command.	2015-10-29 17:51:17 +00:00
Shaun Bennett	e2947718fe	Remove code that wasnt meant to be commited	2015-10-29 13:10:10 -04:00
libraryaddict	0486404c4b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2015-10-28 14:38:34 +13:00
libraryaddict	5ec932d1ca	Fixing bugs	2015-10-28 14:36:48 +13:00
Keir	dd321439a6	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report	2015-10-27 22:40:23 +00:00
Keir	4ceb8f20aa	Make ReportNotification capable of sending json messages.	2015-10-27 22:26:02 +00:00
Keir	cb1c779f37	Close player report if the reported player leaves the game mid-report.	2015-10-27 22:15:06 +00:00
Keir	d9fb0adabb	Only notify staff if 3 or more players report a player.	2015-10-27 22:14:33 +00:00
Keir	53f2356cba	Handle null report closers.	2015-10-27 22:08:42 +00:00
Keir	bc3a119a22	Store report category and only "merge" reports when the category is the same.	2015-10-27 17:30:47 +00:00
AlexTheCoder	7770fa0284	- Added system to ensure banned players are removed from the network	2015-10-26 07:09:01 -04:00
AlexTheCoder	f5b4f28848	- Fixed achievements - Various balance patches/audio changes	2015-10-26 00:25:33 -04:00
fooify	cbe147d705	typo fix in legendary aura description	2015-10-25 12:32:27 -07:00
fooify	7024084ce3	Update achievement kit reference text	2015-10-25 11:29:06 -07:00
fooify	bb806d6260	Merge remote-tracking branch 'origin/master' into foo	2015-10-25 10:10:06 -07:00
NewGarbo	327c129f46	Fixed the rest of merge conflicts (? [I hope {shaun help me ;-;}])	2015-10-25 12:28:12 +00:00
Shaun Bennett	556d5adcd9	Change /global to /globalpacket (fixes conflict with announcement command)	2015-10-24 17:46:25 -04:00
NewGarbo	1e4b3442fa	Conflicts: Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java	2015-10-24 20:45:39 +01:00
Shaun Bennett	0d56eefd44	Titan/Rewards adjustments	2015-10-24 13:40:17 -04:00
Keir	394e501682	Merge branch 'master' into feature/report # Conflicts: # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java	2015-10-24 17:50:26 +01:00
Keir	a9fedecc70	Make the ui more appealing and use existing gui system to handle it.	2015-10-24 17:10:50 +01:00
Keir	29587b93f7	Implement initial report interface. Added getPlugin() method to CommandBase. Changed mini-plugin name from "ReportPlugin" to "Report" to match the other mini-plugins. This is very WIP, still a lot to be done.	2015-10-24 03:41:03 +01:00
Shaun Bennett	40afcaf26b	Global Packet Commands	2015-10-23 15:07:53 -04:00
libraryaddict	2eb8b3e234	Catch PacketHandler exceptions	2015-10-24 02:17:19 +13:00
libraryaddict	5ec4203fd9	More changes to disguise	2015-10-24 01:36:42 +13:00
libraryaddict	a450b828b7	Fix disguises custom name	2015-10-24 00:48:54 +13:00
AlexTheCoder	f7dab72e8c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-10-23 03:23:35 -04:00
Cheese	af208da953	Merge branch 'alex-testrank'	2015-10-23 18:10:59 +11:00
Shaun Bennett	e3e7dd4694	Titan rewards from mythical chests	2015-10-23 02:08:31 -04:00
AlexTheCoder	1512d87f9e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank	2015-10-23 00:28:32 -04:00
AlexTheCoder	5a94e33d5e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-10-23 00:24:52 -04:00
libraryaddict	aedf04b3e3	Fix renaming pet not opening proper window	2015-10-23 09:26:21 +13:00
libraryaddict	53aa1b655b	Remove custom formatter because it trims too short, don't need to commit it. Cleaned up CustomTagFix	2015-10-23 09:20:24 +13:00
libraryaddict	8cde506a2c	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8	2015-10-23 05:25:36 +13:00
libraryaddict	ddb8d592f8	Remove all is1_8 checks	2015-10-22 18:37:14 +13:00
Shaun Bennett	00a689ea03	War work	2015-10-21 14:48:27 -04:00
Jonathan Williams	c719d693dd	Added delete benefit call for repository. Added failsafe in case inventory update didn't apply Removed 43k benefit.	2015-10-21 01:15:09 -05:00
NewGarbo	227e9f7bfc	Pretty much finished with tutorials, not fully though, but I am simply pushing so I don't lose all my work. CHANGES---- Added a little hack to ScoreboardElement.java that allows for a single element to clear the currently existing scoreboard lines output, or modify it. Coded in the functionality of 7 tasks, will do the rest now.	2015-10-21 04:27:14 +01:00
Sarah	6860f013d0	Fixing some spelling typos chat filtering and the scoreboard.	2015-10-20 19:23:58 +02:00
libraryaddict	07f032a5d2	Fix wither pet making sounds, fixed worldtime.	2015-10-21 04:22:31 +13:00
libraryaddict	ddd674e371	Packets implement Pcaket right	2015-10-20 17:19:46 +13:00
libraryaddict	b3caf7c2d4	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8	2015-10-20 04:38:12 +13:00
Jonathan Williams	3ef33bd9c5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-19 01:32:23 -05:00
Jonathan Williams	5e307da15a	Fix for inventory failure.	2015-10-19 01:32:12 -05:00
Shaun Bennett	6d7f15cd6d	Fix hub time after light flicker	2015-10-18 18:52:16 -04:00
libraryaddict	55f97ef984	More fixes, along with a fix for Block Hunt	2015-10-19 06:21:16 +13:00
Shaun Bennett	177e482dbc	Merge remote-tracking branch 'origin/clans-beta' into clans-beta Conflicts: Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java	2015-10-18 12:35:31 -04:00
Jonathan Williams	9e7629b1fe	Added 43k player chest benefit. Updated MOTD.	2015-10-18 00:21:01 -05:00
AlexTheCoder	12319169a9	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/RadarData.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilRadar.java	2015-10-18 00:54:18 -04:00
libraryaddict	6f91827d57	Vector to Vector3f, updated Maze to 1.8	2015-10-18 12:40:01 +13:00
libraryaddict	02bf202d52	1.8 update	2015-10-17 13:21:03 +13:00
libraryaddict	3a0781b3c7	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java	2015-10-17 00:10:32 +13:00
libraryaddict	14a524cf54	Stuff	2015-10-17 00:08:30 +13:00
libraryaddict	f71cb80bd0	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java	2015-10-16 22:26:07 +13:00
libraryaddict	70c76d976f	More changes	2015-10-16 22:10:13 +13:00
Jonathan Williams	62b209fede	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-16 01:57:30 -05:00
Jonathan Williams	d00fa856f3	Fixed Pets so they work correctly. Also fixed legend benefits. Fixed chest pet rewards.	2015-10-16 01:57:19 -05:00
Cheese	577c67cacd	Merge branch 'Myst_HALLOWEEN'	2015-10-16 14:18:35 +11:00
Mysticate	b15b81a7e2	Spacing	2015-10-15 23:09:23 -04:00
Cheese	6cc33fd6c6	Merge branch 'thanos-bug-fixes'	2015-10-16 12:53:43 +11:00
Mysticate	41511dce7b	Merge remote-tracking branch 'origin/master' into monster-maze	2015-10-15 21:19:24 -04:00
libraryaddict	3dda9352e7	Progress	2015-10-16 13:32:23 +13:00
libraryaddict	4205dc6c25	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java	2015-10-15 12:34:34 +13:00
Shaun Bennett	0df637b80a	Run punishBot in main server thread	2015-10-13 22:56:14 -04:00
Shaun Bennett	f683e932ae	Clans merge fixes	2015-10-13 22:24:15 -04:00
Mysticate	a049d7666f	Merge remote-tracking branch 'origin/master' into monster-maze	2015-10-13 22:14:19 -04:00
Cheese	45cd2a38e1	admins can botspam	2015-10-14 11:55:59 +11:00
Shaun Bennett	88709f85b6	Merge with master	2015-10-13 18:13:01 -04:00
Shaun Bennett	cb0d82174e	Apply botspam to chat messages as well	2015-10-13 17:41:25 -04:00
Sarah	d925ae7f8d	adding animation for Speed Boost, fixing mob item dropping.	2015-10-13 15:53:48 +02:00
Cheese	d105ea5d7e	botspam addition	2015-10-13 23:19:48 +11:00
libraryaddict	58a86c5abb	That's the easy stuff done..	2015-10-13 19:49:15 +13:00
AlexTheCoder	e1d8b25e91	- Fix misc champs bugs	2015-10-13 01:24:57 -04:00
Cheese	f5b80c941c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-13 11:58:27 +11:00
Cheese	e8388437b6	botspam now checks for chat as well	2015-10-13 11:58:14 +11:00
AlexTheCoder	0bd026f506	- Fixed merge issues	2015-10-12 18:04:35 -04:00
AlexTheCoder	f497eab633	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf Conflicts: Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2015-10-12 17:54:11 -04:00
Sarah	9010b8bfe9	removing some unneeded stuff and fixing tag overlaying	2015-10-12 22:01:23 +02:00
libraryaddict	cef52368a3	Hologram fixes	2015-10-13 08:59:13 +13:00
Sarah	ff7ebeed57	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-10-12 20:23:34 +02:00
AlexTheCoder	bbb863ba92	- Merge conflict patch	2015-10-12 02:36:10 -04:00
Cheese	2b9a66e7b2	more ssm update	2015-10-12 16:32:23 +11:00
Shaun Bennett	1aecc9505c	Add region to titan, new MOTD	2015-10-12 01:30:31 -04:00
AlexTheCoder	bef942f6da	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank	2015-10-12 00:47:56 -04:00
Cheese	6a173073a4	added flag to projectiles work on cow kit	2015-10-12 14:39:14 +11:00
libraryaddict	dab258dcdd	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Libraries/BungeeCord.jar Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java	2015-10-12 16:22:52 +13:00
Mysticate	2abf3edad4	Made items for titanic cosmetics dyes.	2015-10-11 22:29:26 -04:00
Mysticate	b6d573a4d5	Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN	2015-10-11 22:25:25 -04:00
Mysticate	7a4ccdf680	Bug fixes	2015-10-11 22:17:34 -04:00
Mysticate	20dd9c683b	Merge remote-tracking branch 'origin/master' into monster-maze Conflicts: Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java Changed the scoreboard a bit, added it to MPS.	2015-10-11 10:52:45 -04:00
Jonathan Williams	e6485a9009	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-10 23:02:36 -06:00
Jonathan Williams	5866e0cce6	Reducing max connections for the DBPool to 3.	2015-10-10 23:02:08 -06:00
Cheese	f23bf18928	adhering to mysts OCD	2015-10-11 14:50:57 +11:00
Cheese	f3e2f3c145	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-11 14:48:17 +11:00
Cheese	cb9e8f8e0b	pumpkin smasher achievement	2015-10-11 14:48:02 +11:00
Jonathan Williams	998d5f6984	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-10 21:25:29 -06:00
Jonathan Williams	061a7b7c73	Fixed Pet FK errors. Added SUPPORT to acceptable updateRank command.	2015-10-10 21:24:47 -06:00
Cheese	6860fa608a	titan placeholder perks art fixed pumpkin gem count	2015-10-11 11:26:09 +11:00
Cheese	323842c693	fixed mods staying in flight	2015-10-10 19:36:38 +11:00
Shaun Bennett	a242c6b592	Halloween Update finishes	2015-10-10 03:23:37 -04:00
Cheese	e9207acd7f	Merge branch 'alex-halloween'	2015-10-10 17:38:09 +11:00
Cheese	7bc3b4970b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java	2015-10-10 17:34:17 +11:00
AlexTheCoder	67a1f4ce8d	Titan Giveaway: - Added Titan pumpkin animation Titan Perks (For later, Removed from Menu): - Added Kronos Particle	2015-10-10 02:31:52 -04:00
Mysticate	930cfa5cb8	DONE	2015-10-10 02:30:11 -04:00
Shaun Bennett	f1e9acbb58	Titan giveaway	2015-10-10 02:19:05 -04:00
Mysticate	9a7357e484	Work	2015-10-10 01:00:49 -04:00
Shaun Bennett	36fabf93b6	Merge remote-tracking branch 'origin/master'	2015-10-09 23:14:13 -04:00
Shaun Bennett	bc7bf8a2e2	fixes/debug	2015-10-09 23:13:39 -04:00
Jonathan Williams	512e08af19	Removed all create table statements.	2015-10-09 21:02:35 -06:00
Mysticate	7851cb451a	Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java	2015-10-09 22:34:05 -04:00
Shaun Bennett	aa9fd1abf3	Titan giveaway work	2015-10-09 22:14:10 -04:00
Peter Miller	611fb88f15	Commented out unnecessary table creation statements (tables already exist in database and these statements are causing database lag under high player load).	2015-10-09 20:40:50 -04:00
Cheese	d99c64e45d	fixed merge error	2015-10-10 10:37:20 +11:00
Cheese	02c6eccfda	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java	2015-10-10 10:36:42 +11:00
Cheese	7dbd9da582	dragon sale Bar	2015-10-10 10:35:48 +11:00
Shaun Bennett	ba36ff565d	Merge remote-tracking branch 'origin/master'	2015-10-09 18:23:55 -04:00
Shaun Bennett	97ef4a4252	Pushing titan giveaway stuff for laptop	2015-10-09 18:23:47 -04:00
Jonathan Williams	586cc6e3e0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-09 09:40:58 -06:00
xGamingDudex	ba171f95c6	Fixed UtilEnt.isGrounded for non-player entities. Updated UtilEnt.isGrounded(Entity) to only apply custom handling of players. Non-player entities now uses the default .isOnGround() check. Implemented to fix entities like minecart which applies custom is-on-ground checks.	2015-10-09 14:42:38 +02:00
Cheese	ff42e05a8d	Merge branch 'Myst_HALLOWEEN'	2015-10-09 14:20:58 +11:00
Mysticate	fb4d08931c	Spider mount improvements.	2015-10-08 23:18:37 -04:00
Cheese	d9dd471db6	removed annoying debug	2015-10-09 14:04:12 +11:00
Mysticate	90d0fcb36d	Merge branch 'Myst_HALLOWEEN' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_HALLOWEEN	2015-10-08 22:53:45 -04:00
Mysticate	598ea84e7a	Fixed explosions and cleaned up.	2015-10-08 22:52:57 -04:00
Cheese	d18353e592	Merge branch 'Myst_HALLOWEEN' of ssh://184.154.0.242:7999/min/Mineplex into Myst_HALLOWEEN Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java	2015-10-09 13:44:41 +11:00
Mysticate	082b16fe0d	Stuff and things to help make mounts be cool.	2015-10-08 22:28:07 -04:00
Cheese	54c76c9d9c	fixed text	2015-10-09 12:27:30 +11:00
Cheese	a234fbce1e	Merge branch 'Myst_HALLOWEEN'	2015-10-09 12:17:57 +11:00
Mysticate	ed31bf9886	Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN	2015-10-08 21:16:24 -04:00
Mysticate	9254ca9162	K reverted + fixed bug	2015-10-08 21:12:38 -04:00
Cheese	24568a40f3	Merge branch 'Myst_HALLOWEEN'	2015-10-09 12:05:24 +11:00
Cheese	483ab13c2b	workaround for error where accountid is never set	2015-10-09 12:04:35 +11:00
Cheese	17ba04348d	stats debug	2015-10-09 11:53:08 +11:00
Mysticate	84cbee4535	Fixed it again	2015-10-08 20:52:17 -04:00
Mysticate	145832b326	Fixed mounts bc chiss is bad	2015-10-08 20:50:39 -04:00
Cheese	21dc0dc962	Merge branch 'Myst_HALLOWEEN'	2015-10-09 11:47:20 +11:00
Cheese	ec5694737c	statsmanager debug rank fix	2015-10-09 11:44:12 +11:00
Mysticate	8a8591ae7f	Merge branch 'master' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_HALLOWEEN Conflicts: Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java	2015-10-07 22:19:10 -04:00
Mysticate	668454f156	Fixed things	2015-10-07 22:10:57 -04:00
Mysticate	f2485854ef	Improved spider.	2015-10-07 22:06:57 -04:00
Mysticate	70f3ccf703	Fixed spider morph	2015-10-07 21:53:23 -04:00
Mysticate	e864e0867a	Adds mount spider and fixes a BH bug.	2015-10-07 21:47:10 -04:00
Cheese	f28d83cbd7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-08 12:05:51 +11:00
Cheese	c94184c5ae	reduced number of falling blocks in skywars by 80% added halloween horror mount	2015-10-08 12:04:28 +11:00
fooify	a177b0cd43	Merge remote-tracking branch 'origin/master' into foo	2015-10-06 16:45:01 -07:00
Shaun Bennett	8fb82507e1	Merge remote-tracking branch 'origin/master'	2015-10-06 12:24:34 -04:00
Shaun Bennett	9cb3f250e2	Remove streak record data until a better solution is done	2015-10-06 12:24:16 -04:00
Cheese	e2e2356b04	stuffs	2015-10-06 13:25:15 +11:00
Sarah	6e0e618e03	Finishing Achievements.	2015-10-06 03:20:25 +02:00
Thanos paravantis	c2518bc6c4	Some additional bug fixes were applied on the previous commit. Water damage by TNT on game lobbies is now patched.	2015-10-04 16:32:34 +03:00
Jonathan Williams	ba17404212	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-04 00:20:52 -05:00
Jonathan Williams	1830705692	Removed ItemCategories to reduce strain on the database with queries that are more complex than they need to be. Increased Firework recharge time.	2015-10-04 00:20:41 -05:00
Ty Sayers	17fbd42b9c	Fix bug where a players inventory was not properly updated after switching to SURVIVAL mode, causing CustomGear items to remain unhidden an JSON encoded.	2015-10-02 14:30:39 -04:00
Ty Sayers	661bba3714	Fix offensive skill exploit where players could swap hotbar slots quickly and keep their original offensive spell casting for a large damage and speed advantage (running and attacking). Fix bug edge-case where outgoing slot packets were being missed, causing players CustomGear items to improperly display encoded JSON data instead of a user-friendly item description.	2015-10-02 13:57:46 -04:00
Shaun Bennett	993c9783ec	Add Votifier Jar, display team stats for SG, SW, SSM	2015-10-02 13:15:02 -04:00
Shaun Bennett	5bce1b5f2e	Fix merge issues, fix observer command	2015-10-01 22:57:39 -04:00
Jonathan Williams	bc84dc6817	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-01 07:39:17 -07:00
Jonathan Williams	631bd9cfa6	Removed sale notification. Removed queue create table query. Added try-catch for ServerMonitor to prevent stat storage from affecting normal operation.	2015-10-01 07:38:59 -07:00
Mysticate	a6d7cccbe5	Fixes	2015-09-30 22:31:03 -04:00
Ty Sayers	b4c9bfbb57	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear Conflicts: Plugins/.idea/compiler.xml Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java Plugins/Mineplex.Core/.classpath Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java Plugins/Mineplex.Hub/.classpath Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java	2015-09-29 18:09:52 -04:00
Ty Sayers	ab1ac379a7	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-09-29 17:36:51 -04:00
Ty Sayers	bc7615a5c3	Fix Illusion bug causing the Illusion clone to not properly function and spawn inside Clan territories. Fix bug where Carrots and Potatoes purchased from the Produce shop could not be eaten. Fix bug with SQL query when adding new enemies and not initialized 'initiator' field with a proper value. Modify starting score values for clan wars to 0 instead of 20. Update CustomItem descriptions with bullet points instead of hyphens for more readable stats. Reword error messages associated with trusting non-allied clans to be more intuitive to players.	2015-09-29 17:36:42 -04:00
Shaun Bennett	437e62c7db	Fix priority for dupe fix	2015-09-28 20:44:57 -04:00
Shaun Bennett	8a9cc9ff14	Food Dupe Fix	2015-09-28 20:42:14 -04:00
Shaun Bennett	92436c8f9d	Merge pull request #60 in MIN/mineplex from alex-bugfixes to master * commit '8a94602aefc1e4ea3490da434f14205f99ba1d8e': Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text Made rank unlock lore colored based on rank required for item (QA Requested) Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for. Marked the Bunny Morph to reflect its no longer available status Fixed previous ownership not being transferred Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui	2015-09-27 22:39:50 -05:00
Jonathan Williams	eae894c879	Merge pull request #65 in MIN/mineplex from mrsomeone12_SmallFixes to master * commit '436f63860ecef028d23dae28ceb52e466e90270b': NBT overflow patch	2015-09-26 17:32:30 -05:00
Jonathan Williams	ee5934c7aa	Fix for punishments to match names exactly Fix for expiring ranks. Fix for EU Lobby count.	2015-09-26 18:31:37 -04:00
xGamingDudex	436f63860e	NBT overflow patch Patch for the NBT overflow exploit which allowed any player to overflow and drain the server for memory making it freeze and eventually crash.	2015-09-26 01:48:38 +02:00
AlexTheCoder	7c04e5608d	- Added new achievement 'Clutch' - Made new achievements needed for achievement skills	2015-09-25 04:17:20 -04:00
AlexTheCoder	5b42d25bff	- Added achievement and stat stuff - Fixed banner bugs	2015-09-24 23:16:44 -04:00
libraryaddict	e94eb056dc	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-09-25 14:09:18 +12:00
libraryaddict	34d535f153	Fix custom tags, improve Packet handling	2015-09-25 14:07:51 +12:00
libraryaddict	fa30ba1e16	Fix a small issue with Future Disguises	2015-09-25 14:07:12 +12:00
AlexTheCoder	cd33bf8dd8	- Fixed updaterank and testrank scoreboard conflict	2015-09-24 11:47:50 -04:00
AlexTheCoder	a488bfab3e	- Rewritten testrank system - Multiple rank improvements for real-time use - Removed /updaterank from Jr.Dev	2015-09-24 11:44:45 -04:00
Mysticate	125b823a65	Fixed achievement arcade page size.	2015-09-23 15:43:14 -04:00
Mysticate	84331901d4	Added achievements and final polish.	2015-09-23 15:18:44 -04:00
AlexTheCoder	c709980db3	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2015-09-23 13:08:25 -04:00
Shaun Bennett	2b902c5193	Add created by, enabled by, and disabled by to botspam module	2015-09-23 00:25:39 -04:00
Ty Sayers	3a8fd18d2e	Disable the ability to craft Fishing Rods. Fix bug where players could use the Blink or Flash skills to bypass borders on negative coordinate sides of the map and die to border control. Fix bug where players could open the enchantment table GUI and enchant items when shift clicking without an item. Fix bug where players couldn't place blocks on top of Anvils. Fix NPE bug with players clicking on Anvils while not holding an item. Fix bug where the '/c home' command cooldown was reset on a players death, allowing for abuse. Fix duplication bug where BlockToss could be exploited inside claims by throwing valuable blocks into water blocks. Fix bug where players could lose items to NPC shop inventories using inventory drag skills to drag items across open slots. Cap the member size of a clan to 20 and maximum available claim count to 8.	2015-09-22 15:28:06 -05:00
Shaun Bennett	cf618abd4e	BotSpam Module	2015-09-22 01:38:45 -04:00
libraryaddict	452e8a9694	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-09-19 12:11:21 +12:00
libraryaddict	8015f5428d	Flags stuff	2015-09-19 08:36:23 +12:00
Shaun Bennett	901dad2f8a	Add vote3 to bonusmanager	2015-09-17 22:31:18 -04:00
libraryaddict	5e8fc77164	Add pages to spectator and in-progress server menu	2015-09-17 04:34:45 +12:00
Cheese	ac269839c5	squid skill	2015-09-14 14:14:06 +10:00
fooify	2de7fff267	Merge remote-tracking branch 'origin/master' into monster-maze	2015-09-13 08:45:34 -07:00
Sarah	216c8783a9	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-09-13 03:51:06 +02:00
Jonathan Williams	1417d31b73	Added 60s delay to timings enable check.	2015-09-11 23:57:26 -07:00
Jonathan Williams	a7d4a7534f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-09-11 22:51:04 -07:00
Jonathan Williams	2380b9041d	Added automatic timings report in the event of lag. Added more exception handling around LoadingWindow	2015-09-11 22:50:53 -07:00
Cheese	4184fe20cf	minor fixes	2015-09-12 14:09:04 +10:00
Ty Sayers	9be0ecc598	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/MurderManager.java Additionally: Disable Endermen and Horses from spawning on the server. Fix bug where players could shoot others from within spawn and throw cobwebs from inside spawn. Fix bug where players could use the Travel Hub while combat tagged. Fix bug where Water flowed into Spawn areas. Fix bug where players could abuse BlockToss to pick up water blocks and throw them inside restricted liquid areas. Fix bug where Fissure created cracked StoneBricks which could be exploited for base raiding. Re-organize some Spawn/Safe Zone related logic into a more intuitive location (Spawn class) and add more descriptive documentation to event handlers in Spawn.	2015-09-11 17:01:04 -05:00
libraryaddict	6474f5a9e9	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-09-06 16:23:18 +12:00
Jonathan Williams	4bb100b6be	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-09-05 01:53:45 -07:00
Jonathan Williams	2536d8a437	Fixed out of range stats causing no stats to load. Issue fix to db for out of range stat on login.	2015-09-05 01:40:56 -07:00
Cheese	0ac808ba43	stacker pref is now only for pvp stacking.	2015-09-05 10:30:11 +10:00
Cheese	fc5ccd4a5e	fixed 'self scoring' in Soccer removed silverfish on wither pet despawn	2015-09-05 10:04:54 +10:00
libraryaddict	21d9f5767e	CustomTagFix support changing and removing of names.	2015-09-04 19:23:33 +12:00
AlexTheCoder	f05cdd4915	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-09-04 02:57:47 -04:00
Jonathan Williams	890c9d59e1	Fixed loading window bug. Added default rank for CoreClient in case of bugged login.	2015-09-03 09:38:02 -07:00
AlexTheCoder	9dc90b0e13	Added CTF to Champions stat group	2015-09-01 01:26:35 -04:00
AlexTheCoder	8a94602aef	Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text	2015-08-31 16:03:27 -04:00
AlexTheCoder	fe4586852c	Made rank unlock lore colored based on rank required for item (QA Requested)	2015-08-31 15:59:53 -04:00
AlexTheCoder	cbb0d4521c	Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for.	2015-08-31 15:49:31 -04:00
AlexTheCoder	5322e9d018	Marked the Bunny Morph to reflect its no longer available status	2015-08-31 15:48:25 -04:00
AlexTheCoder	24fed013ae	Fixed previous ownership not being transferred	2015-08-31 15:39:04 -04:00
AlexTheCoder	b63843930f	Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui	2015-08-31 15:08:42 -04:00
AlexTheCoder	e93db405d0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-08-31 04:48:43 -04:00
AlexTheCoder	788ec97d38	Added CTF wins to achievements for champions	2015-08-31 04:39:07 -04:00
Jonathan Williams	c61f9ce3c8	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-31 00:53:23 -07:00
Jonathan Williams	740899c09e	Added dummy CoreClient in the rare event a player joins and gets disconnected during the join event????Weird Fixes Lobby crashes.	2015-08-31 00:53:07 -07:00
Ty Sayers	6bb4e69236	Fix bug where players could shift-click items into shop page and lose it forever. Fixed bug where players couldn't place blocks against Anvils/Enchantment Tables while crouched. Fixed bug where clans could enemy other clans that had vastly fewer members than them. Fix bug where CustomGear items broke when a player entered Creative gamemode. Fixed bug where CustomGear suffix attributes did not properly format names. Fixed bug where the Frosted weapon attribute did not properly apply it's slowness effects to enemies.	2015-08-30 17:05:45 -07:00
Mini-Chiss	d79794c6d3	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-30 15:47:57 -07:00
Mini-Chiss	bb66d47e8e	meow	2015-08-30 15:47:49 -07:00
Ty Sayers	b0efe35531	Add restriction to ServerCommand that prevents players from directly connection to a Clans-X server, and instead insists that they join through a Clans hub.	2015-08-30 13:14:01 -07:00
Shaun Bennett	908d11ead5	Disable staff from joining the full server, Fix clans login manager, fix undead camp not spawning, fix clans admin command for all players, enable server for mapdev+, add TNT, generator, and class shop back to pvp shop, fix land claiming query	2015-08-30 12:00:58 -07:00
AlexTheCoder	eca69a8ae2	Made new branch up to date and including previous branch's code	2015-08-30 03:58:58 -04:00
Shaun Bennett	c27fdf023c	Fix login manager and stats manager	2015-08-29 17:18:14 -07:00
Jonathan Williams	4e32bad8dd	Fixed bug with stats pulling as int. Fixed bug with Poll recording selections wrong.	2015-08-29 14:54:57 -07:00
Ty Sayers	aad5942242	Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server.	2015-08-29 14:46:18 -07:00
Jonathan Williams	f8729cbd66	Fixed Gadget.	2015-08-28 23:47:27 -07:00
Mini-Chiss	d35b5940fc	fixed achievements	2015-08-28 23:30:21 -07:00
Mini-Chiss	5ae01f95a8	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-28 23:27:35 -07:00
Mini-Chiss	181afaa2d6	Merge branch 'Myst_EVO'	2015-08-28 23:25:51 -07:00
Mysticate	b71bcfab4b	Fixed achievements. Merge ASAP	2015-08-29 00:19:39 -06:00
Jonathan Williams	d4d0c4bed6	Updated Motd.	2015-08-28 23:17:14 -07:00
Jonathan Williams	c98a85c2ba	Added local storage of login time. Hooked in onlineTime bonus feature to real values.	2015-08-28 22:09:42 -07:00
Jonathan Williams	ad4ba010b7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-28 20:59:08 -07:00
Jonathan Williams	6f0309622c	Removed AccountCache. Converted that to PlayerCache and store account id in there.	2015-08-28 20:58:58 -07:00
Mysticate	ebd3fbe6d5	Merge remote-tracking branch 'origin/master' into Myst_EVO	2015-08-28 20:19:27 -06:00
Jonathan Williams	e9b33668bc	Added donorsOnline to MinecraftServer snapshot Refactored Rank class to use lowercase methods.	2015-08-28 13:22:04 -07:00
Shaun Bennett	6f39c072a4	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-28 12:57:13 -07:00
Shaun Bennett	7761ca7e6f	Remove debug messages	2015-08-28 12:56:43 -07:00
Ty Sayers	b98cde8b80	Fix bug where players couldn't move items in their inventory to sell gold tokens to shop. Reduce knockback amount on HeavyArrow skill for Ranger class. Prevent players who do not have the Ranger or Assassin class from being able to shoot bows. Add notification message on Smelting feature to reduce confusion among players. Fix bug with Building shop where the listed sell price and actual sell price weren't synced properly. Fix bug with all shops where purchasing items in bulk failed.	2015-08-28 12:52:02 -07:00
Shaun Bennett	cd145324d8	Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit	2015-08-28 12:00:23 -07:00
Ty Sayers	783f526b76	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-27 14:42:41 -07:00
Ty Sayers	4dcd54a9b0	Fix bug with DisguiseManager not properly handling the undisguising of non-player entities. Fix bug where FleshHook skill could be activated on players in a safe zone. Fix multiple bugs with unsafe logging system and NPC drops. Fix bug where unsafe timers and combat tagging in safe zones was not properly functioning. Fix bug with CustomGear not properly spawning with command. Add Clan Blacklist that restricts naming of Clans.	2015-08-27 14:42:07 -07:00
libraryaddict	379ee9271a	Merge pull request #43 in MIN/mineplex from clans/world-events to clans-beta * commit '9d3f125c9eb1139e6d5cfbdbe63158161e6a488b': Iron Wizard, fixed iron golem custom name Push golem block shot as per request	2015-08-27 16:34:46 -05:00
libraryaddict	9d3f125c9e	Iron Wizard, fixed iron golem custom name	2015-08-27 14:18:10 -07:00
Shaun Bennett	b0ee2bb669	Fix purple/black item bug, fix clans/ally chat bug with no clan, murder changes, drop player gold as items on death, add lore to crafted items	2015-08-27 13:57:57 -07:00
Mysticate	f2f6afb6ca	Fixes :D	2015-08-26 20:10:58 -06:00
Ty Sayers	c20d2c9516	Fix bug with economy gold additions/reductions not properly working and causing shops to fail. Fix bug with region resetting command and streamline the claiming of server-based faction chunks for Spawn, Shops, Fields and Borderlands.	2015-08-26 17:37:31 -07:00
Mysticate	cfdb0dfa4f	Added kits + achievements. Hurrah!	2015-08-26 13:19:17 -06:00
Sarah	15aca5dca9	Making the mob spawning prototype. still have to figure out how to move them properly.	2015-08-26 00:59:28 +02:00
fooify	64ca6ecce0	Merge remote-tracking branch 'origin/master' into foo	2015-08-25 08:20:37 -07:00
Shaun Bennett	062328313e	Fix errors	2015-08-24 22:24:26 -05:00
Shaun Bennett	bf1f62057c	Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta Conflicts: Plugins/.idea/misc.xml Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java	2015-08-24 22:15:08 -05:00
Shaun Bennett	6841cbac69	Clans bug fixes + shop updates	2015-08-24 22:03:26 -05:00
Ty Sayers	69afefd66f	Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear Conflicts: Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java Additionally, fix bug where players could fish hook to combat-tag a player in spawn and then attack them. Fix issue where players were able to empty lava and water buckets. Fix bug where monsters wandered into and around spawn zones. Fix bugs where special abilities FireBlast, ExplosiveShot, and WolfsPounce were not affecting mobs (only players). Fix bug with soup left-click punch activation not fully integrated.	2015-08-24 20:55:29 -04:00
fooify	2e016de9e5	Fixed ignore command, now works	2015-08-24 14:07:21 -07:00
Jonathan Williams	6d3c965f14	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-23 16:26:02 -07:00
Jonathan Williams	1e7f2f01a7	Fixed problem where UUID api was preventing client loading from db.	2015-08-23 15:38:43 -07:00
Ty Sayers	a9f5197c64	Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Database/src/mineplex/database/Account.java Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java	2015-08-22 15:18:51 -04:00
Ty Sayers	6c9a99fa1b	Fix soup consumption bug that didn't allow left clicking for use. Fix bug with item frames being destroyed inside spawn zones. Fix bug with bow deficient classes not properly receiving damage reductions on their bow attacks. Fix bug with Whirlwind Axe skill being enabled in Clans settings. Fix bug where bank related shop buttons functioned as gold token purchasables for error-displaying icons. Increasing duration on potion application from custom gear to prevent shaking inventory screen. Fix bug with gold balance changes (add/remove) weren't taking place synchronously, leading to the ability for duplication of gold and items. Fix bug where enemy'd Clans could be allied or neutral'd, as well as signaling that at-war clans were neutral. Fix bug where clans could unclaim admin chunks and ally chunks. Decrease the rate at which hunger decreases to be more accordance with 1.6 food systems. Disable Flint & Steel, Enderpearls, and Witch spawning.	2015-08-22 15:06:05 -04:00
libraryaddict	cdc92f8b2f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-22 00:38:55 +12:00
libraryaddict	7841b17d03	Add PacketPlayOutCamera for locking view to entity	2015-08-22 00:38:37 +12:00
libraryaddict	bad339cf04	Tweak dead bodies more	2015-08-21 20:52:57 +12:00
libraryaddict	c41328d726	Dead bodies: Change to Item from disguised arrow, fix body positioning, move to Game.java to enable in all games	2015-08-21 20:40:09 +12:00
libraryaddict	39ede2064a	Bosses game progress	2015-08-21 16:12:26 +12:00
Mini-Chiss	15c873392a	updated give to allow naming of items.	2015-08-20 20:38:07 +02:00
Jonathan Williams	bbe5b79c7e	Disabled AntiHack create table. Fixed NPE with ServerManager	2015-08-19 04:11:34 -05:00
Mini-Chiss	14bf8faf3a	disabled big sale	2015-08-18 09:49:53 +02:00
fooify	d489b31738	merge	2015-08-17 16:27:28 -07:00
Mini-Chiss	b7854e6cab	added big larry to chests	2015-08-17 13:05:41 +02:00
Mini-Chiss	9eed03237b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-17 12:39:06 +02:00
Mini-Chiss	58e517a4d7	fixed null args more	2015-08-17 12:38:41 +02:00
Shaun Bennett	8ab8388344	Merge remote-tracking branch 'origin/master'	2015-08-17 05:05:36 -05:00
Shaun Bennett	5c71522b2d	Return the first UUID instead of last (AccountRepository)	2015-08-17 05:05:25 -05:00
Mini-Chiss	0a23f91592	fixed two little bogs	2015-08-17 11:53:50 +02:00
Mini-Chiss	7a7543886f	fixed a ton of commands NPEing on no args	2015-08-17 09:04:39 +02:00
Shaun Bennett	555908a3c1	Rename preferences gui, add shop items for gold and emeralds (commented out right now), fix typo	2015-08-15 02:03:46 -05:00
Shaun Bennett	fda052ea90	Add treasure chest stats	2015-08-14 21:34:37 -05:00
Shaun Bennett	e89961380b	Merge remote-tracking branch 'origin/master'	2015-08-14 21:14:41 -05:00
Shaun Bennett	1eaa6446af	Fix double hologram and hopefully NPE	2015-08-14 21:14:34 -05:00
Shaun Bennett	c520bd7921	Add recharge to carl spins so that they don't get triggered twice	2015-08-14 20:43:58 -05:00
libraryaddict	a1ea03f74b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events Conflicts: Plugins/.idea/misc.xml Plugins/.idea/modules.xml Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java Plugins/Mineplex.Database/src/mineplex/database/Routines.java Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java	2015-08-14 19:44:56 +12:00
Jonathan Williams	a2d7aa77fe	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-14 00:37:55 -05:00
Jonathan Williams	f5d934fe53	Fixed sync db calls for pets. Make sure to add/remove pets in mysql.	2015-08-14 00:37:43 -05:00
Shaun Bennett	0b4dbab871	Change ticket command access to admin	2015-08-13 11:23:29 -05:00
Shaun Bennett	bd7317cf7b	Fix ticket command rollback >:D	2015-08-13 11:03:12 -05:00
Shaun Bennett	bc8aff31cb	Merge remote-tracking branch 'origin/master'	2015-08-13 06:12:24 -05:00
Shaun Bennett	af15476f19	Use login query to handle logins	2015-08-13 06:12:11 -05:00
Mini-Chiss	878ac82ade	fixed error!	2015-08-13 13:01:41 +02:00
Mini-Chiss	1487692609	completely disabled team armor in arcade. avoids typing it just as game starts.	2015-08-13 12:57:30 +02:00
Mini-Chiss	fc1a8e4e25	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-13 12:52:11 +02:00
Mini-Chiss	f3b58fe9b6	disabled team armor command in games D:	2015-08-13 12:51:57 +02:00
Shaun Bennett	e1d04354fb	Use dummy record for AddPlayer	2015-08-13 05:18:53 -05:00
Shaun Bennett	4d6e827739	Remove vote3!	2015-08-13 04:03:03 -05:00
Shaun Bennett	92c0e1452b	Add vote3	2015-08-13 04:01:53 -05:00
Shaun Bennett	0c68321e81	Global button	2015-08-13 03:58:05 -05:00
Shaun Bennett	11a4805c38	Stat stuff!	2015-08-13 03:54:23 -05:00
Shaun Bennett	4aac057956	Merge remote-tracking branch 'origin/master'	2015-08-13 03:32:40 -05:00
Shaun Bennett	05b1b91686	Carl!	2015-08-13 03:32:31 -05:00
Jonathan Williams	8476578bc0	Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master * commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324': Various Fixes.	2015-08-13 01:52:16 -05:00
Jonathan Williams	a308244966	Merge pull request #29 in MIN/mineplex from foo to master * commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits) minor grammar issue remove duplicate method manually updating something crosses fingers please work! please work... Freezes the time using doDayLightCycle instead of using a UpdateEvent. Fixed double-half-slabs (line 68) remove custom level to fix merge conflicts squirrel! fix getting snowballs from bedrock add jnr_dev to updaterank fix this agaaaaain FOOIFY IS A NOOB OKAY fix concurrentmodificationexception fix turfforts bug prevent STATIONARY_LAVA from breaking in creeper smash fix creeper smash exploding lava and bedrock fix spleef lava issue ishh also wanted this :P (let me know if I should remove it) ishh wanted it...k ...	2015-08-13 01:49:00 -05:00
Shaun Bennett	37e5e97020	Fix experience reward displaying as game	2015-08-12 03:08:40 -05:00
Shaun Bennett	f81f5d82d6	Merge remote-tracking branch 'origin/master'	2015-08-12 03:00:16 -05:00
Shaun Bennett	30f20801c7	Lets hope everything works!	2015-08-12 03:00:07 -05:00
Mini-Chiss	860127631c	fixed item insta-despawn	2015-08-12 09:27:05 +02:00
Mini-Chiss	ade76791b3	optimized item cleaning	2015-08-12 09:12:49 +02:00
Sarah	a1ba0f6d86	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex	2015-08-12 09:01:20 +02:00
Sarah	2a40eee9e7	Increasing radius of items despawning.	2015-08-12 09:00:13 +02:00
Mini-Chiss	7ea148a802	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-12 08:58:36 +02:00
Sarah	e4eb286225	Fixing despawning.	2015-08-12 08:56:20 +02:00
Mini-Chiss	c00f9a7aaa	Merge branch 'Bonus'	2015-08-12 08:39:31 +02:00
Sarah	be699558f1	Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus	2015-08-12 08:38:18 +02:00
Sarah	af19754bcd	Implementing Carl to Arcade.	2015-08-12 08:37:54 +02:00
Mini-Chiss	e8963cc2af	fixed paintbrush	2015-08-12 08:10:43 +02:00
Mini-Chiss	2ed388552b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-12 07:59:39 +02:00
Shaun Bennett	99a94251fd	Fixes	2015-08-12 00:56:20 -05:00
Shaun Bennett	8e4ae35256	Merge remote-tracking branch 'remotes/origin/master' into Bonus	2015-08-12 00:56:04 -05:00
Shaun Bennett	4549c810d4	Fix for voting	2015-08-11 22:59:59 -05:00
Mini-Chiss	a7cc3e1aa6	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-11 21:13:59 +02:00
Mini-Chiss	d41ab3432f	remove paintbrush when moved away	2015-08-11 21:13:45 +02:00
libraryaddict	72adf21bff	Gadget Paintball: Add particles on impact, change block break effect to stone break sound.	2015-08-12 06:23:13 +12:00
fooify	10f979772b	Merge remote-tracking branch 'origin/master' into foo	2015-08-11 09:51:13 -07:00
Mini-Chiss	83a010c215	enabled summer sale msg	2015-08-11 17:05:41 +02:00
Mini-Chiss	89dab7ec85	some little fixes	2015-08-11 16:33:32 +02:00
Sarah	f7d9476191	Hidden egg fix	2015-08-11 13:53:36 +02:00
Sarah	5c7d140521	Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus	2015-08-11 13:49:53 +02:00
Sarah	e25558fc91	Animation improvements.	2015-08-11 13:49:06 +02:00
Mini-Chiss	49d54d4dd3	doesnt count rank thingy as reward if no rank. yknow	2015-08-11 13:22:58 +02:00
Sarah	2d7d7f6dde	Improving messages, animations and some Items.	2015-08-11 13:01:20 +02:00

... 19 20 21 22 23 ...

3544 Commits