Mineplex2018-withcommit

JarvisBigBalls/Mineplex2018-withcommit

Author	SHA1	Message	Date
Shaun Bennett	95c22a59fd	Use DNS for chat filter	2016-02-15 16:30:57 -06:00
Shaun Bennett	d1e098ca13	Merge remote-tracking branch 'origin/develop' into develop	2016-02-15 20:44:52 -06:00
Shaun Bennett	15ed2570e2	Valentines final changes, Change Gift Giver achievement	2016-02-15 20:43:46 -06:00
NewGarbo	a5de88e6ee	accidentally added those ifles	2016-02-15 11:25:33 +00:00
NewGarbo	e25accfba4	outpost saving and loadi9ng	2016-02-15 11:24:29 +00:00
md_5	305973198c	Merge remote-tracking branch 'origin/md_5/sentry' into develop	2016-02-15 09:20:34 +11:00
AlexTheCoder	f0d59755d2	- Update	2016-02-14 03:31:36 -05:00
phobia	d7ad2cdc58	moar undead fixes	2016-02-14 12:37:37 +11:00
NewGarbo	93a5ca6777	weapons need to be centered	2016-02-14 00:45:54 +00:00
phobia	24254635a8	Fixes to observer settings	2016-02-14 09:51:59 +11: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	6385aacbac	- Updates	2016-02-13 14:28:39 -05:00
AlexTheCoder	138c900484	- Fixed up for more universal damage switching	2016-02-13 12:46:57 -05:00
AlexTheCoder	8b39d7ba43	- Void damage fix	2016-02-12 23:16:56 -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
AlexTheCoder	9595a0ffae	- Lot of stuff	2016-02-12 21:22:00 -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	e8559d423a	Add Valentines Vendetta to quick server menu	2016-02-12 05:27:50 -06:00
Shaun Bennett	960a0cdabb	Fix constructor error, add ValentinesGiftManager to Arcade	2016-02-12 05:06:13 -06:00
Shaun Bennett	eca400278c	Support server update	2016-02-12 05:00:09 -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	4f0f81c8df	Update Courtship messages	2016-02-12 01:47:20 -06:00
Shaun Bennett	d51e26a5a4	Valentines game adjustments	2016-02-12 01:34:29 -06:00
NewGarbo	90570c1185	progress on saving outposts/wepaons so far. not finished. probably going to change it to a different format	2016-02-12 07:00:21 +00: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
William Burns	790ed4f993	Fix tools for block type/colour selections.	2016-02-11 08:11:40 +00:00
NewGarbo	67b12f3ae2	loads of progress	2016-02-10 19:24:57 +00:00
William Burns	b3045d38e7	Add colour selection for multiple block types.	2016-02-10 16:34:00 +00:00
NewGarbo	b308d1759f	renamed stuff to more sensible stuff. :}	2016-02-10 13:02:55 +00:00
NewGarbo	2be917e623	give enemy info about time before siege and after outpost is built, the health of the outpost	2016-02-10 13:01:31 +00:00
NewGarbo	69bdbdde70	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/Clans.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java	2016-02-10 11:54:36 +00:00
NewGarbo	35f0162882	make catapults rideableeeeeee	2016-02-10 11:09:17 +00:00
Cheese	eebe25040e	cleaned the particle effects a bit	2016-02-10 16:31:25 +11:00
Shaun Bennett	00f7880dd2	Fix compile error	2016-02-09 21:15:15 -06: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
NewGarbo	43cf4d38ef	give player arrow back after failed territory siege declaration arrow thingy fire thingy ehh grammar is not needed at night :}	2016-02-09 21:36:58 +00:00
NewGarbo	e74cefeee8	increased siege weapon placement area, and made outposts handle siege weapons that are placed within them	2016-02-09 19:59:01 +00:00
NewGarbo	e782097563	shouldn't be able to fire weapons whilst in siege wait time	2016-02-09 19:49:25 +00:00
NewGarbo	2b44b88ea2	not being able to fire bow without the correct class and changed arrow to actually be an arrow	2016-02-09 19:48:48 +00:00
NewGarbo	67d1bffe82	npe and clan minimum players set for siege	2016-02-09 19:47:42 +00:00
NewGarbo	9342bee371	das ist gut	2016-02-09 17:05:59 +00:00
Cheese	6800e4ef47	valentines final push	2016-02-09 20:43:24 +11:00
NewGarbo	99ece6eaea	add chest with arrwos to outpost. test for clans in area	2016-02-09 05:53:37 +00:00
Shaun Bennett	a868b8b2b8	Valentines gifts	2016-02-08 22:26:33 -06:00
NewGarbo	dd2fe36a3d	added "Borderlands" to Clan name blacklist	2016-02-08 22:23:26 +00:00
NewGarbo	052d3c3380	siege system updates	2016-02-08 21:33:12 +00:00
NewGarbo	2c13824f9b	possesive method in UtilText	2016-02-08 20:46:45 +00:00
NewGarbo	b8471d7a8e	getter for crater size	2016-02-08 20:46:15 +00:00
NewGarbo	3ee3059bc7	against clan needs to have a getter	2016-02-08 18:38:30 +00:00
NewGarbo	9379c4190a	add against clan to outpsots and also renamed "clan" to "owner" to make it more obvious	2016-02-08 18:31:03 +00:00
Virizion	51d152d484	Perfect build all fix	2016-02-07 19:05:53 -05:00
Virizion	aaf1fd42f3	Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.	2016-02-07 18:16:36 -05:00
Virizion	b40f018ee2	Stop mid game joiners from getting participation gems.	2016-02-07 17:20:58 -05:00
Virizion	e96b4c4a7f	Mob egg baby fix. Also fixed non build entities from being "broken"	2016-02-07 15:59:59 -05:00
Virizion	008fc587b0	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2016-02-07 15:33:37 -05:00
Virizion	7e9ff95ae3	spec command add guardian	2016-02-07 15:27:39 -05:00
Shaun Bennett	a5c5a7c536	Merge pull request #157 in MIN/mineplex from bugfix/bridges-ore-mining to develop * commit '465f12e210120e316e9252dc4e5b7207b4ae0279': Fixed NPE Made sure that a valid tool is used before dropping any items.	2016-02-07 14:00:46 -06:00
Shaun Bennett	c059425e9d	Remove GiveawayManager (not used anymore)	2016-02-07 13:18:29 -06:00
Mysticate	465f12e210	Fixed NPE	2016-02-07 13:27:38 -05: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
md_5	f7b8dada6d	Add Sentry to BungeeCord too.	2016-02-07 21:40:51 +11:00
Cheese	2ab1b51401	bug fixes	2016-02-07 14:09:02 +11:00
Cheese	a35a9ea31f	more valentines :)	2016-02-07 13:27:53 +11:00
Mysticate	c1393697f8	Started on Love Potion system. Switching branches.	2016-02-06 14:08:17 -05:00
Shaun Bennett	4f5625d63e	Clans Alpha 1.0 changes	2016-02-05 18:42:22 -05:00
phobia	27e4ef784c	WP Evade	2016-02-06 08:44:37 +11:00
NewGarbo	9dc34b5a60	better damage calculation and fixed messages for siege weapon damaging	2016-02-05 19:12:12 +00:00
phobia	b0888208d1	More alphs bug fixes	2016-02-05 23:55:38 +11:00
NewGarbo	e448046e4f	made inv get cleared on fire	2016-02-05 10:40:53 +00:00
Virizion	2ac7840d71	The infamous look direction bounce bug	2016-02-04 23:54:54 -05:00
Virizion	b0b43524da	Chiss' double jump mechanic	2016-02-04 22:05:46 -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
Cheese	690c2acce8	many valentine, such wow	2016-02-05 13:25:57 +11:00
NewGarbo	bef898afc1	final fixes (? (still broken))	2016-02-05 01:01:10 +00:00
phobia	6291decf87	Fixes to flame and broadsword	2016-02-05 11:42:39 +11:00
NewGarbo	1b92871b93	remove annoying debug messages	2016-02-04 23:50:44 +00:00
NewGarbo	62d45d5419	fix flip starngesness	2016-02-04 23:49:02 +00:00
NewGarbo	f5d826a2cb	two parentheses. all it took to fix it. GRRR	2016-02-04 23:42:27 +00:00
NewGarbo	8c1ae12d19	beta stuff	2016-02-04 23:29:48 +00:00
phobia	73d4ff2639	Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha	2016-02-05 10:12:31 +11:00
phobia	6fd9cffb01	Clans alpha bug fixes	2016-02-05 10:12:18 +11:00
NewGarbo	16012285e0	rotation fix	2016-02-04 23:11:51 +00:00
NewGarbo	6c7d08a8f9	Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha	2016-02-04 22:55:53 +00:00
NewGarbo	e61b36f55c	Fixed /c stuck timer taking 7 seconds instead of 2 minutes	2016-02-04 22:55:37 +00:00
NewGarbo	03da4485b3	pushing to switch to clans/alpha	2016-02-04 22:54:43 +00:00
NewGarbo	bc19cf01f7	hopefully that fixes the location offset =/	2016-02-04 22:48:11 +00:00
NewGarbo	fa460dbd45	catapult rotatyyyy	2016-02-04 21:50:47 +00: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
NewGarbo	50c2da2a95	forgot to include this; version getter thingy in Clans	2016-02-04 16:10:14 +00:00
NewGarbo	5a8fae4974	stop catapult projectile from getting stuck on bounding box	2016-02-04 16:09:32 +00:00
NewGarbo	ecdd21a800	version or plugin command now shows version of clans	2016-02-04 16:09:13 +00:00
NewGarbo	b13494f399	more modifications to siege weapons.	2016-02-04 16:00:41 +00:00
Cheese	5c22c841fe	val1	2016-02-04 10:55:29 +11:00
Shaun Bennett	699a26f630	Merge pull request #159 in MIN/mineplex from master to feature/dmt-update * commit '70d41b074f9256b4ac0b6fb51b68fb24dcf10e24': (328 commits) Fix treasure stair orientation add a shard queue to DonationManager, use that for TreasureShardReward mac fix Commons codec is not included in BungeeCord. Pooling with later jedis versions doesn't work on Bungee. Gitignore redundant Eclipse files. Add Eclipse magic. Fixed various ways of players going invisible through Spec mode. 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 ...	2016-02-03 16:06:59 -06:00
Mysticate	af5cf309ca	Made sure that a valid tool is used before dropping any items.	2016-02-03 14:43:14 -05:00
NewGarbo	c17849b751	fixed some autoboxing stuff	2016-02-03 17:30:07 +00: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
NewGarbo	4e2da061bb	added protection around siege weapon	2016-02-03 17:07:06 +00:00
NewGarbo	4488b73e93	change catapult bounding box to 3	2016-02-03 17:02:31 +00:00
NewGarbo	0cb557d922	moved some stuff around and slight changes	2016-02-03 17:02:06 +00:00
NewGarbo	38cae1e3a2	catapult implemented using new siege weapon system, cannons polished up. not tested completely. don't expect this code to work fully haaha	2016-02-03 15:28:53 +00:00
NewGarbo	6bba486385	Added message if cannon is not loaded correctly	2016-02-03 11:20:11 +00:00
NewGarbo	d4388870c1	fixed inventory opening on mount	2016-02-03 11:19:33 +00:00
NewGarbo	8004d0dc3c	fixed npes	2016-02-03 11:06:58 +00:00
NewGarbo	95741e3029	fixed siege weapon base	2016-02-03 10:53:53 +00:00
phobia	5fd089c768	Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha	2016-02-03 17:43:43 +11:00
phobia	f011fdad5f	Fixes to TntProtection	2016-02-03 15:10:56 +11:00
phobia	0e0582a1a7	Added safe zone protection for flame	2016-02-03 10:39:21 +11: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
NewGarbo	9086188280	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/clans/ClansManager.java	2016-02-02 22:02:06 +00:00
NewGarbo	6fea76a8e4	finalized alpha patches	2016-02-02 21:38:38 +00:00
NewGarbo	23883148dd	alpha fixes	2016-02-02 20:55:23 +00:00
NewGarbo	cfbfb1fa3b	raised war points for invasion to 25	2016-02-02 20:42:20 +00:00
NewGarbo	9fa5927240	siege weapon base progress	2016-02-02 19:41:25 +00:00
phobia	59e564cdc6	Fixes to war point evasion	2016-02-02 23:18:05 +11:00
phobia	f1c49fa5ee	Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha	2016-02-02 22:13:38 +11:00
phobia	8a0f585432	Added fix to WarPoint evasion bug + 1 dmg bug	2016-02-02 22:11:52 +11:00
Shaun Bennett	86917fb146	Fix treasure stair orientation	2016-02-02 05:50:03 -05:00
Shaun Bennett	a34ae8cf49	Merge remote-tracking branch 'remotes/origin/master' into develop	2016-02-02 05:37:30 -05:00
Shaun Bennett	0d02f526b6	Merge pull request #116 in MIN/mineplex from bugfix/duplicates to develop * commit 'af27944a39129454b2963707c27799643d2440f1': add a shard queue to DonationManager, use that for TreasureShardReward Import clean up Changed TreasureShard rewarding, removed Queue Unused import removed Queue speed up Debugs removed Treasure not giving Shards when dupes occur, fixed. Queue implemented for duplicate shard reward	2016-02-02 04:35:44 -06:00
Shaun Bennett	af27944a39	add a shard queue to DonationManager, use that for TreasureShardReward	2016-02-02 05:34:33 -05:00
Keir Nellyer	a51c579f74	Fix Maven configuration for ReportServer project.	2016-02-01 22:52:24 +00:00
Keir Nellyer	eb329ec845	Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report	2016-02-01 22:38:51 +00:00
Cheese	610522bdd9	mac fix	2016-02-02 09:25:46 +11:00
Shaun Bennett	ee9e26e8ca	Merge pull request #149 in MIN/mineplex from bugfix/spectator-infest to develop * commit 'ace7d1764c68f6ea679ae60b3104d1af96e1869c': Fixed various ways of players going invisible through Spec mode.	2016-02-01 16:18:23 -06: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
Virizion	41ea96d505	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2016-02-01 16:42:55 -05:00
Virizion	989c324a37	Hopper item pickup fix.	2016-02-01 16:18:40 -05:00
NewGarbo	04ec8a6a26	Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha Conflicts: Plugins/pom.xml	2016-02-01 20:10:51 +00:00
NewGarbo	84b887fe89	that's not needed	2016-02-01 19:53:59 +00:00
NewGarbo	b4ed912f7d	siege weapon modular system beginnings	2016-02-01 19:52:53 +00:00
md_5	1e57f19bd6	Commons codec is not included in BungeeCord.	2016-02-01 18:18:23 +11:00
md_5	e887bbf543	Pooling with later jedis versions doesn't work on Bungee.	2016-02-01 18:13:50 +11:00
Keir Nellyer	b547ad5f89	Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report	2016-01-31 23:38:58 +00:00
md_5	cc1ecbe0b8	Add Eclipse magic.	2016-02-01 10:24:49 +11:00
NewGarbo	45aacd626e	this isn't used anymore	2016-01-31 19:20:15 +00: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
NewGarbo	a5439943d6	Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha	2016-01-31 15:47:52 +00:00
Mysticate	ace7d1764c	Fixed various ways of players going invisible through Spec mode.	2016-01-31 10:22:59 -05:00
md_5	852f96a314	Speed up LobbyBalancer to 500ms	2016-01-31 09:45:34 +11:00
md_5	478b92db44	Add example maven settings.xml	2016-01-31 09:44:46 +11:00
Shaun Bennett	b9354b7972	Remove setTestOnBorrow	2016-01-30 16:10:30 -05:00
phobia	9c83c64d01	Fixed issues with Broadsword Added max building height of 100	2016-01-30 21:34:06 +11:00
phobia	4612550ba5	Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha	2016-01-30 19:24:42 +11:00
phobia	aa0cfc7710	Fixes to TnTGeneration Fixes to Broadsword giving Generation and slowness 42 instead of 4	2016-01-30 19:23:59 +11:00
Shaun Bennett	52b6779a4f	Merge pull request #146 in MIN/mineplex from bugfix/bridges-ore-stealing to develop * commit 'b45e00796d66cf8aeb39510e0bd23bc5bd59327b': Fixed explosions dropping right items. Made block define its own drops. Removed an nunnecesarry method Fixed items not dropping their regular counterpart.	2016-01-30 01:45:00 -06:00
Shaun Bennett	c23855bd65	Merge with develop	2016-01-30 02:44:24 -05:00
md_5	1f2fc65f99	Tone down lobby balancer too.	2016-01-30 13:55:58 +11: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
Keir Nellyer	253f5cc664	Improve our English slightly.	2016-01-29 23:12:50 +00:00
Mysticate	b45e00796d	Fixed explosions dropping right items.	2016-01-29 15:58:49 -05:00
NewGarbo	fe01c9b8d5	Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha	2016-01-29 20:57:10 +00:00
NewGarbo	d10266c4d1	sapling fix	2016-01-29 20:56:38 +00:00
NewGarbo	7d28bc69c9	collision boxes on siege weapons and other stuff	2016-01-29 20:55:56 +00:00
NewGarbo	76dba421b4	sapling fix [THIS NEEDS TO GET PUT ONTO CLANS/ALPHA]	2016-01-29 20:54:31 +00:00
Shaun Bennett	1c3c800a66	Update fixes - @Teddy!	2016-01-29 14:05:09 -05:00
Mysticate	1e29bd6936	Made block define its own drops.	2016-01-29 11:44:40 -05:00
Mysticate	447583aa2a	Removed an nunnecesarry method	2016-01-29 09:41:45 -05:00
Mysticate	075a1141f1	Fixed items not dropping their regular counterpart.	2016-01-29 09:36:09 -05:00
Shaun Bennett	c1f91cbfb0	Final changes	2016-01-29 03:56:49 -05:00
Shaun Bennett	50fc1f5a10	merge with develop	2016-01-29 03:44:04 -05:00
Shaun Bennett	d30fb8d8ef	Merge remote-tracking branch 'origin/clans/alpha' into clans/alpha # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2016-01-29 03:40:28 -05:00
Shaun Bennett	a1f9f41910	Merge remote-tracking branch 'origin/develop' into develop	2016-01-29 03:37:03 -05:00
Shaun Bennett	863be023d9	Prep for update	2016-01-29 03:36:52 -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
Shaun Bennett	ba0dd3da44	Merge pull request #141 in MIN/mineplex from bugfix/bridges-ore-stealing to develop * commit 'b92ddc75759bc848b409b5626f0fbeb9d71154b5': Added proper ore pickup delay.	2016-01-29 02:33:23 -06:00
Shaun Bennett	a0e9a82327	Merge pull request #143 in MIN/mineplex from bugfix/achievements-misc to develop * commit '7d33e76055eb160e58d63443a72117e654df9468': Fixed ForTheKing achievement. Made sure Sniper achievement in Bridges is always fulfilled. Fixed + Tidied Gladiators Precision achievement.	2016-01-29 02:32:50 -06:00
Shaun Bennett	63fa942789	Merge pull request #144 in MIN/mineplex from bugfix/uhc-hearts to develop * commit 'caa5d922b520da30223230b58754a77dd3b72186': Prevent hearts changing colors in UHC tab.	2016-01-29 02:27:20 -06:00
libraryaddict	dc469b9562	Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop	2016-01-29 17:02:07 +13:00
libraryaddict	8aac172c4a	Update CB.jar	2016-01-29 17:01:48 +13:00
Mysticate	caa5d922b5	Prevent hearts changing colors in UHC tab.	2016-01-28 22:54:20 -05:00
Mysticate	7d33e76055	Fixed ForTheKing achievement.	2016-01-28 22:51:19 -05:00
Mysticate	733ba067fe	Made sure Sniper achievement in Bridges is always fulfilled.	2016-01-28 22:49:51 -05:00
Mysticate	fffa1d5926	Fixed + Tidied Gladiators Precision achievement.	2016-01-28 22:48:52 -05:00
Mysticate	d1d3382ec0	Prevented Coal particles from showing during the game	2016-01-28 22:44:33 -05:00
Mysticate	b92ddc7575	Added proper ore pickup delay.	2016-01-28 22:39:48 -05:00
Shaun Bennett	60ee5d1da0	Move disable custom inside of IsActive check	2016-01-28 22:33:48 -05:00
Shaun Bennett	eb29c6b367	Fix constructor	2016-01-28 22:28:18 -05:00
Shaun Bennett	0177cf91bb	Merge with develop	2016-01-28 22:23:17 -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	251fb53f29	Merge pull request #124 in MIN/mineplex from bugfix/morph to develop * commit '2e433d8b0654507a9a41d9bbae313ab90e92471f': Made sure that the active morph gets disabled on clear	2016-01-28 21:08:32 -06:00
Shaun Bennett	bf273708f9	Merge pull request #136 in MIN/mineplex from feature/entity-spectating to develop * commit '53132a248f9d899e2b4b275a31cfd69376533688': the L Updateting spectator Menu layout. fixing spec item in menu Removing right clicking. removing switching players until spigot patch is on. adding spectator rotation. adding entity spectating by right clicking and right clicking head in compass menu.	2016-01-28 21:08:13 -06:00
Shaun Bennett	015cca57b6	Merge pull request #138 in MIN/mineplex from bugfix/gladiators-hotbar-editor to develop * commit '75629055d851265e91eb7d0679a40a1357552e17': Un-register HotbarEditor MiniPlugin and fix /spec bug. Un-register the hotbar page listener on disable.	2016-01-28 21:03:48 -06: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	7860ca24c8	disallow all staff from using /we	2016-01-28 23:33:06 +00:00
NewGarbo	f86262dc0e	catapult and cannon progress	2016-01-28 23:32:23 +00:00
Virizion	b6db99806a	Remove debug message.	2016-01-28 18:28:43 -05:00
teddy	96ea001291	Clean up	2016-01-28 23:05:27 +00:00
teddy	da8a55f99c	Final edits	2016-01-28 22:57:54 +00:00
William Burns	75629055d8	Un-register HotbarEditor MiniPlugin and fix /spec bug.	2016-01-28 20:43:58 +00:00
Virizion	04544c2b8d	Fix flickering judge laser.	2016-01-28 14:28:47 -05:00
William Burns	d44d4c2278	Un-register the hotbar page listener on disable.	2016-01-28 19:21:42 +00:00
teddy	63cea58f05	Waiting for a testing session.	2016-01-28 17:18:24 +00:00
NewGarbo	37fb656279	dispenser	2016-01-28 13:31:45 +00:00
NewGarbo	f645c4d6f8	Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta	2016-01-28 13:30:50 +00:00
NewGarbo	88c1391ba2	disallow sapling in dispensers (grrr working in two different branches is really strange)	2016-01-28 13:30:16 +00:00
NewGarbo	8cb5591218	merge conflicts	2016-01-28 13:28:39 +00: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	5f14670bc2	Remove old redundant iml file.	2016-01-28 11:20:40 +00:00
NewGarbo	ceeeb3bc45	no tnt from dispensers	2016-01-28 10:58:46 +00:00
teddy	eed55b48ac	Descriptions changed	2016-01-28 09:55:48 +00:00
NewGarbo	682a243c31	fixed catapult state being mapped to incorrect blocks	2016-01-28 09:18:58 +00:00
Keir Nellyer	3fc11e5c8a	For some reason this didn't get committed with the previous stuff.	2016-01-27 21:54:34 +00:00
Keir Nellyer	ac37417fca	Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report # Conflicts: # Plugins/.idea/modules.xml	2016-01-27 21:44:04 +00:00
Teddy	70be135a40	Merge branch 'feature/hoverable-chat' of http://dev.mineplex.com:7990/scm/min/mineplex into rankdescriptions # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java	2016-01-27 19:42:11 +00:00
AlexTheCoder	b84ec01597	- Huge amount of stuff	2016-01-26 22:52:45 -05:00
Shaun Bennett	3d4cd9ee27	Fix tutorial command, add tutorial info to scoreboard, message manager, transitioning to a visual manager	2016-01-26 17:47:01 -06:00
Virizion	40113f99d3	Borders for spec are fixed.	2016-01-26 17:14:21 -05:00
NewGarbo	7f7e73a101	more catapults!	2016-01-26 21:10:58 +00:00
NewGarbo	3d7a371d1d	catapults	2016-01-26 20:18:53 +00:00
Shaun Bennett	155d8bff1b	Fix cannon angles	2016-01-26 13:36:30 -06:00
NewGarbo	9215d0d3ff	NegativeArraySizeException fix	2016-01-26 18:40:55 +00:00
NewGarbo	63f9622876	cannon correctly loadded title + fixed rotation being all wrong	2016-01-26 17:51:29 +00:00
NewGarbo	7c85fe62ca	charred blocks updates	2016-01-26 17:36:12 +00:00
NewGarbo	2445e73623	better cannon crater particles	2016-01-26 13:06:47 +00:00
NewGarbo	3b18b93286	fixed top right slot in cannon not counting as an empty slot.	2016-01-26 09:26:51 +00:00
NewGarbo	467af4b835	Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta	2016-01-26 09:24:53 +00:00
Virizion	2f4146c243	Leaves fix.	2016-01-25 21:12:28 -05:00
Virizion	c5dfddd710	Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.	2016-01-25 20:54:01 -05:00
Virizion	a1eec79b3b	Make dependable require 50 perfect builds instead of 10.	2016-01-25 16:43:43 -05:00
NewGarbo	e68dea65e1	stop dispensers being used for flint-andsteal, bonemeal etc etc	2016-01-25 17:46:39 +00:00
NewGarbo	18e892c4ec	finally fixed that windblade dupe	2016-01-25 17:41:07 +00:00
NewGarbo	71bb1ed3d6	this is just really slowing down startup time by A LOT	2016-01-25 17:22:56 +00:00
NewGarbo	9d77632fcc	allow clans moderators to use /cb	2016-01-25 17:18:00 +00:00
NewGarbo	2bf2050844	increased sapling cooldown to 20 minutes from one second.	2016-01-25 17:13:53 +00:00
NewGarbo	7f1c74ced5	bumped version up to 0.19	2016-01-25 17:11:08 +00:00
NewGarbo	2b70daf8df	allowed clans mods to use /cban	2016-01-25 17:02:49 +00:00
NewGarbo	5a5dc9925e	set spawning rate of charred blocks a 10% lower	2016-01-25 17:02:26 +00:00
NewGarbo	208df93739	fixed fire particles not showing up in craters	2016-01-25 17:02:02 +00:00
NewGarbo	ce36cf79bf	added a tnt limit, set to 1 as it makes gameplay better	2016-01-25 17:01:46 +00:00
NewGarbo	9b88683fdc	fix cannon tnt exploding prematurely, added cooldown rather than using Recharge.	2016-01-25 17:00:38 +00:00
Sarah	53132a248f	the L	2016-01-25 12:28:21 +01:00
Sarah	c7733bb068	Updateting spectator Menu layout.	2016-01-25 12:27:19 +01:00
Sarah	91b6ae8b09	fixing spec item in menu	2016-01-25 12:14:56 +01:00
Shaun Bennett	4314f35f80	Multiply by less	2016-01-25 04:46:47 -06:00
Shaun Bennett	b143ec7c19	negative!	2016-01-25 04:42:09 -06:00
Shaun Bennett	6ff7c83d3e	Trying different hologram location	2016-01-25 04:17:58 -06:00
Shaun Bennett	616be8aea7	Fix messages, fix /stats	2016-01-25 03:59:37 -06:00
Shaun Bennett	d511ca5bad	Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder	2016-01-25 03:51:44 -06:00
Shaun Bennett	bc8f6e511c	Center hologram	2016-01-25 03:44:22 -06:00
Virizion	2dcc356aab	Make achievement category classics	2016-01-25 04:33:25 -05:00
Shaun Bennett	61f1a58b1c	hologram changes	2016-01-25 03:29:53 -06:00
Shaun Bennett	181cce4774	Holograms maybe?	2016-01-25 03:08:56 -06:00
NewGarbo	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	fde5a5af28	Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta	2016-01-25 08:47:08 +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	0b7cec60ae	put cmod above support so that support can't bypass clans home block	2016-01-25 08:44:17 +00:00
NewGarbo	d82a7b353f	allow C.Mods to join all server regardless of home servers	2016-01-25 08:42:38 +00:00
NewGarbo	54fa1449f6	cannon crater changes	2016-01-25 08:40:59 +00:00
Virizion	219b86ae55	Chiss' checklist.	2016-01-25 03:01:54 -05:00
Sarah	31ef7ffe19	Removing right clicking.	2016-01-25 07:45:38 +01:00
Sarah	f722831e6a	removing switching players until spigot patch is on.	2016-01-25 05:44:06 +01:00
Sarah	9e63c9000a	adding spectator rotation.	2016-01-25 04:30:42 +01:00
Virizion	bfe9aa7a59	Remove unnecessary tabs. Make the judge guardian use it's own laser again.	2016-01-24 21:55:57 -05:00
Virizion	0eda813d41	Fixed builds with only mobs not loading.	2016-01-24 19:14:34 -05:00
NewGarbo	c43c09fd3c	the cannons shouldn't explode instantly! also added fire effects to craters + clan tips when hopping on a cannon	2016-01-24 21:45:46 +00:00
NewGarbo	0252436990	cannons updates	2016-01-24 20:56:47 +00:00
Sarah	00f01e09af	adding entity spectating by right clicking and right clicking head in compass menu.	2016-01-24 20:00:05 +01:00
NewGarbo	a41521d6a9	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/safelog/SafeLog.java	2016-01-23 13:42:25 +00:00
NewGarbo	1f7e1fb6cf	fix dupe bug and safelog	2016-01-23 13:40:49 +00:00
NewGarbo	24011c4af4	cannons work	2016-01-23 12:46:52 +00:00
Virizion	a747426fa0	Fixed mobs.	2016-01-23 05:00:14 -05:00
Virizion	a359c4f8b6	Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder	2016-01-23 03:42:50 -05:00
Virizion	1e732b08e7	TICK TICK TICK TICK.	2016-01-23 03:42:36 -05:00
Cheese	790e2e8f73	Merge branch 'virizion_speed_builder' of ssh://184.154.0.242:7999/min/Mineplex into virizion_speed_builder	2016-01-23 19:32:37 +11:00
Cheese	c1ff7f4fc2	all players equal, no one loses	2016-01-23 19:32:23 +11:00
Virizion	a75770b0a6	Change build to load from top instead of bottom.	2016-01-23 03:15:41 -05:00
Shaun Bennett	650d586e0f	Add perfect build count to stats	2016-01-23 02:49:08 -05:00
Shaun Bennett	f82a408f30	Build time modifiers	2016-01-23 02:43:41 -05:00
Virizion	5dc773032b	Add joining players to guardians team instead of spectator.	2016-01-23 02:10:11 -05:00
Virizion	245cc1ed93	Limit Perfectionist achievement to 1.	2016-01-22 22:18:29 -05:00
Shaun Bennett	311d42db30	Use Garbo's description changes	2016-01-22 19:48:06 -05:00
Shaun Bennett	231b8cb19a	Merge pull request #133 in MIN/mineplex from bugfix/foo to develop * commit '376f719c261bd2152a6646a152472a2485e1b689': fixes important bug, fixed a scary typo! Lots of typo fixes and such i before e! fixed cosmetic menu item dropping bug more grammatical errors hast been fixed Grammatical errors hath been fixed!	2016-01-22 18:38:26 -06:00
Shaun Bennett	b2e4dff9e5	Add time to perfect build message	2016-01-22 19:18:23 -05:00
Shaun Bennett	02b45bd302	Forgot to register stat tracker	2016-01-22 19:14:25 -05:00
Shaun Bennett	ddc86f0897	Add Speediest Builderizer achievement	2016-01-22 19:13:23 -05:00
Shaun Bennett	d0e5be9c93	Guardian is impressed (untested!)	2016-01-22 18:35:18 -05:00
NewGarbo	bf6f1a1701	sapling stuff messed up oops	2016-01-22 15:28:12 +00:00
NewGarbo	090b6e496a	sapling stuff messed up oops	2016-01-22 15:27:44 +00:00
NewGarbo	c524247777	supplies command for sieges	2016-01-22 15:27:10 +00:00
NewGarbo	6638562866	npe fix	2016-01-22 15:21:20 +00:00
NewGarbo	f25c7b0277	don't need that + npe fix	2016-01-22 15:19:32 +00:00
NewGarbo	b869d4a7a8	Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta	2016-01-22 15:16:20 +00:00
NewGarbo	c4bbeb2535	more control over saplings	2016-01-22 14:55:50 +00:00
NewGarbo	a377a09925	fixed wind blade dupe bug	2016-01-22 11:22:20 +00:00
NewGarbo	cc48d98208	pushing to beta to change to alpha	2016-01-22 11:06:19 +00:00
Virizion	3f715ab4dd	Enable inventory click.	2016-01-22 02:23:58 -05:00
Shaun Bennett	4bbd956e14	Don't use the same build twice (untested!)	2016-01-22 01:37:47 -05:00
Shaun Bennett	49e439af55	Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder	2016-01-22 01:28:09 -05:00
Shaun Bennett	6bb60ddebd	Ignore empty builds (untested!)	2016-01-22 01:27:29 -05:00
Virizion	c66f37817e	Fixed invis bug.	2016-01-22 01:22:31 -05:00
Virizion	5c83f5c1e5	Renamed to Speed Builders from Speed Builder.	2016-01-22 00:20:58 -05:00
Virizion	0da921f3d2	Removed debug thing.	2016-01-21 23:52:59 -05:00
Virizion	a38319147a	Stopped physics which fixed the torch bug.	2016-01-21 23:49:49 -05:00
Shaun Bennett	582fa4c915	Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder	2016-01-21 22:42:33 -05:00
Shaun Bennett	c38596a09f	Name the guardian, 10 seconds to view builds	2016-01-21 22:42:25 -05:00
Virizion	24e97176cc	Call clear build area method on eliminate.	2016-01-21 22:05:30 -05:00
Virizion	d37b8b40fc	Disable item merge to (hopefully) fix phantom rails.	2016-01-21 20:41:28 -05:00
Virizion	50c9b33701	Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder	2016-01-21 20:13:53 -05:00
Virizion	636da8f4fa	Mob destroying. Removed a debug change that only selected builds with mobs in them.	2016-01-21 20:13:32 -05:00
Cheese	5675aed698	velocity the drops to the player	2016-01-22 11:56:52 +11:00
Virizion	69825893c9	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2016-01-21 19:11:36 -05:00
Virizion	6ab6307f74	Pushing all my stuff for Shaunpai.	2016-01-21 19:08:38 -05:00
Shaun Bennett	877ec4710e	Removing duplicate NCP hooks	2016-01-21 17:22:10 -05:00
Shaun Bennett	3803a3d82e	Add player heads back to friends lsit	2016-01-21 17:19:51 -05:00
Shaun Bennett	0fd5540de6	Merge pull request #132 in MIN/mineplex from bugfix/give-item-offline to develop * commit '404e049c31df6d4278ee3ed46e7f0b8e2f92ee16': Give item fix for offline players	2016-01-21 15:44:34 -06:00
Shaun Bennett	a41816ca22	Include version.properties in Mineplex.Core	2016-01-21 16:37:35 -05:00
Shaun Bennett	a0f39bf36e	Merge remote-tracking branch 'origin/develop' into develop	2016-01-21 16:31:52 -05:00
Shaun Bennett	64ec092d09	Rename coin command to shard command	2016-01-21 09:10:39 -05:00
Teddy	1e72ebcbe6	Merge branch 'master' into rankdescriptions Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2016-01-21 12:54:12 +00:00
Keir Nellyer	dd0fc23467	Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report	2016-01-21 10:12:02 +00:00
md_5	447583624e	Fix ascii.png duplication.	2016-01-21 17:47:21 +11:00
Shaun Bennett	5af8d747b3	Merge remote-tracking branch 'origin/develop' into develop	2016-01-20 15:07:48 -05:00
Shaun Bennett	269cd710fc	Fix wrong group id for spigot excludes	2016-01-20 15:07:39 -05:00
Shaun Bennett	c0d4fa1bea	Merge pull request #125 in MIN/mineplex from bugfix/mb-wins to develop * commit '4924d652f555392c9e36feb05a64cccd61b6c594': Store winner UUID instead of Player object to avoid leaking excess data Fixed who the winner is in MB Games.	2016-01-20 12:33:56 -06:00
Shaun Bennett	4924d652f5	Store winner UUID instead of Player object to avoid leaking excess data	2016-01-20 13:33:40 -05:00
Shaun Bennett	7715df8e6a	Merge pull request #130 in MIN/mineplex from md_5/servermonitor/leak to develop * commit '55c54eeff4dc72619fc9be1bb724b9dd37804919': Fix ServerMonitor not actually removing ServerGroup instances.	2016-01-20 12:24:33 -06:00
Shaun Bennett	359655f417	Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop * commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa': Fix some misc suspicious calls to Collection methods.	2016-01-20 12:23:55 -06:00
Shaun Bennett	c7bb380a56	Merge pull request #128 in MIN/mineplex from md_5/mineplexer/leak to develop * commit '6cf08193dfbedb08352fd3a450022afac0ecd331': Fix small memory leak in Mineplexer.	2016-01-20 12:23:13 -06:00
Shaun Bennett	0a5791a92f	Go back to compile scope, need to talk to md_5 about this	2016-01-20 13:13:20 -05:00
Shaun Bennett	037a2f8353	Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command	2016-01-20 13:04:31 -05:00
Shaun Bennett	8977735baf	Include a version.properties in maven build	2016-01-20 11:57:21 -05:00
Shaun Bennett	8017da9413	Delete JedisTest	2016-01-20 10:25: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
Teddy	573d0dd67d	Stats added for all other games	2016-01-19 23:10:45 +00:00
Shaun Bennett	9884742552	Fix OrderedObjectives, Starting CombatTutorial work	2016-01-19 16:34:51 -05:00
Shaun Bennett	80d55b2c9c	It works!	2016-01-19 13:34:17 -05:00
Shaun Bennett	0f83263871	Merge remote-tracking branch 'remotes/origin/clans/beta' into clans/tutorial # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java	2016-01-19 11:01:11 -05:00
Shaun Bennett	947ce254da	Tutorial Gui, Fixes	2016-01-19 10:59:56 -05:00
William Burns	7af8d78fc3	Add resource pack and other fixes	2016-01-19 14:00:23 +00:00
Shaun Bennett	951c27123a	Remove /disguise for YOUTUBE_SMALL in arcade	2016-01-18 22:10:01 -05:00
Teddy	c52bc8024c	Halloween, added kit to stats	2016-01-18 11:41:30 +00:00
Teddy	740eeae9bd	Halloween, added stats	2016-01-18 11:40:46 +00:00
Teddy	3fc25359be	Gravity, added stats	2016-01-18 11:38:43 +00:00
Teddy	b22f452b1f	Gladiators, added stats	2016-01-18 11:36:16 +00:00
Teddy	297e9baf41	Evolution, added stats	2016-01-18 11:34:43 +00:00
Teddy	f3d27c9d93	Draw my thing, added stats	2016-01-18 11:32:40 +00:00
Teddy	3d88f5aaae	Dragons, added stats	2016-01-18 11:11:32 +00:00
Teddy	ba50b5fdb1	Dragon Riders, added default registery	2016-01-18 11:09:19 +00:00
Teddy	c3d9be2123	Dragon Escape Teams, added stats	2016-01-18 11:05:09 +00:00
Teddy	85f4ee50f0	Dragon Escape, added stats + implemented kit display for stats	2016-01-18 11:04:12 +00:00
Teddy	66f484760e	Death Tag, added stats	2016-01-18 10:53:56 +00:00
Teddy	96d16932dd	Christmas Chaos, added stats	2016-01-18 10:50:04 +00:00
Teddy	dc44207d7a	Champ TDM, added stats	2016-01-18 10:48:10 +00:00
Teddy	4e09aa4c34	Champ Dominate,added stats	2016-01-18 10:45:48 +00:00
Teddy	f79acaaa2a	Champ CTF,added stats	2016-01-18 10:43:46 +00:00
Teddy	508c4e99d2	Castle Siege,added stats	2016-01-18 10:41:10 +00:00
Teddy	b0eb5a6d4e	Cards Against Humanity, skipped/left blank	2016-01-18 10:34:43 +00:00
Teddy	56b3e482f2	Master Builders, added stats	2016-01-18 10:32:38 +00:00
Shaun Bennett	044d2bac83	Fix some Invisibility preference bugs	2016-01-17 22:55:04 -05:00
Shaun Bennett	2b6074a210	Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command'	2016-01-17 22:46:56 -05:00
Shaun Bennett	976779b9f2	Tutorial Work	2016-01-17 22:45:38 -05:00
Sarah	5ed9295944	updating Hub command as well	2016-01-17 18:10:16 +01:00
md_5	4927bb8c0b	Fix some misc suspicious calls to Collection methods.	2016-01-17 20:20:48 +11:00
md_5	55c54eeff4	Fix ServerMonitor not actually removing ServerGroup instances.	2016-01-17 20:11:25 +11:00
Sarah	52bda30f85	Mysts OCD again......	2016-01-17 03:03:00 +01:00
Sarah	4a5d6b5f2a	Mysticates OCD....	2016-01-17 02:48:15 +01:00
Keir Nellyer	40833c80bd	Tiny spell fix.	2016-01-17 00:34:18 +00:00
Keir Nellyer	398c56983b	Retrieve player ranks from database and display them.	2016-01-16 23:45:37 +00:00
md_5	6cf08193df	Fix small memory leak in Mineplexer. * Leak was on line 74 (toString omitted when removing from String collection). * Impact was actually pretty much nil - collection is rebuilt every minute. * Side effect of optimization by using UUID itself which has a good hashCode and fast equals implementation.	2016-01-16 20:36:49 +11:00
NewGarbo	40c52ac557	made it so that cannons don't rely on outposts. this should help with testing them without needing an outpost	2016-01-16 08:25:30 +00:00
NewGarbo	254a2e45e4	comments + cannons state enum rename	2016-01-16 08:22:35 +00:00
NewGarbo	e71a2d2e48	quick npe fix	2016-01-16 08:20:11 +00:00
NewGarbo	1042edb134	CANNONZ!	2016-01-16 08:18:06 +00:00
William Burns	f22297418c	Clear full canvas at start fix	2016-01-15 19:08:25 +00:00
William Burns	733bfadf68	Added spray can tool	2016-01-15 18:52:26 +00:00
Sarah	410bc1c74b	not being able to disguise as banned/muted players	2016-01-15 19:12:50 +01:00
Teddy	c16a719be1	Bridges, added stats	2016-01-15 13:37:55 +00:00
Teddy	9cd7240b61	BouncyBalls, giving errors when Loading, skipping chat stats	2016-01-15 13:28:42 +00:00
Teddy	ec75169b70	BossBattles, giving errors when Loading, removed chat stats.	2016-01-15 13:07:21 +00:00
Teddy	3315a510dc	Barbarians stats added + Block break stat tracker added	2016-01-15 13:01:26 +00:00
Teddy	6a3e9ac19f	BaconBrawl stats added	2016-01-15 12:10:53 +00:00
NewGarbo	1faeb43b73	fixed iron block sometimes sticking around after placing cannon	2016-01-15 07:17:51 +00:00
NewGarbo	a554f1b7c6	needed to update some code with the cannon item location changing. also removed unused imports.	2016-01-15 07:00:39 +00:00
NewGarbo	f78c469875	moved cannon item to Cannon.java to be consistent with the outpost item being in Outpost.java	2016-01-15 06:59:18 +00:00
NewGarbo	e0b7be0813	made /meow give you 64 cannons and 64 outposts	2016-01-15 06:58:20 +00:00
NewGarbo	70444ff508	cannon + siege work with outposts, also moved outposts to the clans.siege package	2016-01-15 06:53:58 +00:00
Shaun Bennett	404e049c31	Give item fix for offline players	2016-01-14 08:06:27 -05:00
Mysticate	cf7f5af9ca	Fixed who the winner is in MB Games.	2016-01-14 07:41:36 -05:00
Mysticate	2e433d8b06	Made sure that the active morph gets disabled on clear	2016-01-14 07:17:40 -05:00
NewGarbo	595ab0d763	siege work	2016-01-14 09:46:12 +00:00
Teddy	d33d682ebb	Implementing stats for every game, got all stat names ready	2016-01-13 18:40:29 +00:00
Keir	19301271a4	Fix format character.	2016-01-13 11:51:49 +00:00
Keir	26246604a7	This should've gone with the previous commit :/	2016-01-13 11:48:18 +00:00
Keir	53133d51ee	Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-01-13 11:47:13 +00:00
Virizion	ee6425bbaf	Removed extra blank lines.	2016-01-12 23:31:35 -05:00
Virizion	dfd5a63b78	More changes and fixes.	2016-01-12 23:29:08 -05:00
fooify	63897b9b54	Merge remote-tracking branch 'origin/develop' into bugfix/foo	2016-01-12 20:05:34 -08:00
Virizion	528a7435e7	Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder	2016-01-12 20:25:08 -05:00
Virizion	b27d5849d8	General fixes.	2016-01-12 20:23:25 -05:00
NewGarbo	fb53e443e7	cleanup and cannons stuff	2016-01-12 20:27:24 +00:00
NewGarbo	f3003e795e	Implemented Outpost MK III	2016-01-12 18:59:01 +00:00
NewGarbo	6cde84ec5f	fixed outpost block placing/breaking boundary checking	2016-01-12 18:57:25 +00:00
NewGarbo	025f82e5ed	made the forcefield bump much weaker	2016-01-12 16:31:21 +00:00
Teddy	f1314d5c26	JSON now handled by JsonMessage Builder	2016-01-12 13:25:47 +00:00
NewGarbo	62f16ada81	that's not the correct bounds!	2016-01-12 07:57:35 +00:00
NewGarbo	5b4b5fb2b5	fixed outpost forcefield knocking you away even if the building is complete, also made the particles show the actual boundaries	2016-01-12 07:44:20 +00:00
libraryaddict	b1c6af4d1a	Update CB	2016-01-12 20:18:03 +13:00
NewGarbo	7d858c72f3	Merge branch 'clans/beta' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta	2016-01-12 07:12:18 +00:00
NewGarbo	a6be919e4a	agh lost some code ;-;	2016-01-12 07:10:22 +00:00
NewGarbo	ed8d9459b2	goes with the commit below VVVV	2016-01-12 07:02:19 +00:00
NewGarbo	d3452772ed	outposts work (grr git is weird trying to switch over to clans/beta)	2016-01-12 07:02:03 +00:00
NewGarbo	c873b6b886	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha	2016-01-12 06:58:53 +00:00
libraryaddict	c3e11e87ea	Fix small issues with burning and ignition	2016-01-12 19:10:32 +13:00
libraryaddict	11da5a3fe1	Fix fire combusting and cancelled damage events	2016-01-12 18:56:48 +13:00
Shaun Bennett	4e9a4c87d4	Merge pull request #123 in MIN/mineplex from bugfix/disguise-command to develop * commit '0f587ba5d908afdccb877358d71e56a3edda49cd': fixing "Kicked for flying again" again...	2016-01-11 17:20:51 -06:00
Shaun Bennett	3693a2b2c5	Merge pull request #122 in MIN/mineplex from bugfix/thanos to develop * commit 'ed439569453dc248623834af6fb553341779e46c': Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats. Remove unused imports. Prevent players from stacking others with a menu inventory opened. Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.	2016-01-11 16:26:09 -06:00
Shaun Bennett	025b87c806	Merge pull request #121 in MIN/mineplex from feature/mutedsign to develop * commit 'fa7eef504597011da14093fb76a8e088524eafd0': Muted players can't write on signs.	2016-01-11 16:23:34 -06:00
Teddy	88c53bf464	Added default ChatStat for all games to prevent my server from dying when testing	2016-01-11 19:35:00 +00:00
NewGarbo	d656c7a212	fixed clans banned players counting as being online after joining and their territory then being blown up	2016-01-11 18:02:03 +00:00
Teddy	02ff8bdbdb	Custom stats working, escaping bug fix and List reset bug	2016-01-11 12:59:57 +00:00
Teddy	40d913beaf	Changed a List to reset each time its registered to prevent stats copying to the next game, automatic string escaping, party colour name changed to original colour	2016-01-11 12:35:44 +00:00
Teddy	b9d44d9a24	not updating properly, fixed	2016-01-11 12:14:29 +00:00
Teddy	78eaee98df	Typo mistake	2016-01-11 12:09:08 +00:00
Teddy	ec6e916c7b	more stable, progress for making 'easier-to-use'	2016-01-11 12:06:30 +00:00
NewGarbo	3773ab3f0b	fixed safelog npcs sticking around some time	2016-01-11 10:14:32 +00:00
NewGarbo	60a78e396f	remove legendary announcement in chat/middle text	2016-01-11 09:16:11 +00:00
Shaun Bennett	6c055c31a0	Fix flashing through doors, Update to 0.18c	2016-01-10 20:39:56 -05:00
NewGarbo	d5b5ac7bb0	changed regen level on giants broadsword from 4 to 3 and made slowness last longer so that screen doesn't glitch out	2016-01-10 23:06:39 +00:00
NewGarbo	d4ccb82791	didn't push this earlier	2016-01-10 23:03:16 +00:00
NewGarbo	6673081fb3	fixed LeechingAttribute from throwing an error when setting health above 20	2016-01-10 22:31:51 +00:00
NewGarbo	04c7f2c1f1	made pressure plates, buttons, and levers from working with block toss	2016-01-10 22:20:50 +00:00
Keir	1c49e3a111	Make chat log clickable, only close report instruction line suggests command.	2016-01-10 21:28:57 +00:00
NewGarbo	bccee71ff7	made signs placed by muted players get cleared on being placed	2016-01-10 21:16:49 +00:00
NewGarbo	734351011a	made all old clans ban clients get unloaded. there seems to have been problems with certain clients not unloading.	2016-01-10 21:15:50 +00:00
NewGarbo	9c3a62a308	made it so punished players can't place signs	2016-01-10 21:03:34 +00:00
NewGarbo	68808efb49	made players not be able to chat while chat is silenced	2016-01-10 20:57:12 +00:00
NewGarbo	fa3de2a479	made clans ban messages not public	2016-01-10 20:55:29 +00:00
NewGarbo	51872faa04	fix mutes not working	2016-01-10 20:53:55 +00:00
Mysticate	fa7eef5045	Muted players can't write on signs.	2016-01-10 13:13:38 -05:00
Teddy	5caeb8bee0	even nicer visual	2016-01-10 17:34:15 +00:00
Teddy	c814132b24	ratio's and nicer visuals	2016-01-10 17:33:18 +00:00
Teddy	83375a6883	stats not updating	2016-01-10 16:01:40 +00:00
Teddy	1bce624ab3	Finally got rid of MalformedJSON	2016-01-10 15:13:11 +00:00
Thanos paravantis	ed43956945	Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.	2016-01-10 16:37:51 +02:00
Shaun Bennett	46695f8449	Fix hub fly for YOUTUBE_SMALL	2016-01-09 18:44:32 -05:00
Shaun Bennett	83e5c7399e	Fix YOUTUBE_SMALL preferences	2016-01-09 18:41:19 -05:00
Shaun Bennett	8193b5121b	Dont allow /disguise for YOUTUBE_SMALL	2016-01-09 18:39:47 -05:00
Shaun Bennett	cd3037e7e5	Fix treasure purchases	2016-01-09 18:37:24 -05:00
Keir	bd865c7e64	Fix command permissions.	2016-01-09 23:12:08 +00:00
Keir	7db3f3469f	Destroy pool when a thread ends.	2016-01-09 22:21:27 +00:00
Keir	5f362a878a	Run some Redis functions async (as it sometimes blocks).	2016-01-09 22:21:15 +00:00
Keir	8b3bc7ca18	Fix timezone, correct url prefix and remove old debug code.	2016-01-09 21:51:54 +00:00
fooify	942460b471	Merge remote-tracking branch 'origin/develop' into bugfix/foo	2016-01-09 13:05:44 -08:00
Teddy	263e1326cd	JSON progress	2016-01-09 20:22:29 +00:00
NewGarbo	fa509f0043	fixed giant's broadsword giving HUGE regen. PLEASE PUSH ASAP	2016-01-09 19:58:31 +00:00
Thanos paravantis	ce1bac8037	Remove unused imports.	2016-01-09 17:03:14 +02:00
Thanos paravantis	62e1fb3688	Prevent players from stacking others with a menu inventory opened.	2016-01-09 17:01:57 +02:00
Sarah	0f587ba5d9	fixing "Kicked for flying again" again...	2016-01-09 12:07:57 +01:00
Thanos paravantis	ba3e7cb197	Merge branch 'master' into bugfix/thanos	2016-01-09 12:23:54 +02:00
Shaun Bennett	2df626b35e	Fix CustomDataManager crash	2016-01-08 18:06:33 -05:00
Shaun Bennett	511b39caa7	Merge branch 'master' into develop	2016-01-08 17:05:54 -05:00
Keir	710654cd06	Use Validate class from Apache Commons to minify code.	2016-01-08 15:06:13 +00:00
Keir	7ce028203b	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report	2016-01-08 13:59:43 +00:00
Keir	5cb91bb315	Allow reuse of ReportManager instance (for later use).	2016-01-08 13:59:30 +00:00
Teddy	43fb04b482	Import clean up	2016-01-08 13:46:57 +00:00
Teddy	78405749a4	Changed TreasureShard rewarding, removed Queue	2016-01-08 13:46:39 +00:00
Shaun Bennett	ee73b374a6	Forgot to uncomment in ClansLoginManager	2016-01-08 06:36:59 -05:00
Shaun Bennett	a75e2c15b8	Merge remote-tracking branch 'origin/develop' into develop	2016-01-08 06:35:37 -05:00
Shaun Bennett	15109707f3	Merge pull request #119 in MIN/mineplex from clans/alpha to develop * commit '025615d080b8b925f319a2f7707d2c3fa4755a88': Clans Alpha 0.18b fixes	2016-01-08 05:34:35 -06:00
NewGarbo	025615d080	Clans Alpha 0.18b fixes	2016-01-08 11:24:36 +00:00
Sarah	5482d1dc40	Fixing "kicked for Flying"	2016-01-08 12:17:28 +01:00
Shaun Bennett	0a56a838d2	Fix ClansLoginManager, Remove pointless code in CoreClientManager	2016-01-08 05:45:49 -05:00
Shaun Bennett	6096fcad42	Fix hotbar issues	2016-01-08 04:06:11 -05:00
Shaun Bennett	504d9d508c	Slightly reduce Squid's Ink Blast damage in SSM	2016-01-08 03:15:30 -05:00
Shaun Bennett	1d2f61db8c	Disable purchasing Christmas Treasure	2016-01-08 03:15:05 -05:00
Shaun Bennett	d361ce948e	Merge branch 'develop' into william-gladiators # Conflicts: # Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java	2016-01-08 02:21:32 -05:00
Shaun Bennett	db7d814e02	Disable hub music	2016-01-08 01:42:05 -05:00
Shaun Bennett	19bb44cb9a	Disable HolidayManager and HolidayGiftManager	2016-01-08 01:41:02 -05:00
Shaun Bennett	9c3b07123f	Revert to normal HubType	2016-01-08 01:39:54 -05:00
Shaun Bennett	003af1b87c	Disable Holiday Words in DMT and Build	2016-01-08 01:38:49 -05:00
Shaun Bennett	b6b455c1c0	Merge pull request #117 in MIN/mineplex from clans/alpha to develop * commit '15d2118bc1701b79576f6d73dc1d4aeca500f11e': (23 commits) Added C.Mod rank, and started on rank info. changed outpost forcefields to be a bit larger to surround the outpost more. made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request. added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around. fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost) fixed outpost being built instantly on output block place. holograms above outpost block should be centered in the block and made them despawn on outpost death legendary pickkup message fix (FINALLY FIXED NOW ) quick modification to outposts, and fixed the legendary announcements being weird updated clans version quikc change outpost changes, and some other things lots of work on outposts, fixed gold dupe glitch, fixed clans ban gui title being "Customize New Gear". fixes (?) lots of changes that i can't remember at this point Lots of changes, specifics: Fixed clans having more than max energy. Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory. /c <clan> now works with clans with 18+ players. player gold exploit checking. i know this code is strange but please don't delete it. we need it for now. a couple more prettificatons to pvp timer messages. one more quick message change/fix qa changes to pvp safety ...	2016-01-08 00:35:15 -06:00
NewGarbo	15d2118bc1	Added C.Mod rank, and started on rank info.	2016-01-07 23:32:51 +00:00
Shaun Bennett	b606c8da22	More tutorial	2016-01-07 18:08:54 -05:00
NewGarbo	e1e8c2bb97	changed outpost forcefields to be a bit larger to surround the outpost more.	2016-01-07 21:02:55 +00:00
NewGarbo	43f075014a	made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.	2016-01-07 20:05:33 +00:00
Teddy	6bf0970dbe	Unused import removed	2016-01-07 19:52:04 +00:00
NewGarbo	fff6d8e03f	added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.	2016-01-07 19:36:52 +00:00
Keir	3be6030a5d	Exit if no identifier is supplied before any errors are caused.	2016-01-07 16:21:33 +00:00
Keir	21d8576787	Fix "bubbles" becoming detached from their icon.	2016-01-07 15:52:03 +00:00
NewGarbo	90a06d97b5	fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost)	2016-01-07 14:04:26 +00:00
NewGarbo	d4fdda8ef2	fixed outpost being built instantly on output block place. cleaned up a bit	2016-01-07 14:03:15 +00:00
NewGarbo	5c810a46c9	holograms above outpost block should be centered in the block and made them despawn on outpost death	2016-01-07 13:26:18 +00:00
NewGarbo	e9789b2ee8	legendary pickkup message fix (FINALLY FIXED NOW )	2016-01-07 10:31:23 +00:00
NewGarbo	d88b14d9d6	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha	2016-01-07 09:35:07 +00:00
NewGarbo	b685a207bc	quick modification to outposts, and fixed the legendary announcements being weird	2016-01-07 09:34:16 +00:00
Keir	644453a9c4	Name PubSub threads.	2016-01-07 07:06:55 +00:00
Keir	a63d98a2d7	Write to files asynchronously.	2016-01-07 07:04:24 +00:00
Keir	abc15e3a4c	Handle multiple multi-threaded Redis connections (and re-connections), improved logging, various refactors.	2016-01-07 06:58:21 +00:00
Keir	98a7b6d6d6	Allow data directory to be configured using a command-line parameter.	2016-01-07 04:40:39 +00:00
NewGarbo	ef929b39b3	updated clans version	2016-01-06 22:38:45 +00:00
NewGarbo	76c0230805	quikc change	2016-01-06 22:35:09 +00:00
NewGarbo	52c4a55180	outpost changes, and some other things	2016-01-06 22:32:36 +00:00
libraryaddict	de6f6cf5f0	Add a IsLive check in Spleef	2016-01-07 08:49:26 +13:00
libraryaddict	c920d4efa1	Modify MapText to actually work, modify UtilText to save the images of characters	2016-01-07 04:48:44 +13:00
Keir	63f8b3a74e	Keep files for 15 days instead of 1.	2016-01-05 22:33:07 +00:00
Teddy	99f0404fff	Queue speed up	2016-01-05 21:05:02 +00:00
Teddy	e2824dd0e0	Debugs removed	2016-01-05 21:01:51 +00:00
Teddy	d4fd6a6bf7	Treasure not giving Shards when dupes occur, fixed.	2016-01-05 21:00:43 +00:00
Thanos paravantis	101caf12ff	Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.	2016-01-05 20:48:28 +02:00
Sarah	db2cddc443	Fixing Join/Quit messages	2016-01-05 19:10:40 +01:00
Teddy	d819671d16	Queue implemented for duplicate shard reward	2016-01-05 16:21:34 +00:00
Shaun Bennett	a73309fc11	Merge remote-tracking branch 'origin/develop' into develop	2016-01-04 18:14:10 -05:00
Shaun Bennett	f749300d48	Fix team stats not displaying properly	2016-01-04 18:13:54 -05:00
Shaun Bennett	10eb65a8d6	Merge pull request #114 in MIN/mineplex from bugfix/disguise-command to develop * commit 'dd6d7b1b96947a400911bc5fa310039ab147c159': updating denial message Love you Sarah <3 Fixing Disguise File update /Disguise for Hub as well updating /disguise	2016-01-04 15:58:43 -06:00
Shaun Bennett	652084d071	Merge pull request #115 in MIN/mineplex from bugfix/thanos to develop * commit '3770211e66b41e16440609a0a79b3999b9b6cca7': Turf Wars: Include Teddy's border fix. Turf Wars: Undo bracket formatting. Turf Wars: Apply knockback on all players when there are only two in the match. Turf Wars: Add comment on block physics event. Turf Wars: Fix sneaking near turf edge and wool placement near ladders.	2016-01-04 15:56:32 -06:00
Shaun Bennett	962efe4a61	Fix not being able to join games through portals	2016-01-04 16:41:07 -05:00
Shaun Bennett	ed81411373	Fix carl bonus messages	2016-01-04 15:58:27 -05:00
Thanos paravantis	3770211e66	Turf Wars: Include Teddy's border fix.	2016-01-04 22:58:11 +02:00
Shaun Bennett	05ef4d30c7	Store a set of active members for objective goals	2016-01-04 15:56:33 -05:00
Thanos paravantis	982e684a45	Turf Wars: Undo bracket formatting.	2016-01-04 21:42:58 +02:00
Shaun Bennett	c50fb52a88	Disable New Years Countdown	2016-01-04 14:21:21 -05:00
Shaun Bennett	c739ecc26d	Fix forcefield for YOUTUBE_SMALL	2016-01-04 14:20:39 -05:00
Shaun Bennett	ce8586e5c5	More work and refactoring on the tutorial	2016-01-04 14:18:58 -05:00
Keir	7d16aeb84d	Cache private messages for chatsnap reports.	2016-01-04 18:04:47 +00:00
Keir	80c389faf4	Make private message event implement cancellable.	2016-01-04 17:59:16 +00:00
Thanos paravantis	47c78bcba1	Turf Wars: Apply knockback on all players when there are only two in the match.	2016-01-04 17:19:40 +02:00
Thanos paravantis	f6ce98f65b	Turf Wars: Add comment on block physics event.	2016-01-02 23:33:08 +02:00
Thanos paravantis	03c6395a30	Turf Wars: Fix sneaking near turf edge and wool placement near ladders.	2016-01-02 23:30:27 +02:00
AlexTheCoder	2b365e4afd	- Fixed blacklisting to stop join spam	2016-01-02 14:35:05 -05:00
Sarah	dd6d7b1b96	updating denial message	2016-01-02 16:45:15 +01:00
NewGarbo	b47665e115	lots of work on outposts, fixed gold dupe glitch, fixed clans ban gui title being "Customize New Gear".	2016-01-02 14:02:50 +00:00
Morten	7e1b0b9110	Love you Sarah <3	2016-01-02 03:19:39 +01:00
Sarah	a06a0060aa	Fixing Disguise File	2016-01-02 01:53:19 +01:00
Sarah	a30c2b0d75	update /Disguise for Hub as well	2016-01-02 00:53:56 +01:00
Shaun Bennett	2e017fa5ca	Fix redis command	2015-12-31 16:11:51 -06:00
Shaun Bennett	8232d11cd1	Remove in game notifications, change sale message	2015-12-31 15:07:26 -06:00
Shaun Bennett	74eb04e5b4	Merge pull request #112 in MIN/mineplex from feature/new-year to develop * commit '6b3a5416643389a7bcac8df93f40f492452971e5': Accurate timings Small edits Flame Made it activate in all lobbies via command. Added a new years countdown to the hub.	2015-12-31 14:51:49 -06:00
William Burns	6b3a541664	Accurate timings	2015-12-31 18:53:57 +00:00
Shaun Bennett	456b0dbeb7	Merge pull request #110 in MIN/mineplex from feature/MasterBuilder-Unban to develop * commit 'f83016e0074ce810f727276a0feb127ecd69098f': Also really quickly fixed the Invisibility in lobby bug (hopefully) Removed a weird query :/ Finished up the Unban feature... Added a feature to unban clients across the network But there still a bug when you type a username of a none registered member. Will fix ASAP - likely after Mineware	2015-12-31 11:27:08 -06:00
Sarah	8ef1a524c1	updating /disguise	2015-12-31 12:01:24 +01:00
Mysticate	efbd1c52d2	Merge remote-tracking branch 'origin/master' into feature/typewars-antimacrorekter	2015-12-31 03:01:23 -05:00
Mysticate	5ff9d1985b	Monitoring for josh + the mods	2015-12-31 03:00:40 -05:00
William Burns	637baed830	Small edits	2015-12-31 01:24:58 +00:00
William Burns	874695cdf6	Flame	2015-12-31 00:50:53 +00:00
William Burns	a64dc6a8d4	Made it activate in all lobbies via command.	2015-12-31 00:46:31 +00:00
Keir	3496abe227	Java 8 goodness.	2015-12-30 21:41:24 +00:00
William Burns	1b40cece80	Added a new years countdown to the hub.	2015-12-30 20:04:01 +00:00
libraryaddict	1a30e0b335	Latest changes to CB	2015-12-30 23:34:27 +13:00
AlexTheCoder	a4853e667c	- Gameplay edits and disabling broadcaster code	2015-12-30 03:23:21 -05:00
libraryaddict	92c4450eea	Update the dual version	2015-12-30 21:12:11 +13:00
Keir	2716039d07	Small cleanup.	2015-12-29 23:49:57 +00:00
Keir	5841ab1101	Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2015-12-29 23:47:00 +00:00
Keir	dffd7d95ec	Don't include sender in recipients.	2015-12-29 23:35:54 +00:00
William Burns	f1c7424939	Fixing hotbar	2015-12-29 15:19:09 +00:00
Shaun Bennett	55cdf4148a	Merge branch 'develop'	2015-12-29 03:21:03 -06:00
Shaun Bennett	16ee74885e	Add maintenance line	2015-12-29 02:52:53 -06:00
Shaun Bennett	7ad12d0a6b	Show Host Rank in private servers	2015-12-29 00:50:20 -06:00
Shaun Bennett	7104f1363a	Give YT rank access to extra preferences	2015-12-29 00:34:18 -06:00
Keir	00e92f2569	Change date time format, biggest -> lowest units.	2015-12-29 06:20:13 +00:00
Keir	16b3ad6c1c	Hovering over a reports age now shows the full date and time it was created.	2015-12-29 06:09:45 +00:00
Keir	738815bbb1	Show age of report instead of creation date and time for ease of use.	2015-12-29 05:51:50 +00:00
Keir	278932b9b8	Use CST timezone.	2015-12-29 05:23:18 +00:00
Keir	912b4aa4c8	Get Redis connection data from redis-servers.dat file.	2015-12-29 05:19:56 +00:00
fooify	fe337986bf	Merge remote-tracking branch 'origin/develop' into bugfix/foo	2015-12-28 16:16:10 -08:00
Virizion	8a8d5b088b	Switch to 7x7 builds.	2015-12-28 16:48:03 -05:00
Virizion	3d9a252868	Added auto pickup and fixed some stuff.	2015-12-27 15:26:43 -05:00
Virizion	162b3eb33f	Stopped a bunch of block events.	2015-12-27 14:34:24 -05:00
William Burns	1066becd68	push	2015-12-26 20:21:46 +00:00
Virizion	845014b677	Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder	2015-12-25 15:49:41 -05:00
Shaun Bennett	c680d91b56	Nerf TypeWars gems (again)	2015-12-25 03:12:04 -06:00
Shaun Bennett	dd8e91e463	Update MOTD	2015-12-25 03:03:53 -06:00
Shaun Bennett	25d36b546a	Remove unnecessary files	2015-12-25 01:53:00 -06:00
Shaun Bennett	d08cfa0c4c	Holiday Gifts	2015-12-25 01:51:36 -06:00
Keir	fb24f4a1b0	Re-add ReportServer module (got removed somehow) and add it under the "Other" group.	2015-12-25 00:37:21 +00:00
Keir	56c5b8edee	Rename module to ReportServer.	2015-12-24 21:29:40 +00:00
Keir	2252a5397d	Fix file filter and reduce it down to 1 line.	2015-12-24 21:25:55 +00:00
Keir	cc421c1435	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report # Conflicts: # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2015-12-24 21:19:30 +00:00
Keir	42aba8bda1	Added file purger (runs every 30 minutes, purges anything older than a day). Use a logger instead of sout. General cleanup, especially of console messages.	2015-12-24 21:13:09 +00:00
fooify	41f56e9853	Lots of typo fixes and such	2015-12-24 11:13:54 -08:00
fooify	b356bce177	Merge remote-tracking branch 'origin/develop' into bugfix/foo	2015-12-24 11:09:08 -08:00
libraryaddict	2d974a781f	Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9 Conflicts: Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2015-12-24 14:06:59 +13:00
Virizion	b0f8edb0f9	Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder	2015-12-23 18:25:52 -05:00
NewGarbo	aa50c4762f	fixes (?)	2015-12-23 18:55:44 +00:00
libraryaddict	1d4a5e5804	Clean up imports, set resource pack on clans.	2015-12-24 07:47:05 +13:00
libraryaddict	000b1f85b7	Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop	2015-12-24 07:41:55 +13:00
libraryaddict	67bdc6832f	Tentative beginnings for clans resource packs	2015-12-24 07:40:49 +13:00
NewGarbo	369687b5dd	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha Conflicts: Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs	2015-12-23 18:31:51 +00:00
NewGarbo	ff24ebc9f4	lots of changes that i can't remember at this point	2015-12-23 18:22:20 +00:00
William Burns	79dea726aa	Added check for falling from map.	2015-12-23 10:59:12 +00:00
William Burns	c48df36459	Canvas reset with starting picture.	2015-12-23 10:26:14 +00:00
William Burns	ad1d444af8	Kit changes and new words.	2015-12-23 09:52:52 +00:00
William Burns	08b5e7b4db	Working loadouts.	2015-12-23 09:21:43 +00:00
Morten	f83016e007	Also really quickly fixed the Invisibility in lobby bug (hopefully)	2015-12-23 00:39:16 +01:00
Morten	8c399f03da	Removed a weird query :/ Status: Finished	2015-12-22 21:36:19 +01:00
Morten	9336eb19fa	Finished up the Unban feature...	2015-12-22 21:31:57 +01:00
fooify	0ac2158988	i before e!	2015-12-22 11:02:57 -08:00
fooify	255dd0bdb3	fixed cosmetic menu item dropping bug	2015-12-22 11:02:37 -08:00
fooify	592fcbd282	Merge remote-tracking branch 'origin/develop' into bugfix/foo	2015-12-22 10:55:11 -08:00
fooify	a8d9956846	more grammatical errors hast been fixed	2015-12-22 10:35:20 -08:00
Virizion	0322ae1217	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java	2015-12-22 00:02:21 -05:00
William Burns	b255c58653	Merge branches 'develop' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators	2015-12-21 21:56:08 +00:00
Shaun Bennett	2ccd7a5de0	Fix Type Wars stat icon	2015-12-21 13:20:04 -05:00
Shaun Bennett	7a72762c78	Update MOTD	2015-12-21 12:56:37 -05:00
Shaun Bennett	c63014b51f	Type-Wars merge	2015-12-21 12:49:10 -05:00
Sarah	a5436d63c0	Updating Holiday Achievements	2015-12-21 18:45:26 +01:00
Sarah	7c66bdbbde	Updating Stats GUI	2015-12-21 18:25:44 +01:00
Sarah	010b1b0a5d	Achievements....	2015-12-21 18:08:11 +01:00
Sarah	6e3274ff2f	changing Category	2015-12-21 18:06:00 +01:00
Sarah	f15c318e5c	adding PM message.	2015-12-21 18:02:25 +01:00
Sarah	082b5e156c	fixing Kit NPEs	2015-12-21 17:48:17 +01:00
Sarah	ff5761cc1d	Fixing ending Stats.	2015-12-21 17:44:15 +01:00
Sarah	590da2128c	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java	2015-12-21 17:43:51 +01:00
Morten	1726aa2530	Added a feature to unban clients across the network But there still a bug when you type a username of a none registered member. Will fix ASAP - likely after Mineware	2015-12-21 12:58:19 +01:00
Shaun Bennett	5469289d82	Wrong iterator!	2015-12-21 06:57:56 -05:00
Shaun Bennett	fae2a5d2bf	Update game display	2015-12-21 04:40:30 -05:00
Shaun Bennett	a235103066	Merge pull request #106 in MIN/mineplex from update-menu to develop * commit 'f4050fb1ff54dbe4639b0258eff53360d800d0b9': Adjust GUI, fix beta button Yo shaun debug this m8 ty	2015-12-21 03:36:46 -06:00
Shaun Bennett	f4050fb1ff	Adjust GUI, fix beta button	2015-12-21 04:35:57 -05:00
Shaun Bennett	99285b2ac8	Merge remote-tracking branch 'remotes/origin/type-wars' into develop # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java	2015-12-21 03:50:55 -05:00
Shaun Bennett	0da28faab8	Work on new tutorial	2015-12-21 03:49:27 -05:00
Mysticate	0f5be6444b	Yo shaun debug this m8 ty	2015-12-21 02:23:59 -05:00
Sarah	816da0f633	Fixing Gems	2015-12-20 12:00:32 +01:00
fooify	fe658b30a1	Grammatical errors hath been fixed!	2015-12-19 15:03:42 -08:00
Sarah	f1188529f2	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-12-19 13:09:26 +01:00
Sarah	c56cd0d56e	adjusting some timings	2015-12-19 13:08:53 +01:00
Sarah	35966d88cf	Fixing Tutorial Minion	2015-12-19 13:05:39 +01:00
Sarah	7327d9463f	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-12-19 13:00:49 +01:00
Sarah	8a54388480	fixing last commit	2015-12-19 13:00:12 +01:00
Sarah	32a0dd6668	adding Tutorial notification	2015-12-19 12:59:37 +01:00
Sarah	152e759c10	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-12-19 12:56:05 +01:00
Sarah	7cb002ca86	Adding Tutorial notification	2015-12-19 12:55:28 +01:00
Sarah	f8bffc9f88	nuke delay and Stats	2015-12-19 12:45:06 +01:00
Virizion	c0ab31fdac	Finished up fixes.	2015-12-19 00:19:50 -05:00
AlexTheCoder	66c9fa122c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2015-12-18 21:33:59 -05:00
AlexTheCoder	09528a9262	- Initial broadcast stuff	2015-12-18 21:33:40 -05:00
Virizion	a5c18f4677	Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder	2015-12-18 20:05:03 -05:00
Sarah	b3afa0094e	Fixing some nuke stuff, Giant noises only for own Team and "Giant under attack message", spelling fixes	2015-12-19 00:59:15 +01:00
Sarah	dab2416ccd	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-12-19 00:49:16 +01:00
Sarah	6c5e3d7509	Fixing visibility.	2015-12-19 00:48:42 +01:00
William Burns	c2e88c2794	Merge branch 'develop' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data	2015-12-18 18:16:32 +00:00
William Burns	13cfc0e12a	Updated to a better check	2015-12-18 18:16:20 +00:00
Keir	a72125b1dc	Implement new error thingy.	2015-12-18 18:11:25 +00:00
William Burns	0e0a22ab15	Error page	2015-12-18 17:56:22 +00:00
Keir	0b4568e785	Commit progress.	2015-12-18 17:41:03 +00:00
Keir	77595c8fbc	Allow search form to be loaded when no identifier is supplied (error messages are a bit crappy atm I'm aware).	2015-12-18 16:20:57 +00:00
Keir	bd887e1eef	Make search box functional.	2015-12-18 15:52:20 +00:00
William Burns	f57304764c	Added a hotbar layout editor	2015-12-18 15:16:00 +00:00
NewGarbo	1840572c49	Lots of changes, specifics: Fixed clans having more than max energy. Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory. /c <clan> now works with clans with 18+ players.	2015-12-18 11:13:38 +00:00
Shaun Bennett	298ea1e5e6	Merge pull request #101 in MIN/mineplex from update-paintball to develop * commit 'd561915fd32885036b55cc6a05899934a544e131': FORMATTING CHANG EI'M GOING TO CRY UGH DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D Changed dns api key to new key. Prevent server monitor redis calls to cause restarts. Added winter chests to customer support. Epic chnage that saved the day omg Die player cache Quick changes to improve things. Uncommented bouncy balls Final tweaks to random armorstand Quick thing before merge Worked on double. Switching branches Formatting Reformatted Fixed paintball to the max. :>> Class Switching branches c: Sniper work Work. Deemed unsuitable due to an issue with the paintballs flying wide. Added a sniper kit! :D	2015-12-17 23:32:22 -06:00
Shaun Bennett	f80648bfbc	Update DBPool to load from file	2015-12-18 00:32:07 -05:00
Mysticate	d561915fd3	FORMATTING CHANG EI'M GOING TO CRY UGH	2015-12-17 23:16:57 -05:00
Mysticate	2bf734a15c	DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D	2015-12-17 23:08:07 -05:00
Shaun Bennett	2c09fd969b	Attempt at fixing spectator page	2015-12-17 22:24:44 -05:00
Virizion	806b656dcf	Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder	2015-12-17 21:56:01 -05:00
Shaun Bennett	53f9a051c5	Fix spectator page sorting team list	2015-12-17 21:52:34 -05:00
Virizion	7621fe793d	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-17 21:50:32 -05:00
Virizion	5f506e3810	Moved team generation.	2015-12-17 21:49:15 -05:00
Mysticate	066d0a861f	Merge remote-tracking branch 'origin/master' into update-paintball	2015-12-17 21:00:15 -05:00
NewGarbo	4bf7e15055	player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.	2015-12-18 01:05:02 +00:00
Jonathan Williams	c2fb6e6c15	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-17 18:34:25 -05:00
Jonathan Williams	2953fe395f	Changed dns api key to new key. Prevent server monitor redis calls to cause restarts. Added winter chests to customer support.	2015-12-17 18:33:49 -05:00
William Burns	e7243d4b9c	Re-add getArcadePlayer(Player player)	2015-12-17 22:19:45 +00:00
William Burns	3e8c3cb928	Changed to setData in PlayerCustomData	2015-12-17 22:16:05 +00:00
William Burns	2ac28c4fd5	Merge branches 'develop' and 'feature/player-data' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2015-12-17 21:44:31 +00:00
William Burns	5c045bfce4	Changes to core client manager, and finishing custom data!	2015-12-17 21:27:44 +00:00
libraryaddict	7f188072ad	Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop	2015-12-18 10:03:41 +13:00
libraryaddict	66372c397b	First version of ResourcePackManager that handles all resource packs globally	2015-12-18 10:03:03 +13:00
Keir	2e02b9c8ea	Hide WIP rank label. Fix spelling issue.	2015-12-17 17:43:36 +00:00
William Burns	7d9b97180d	Testing ArcadePlayer implementation	2015-12-17 01:48:55 +00:00
Mysticate	d28c2be1c3	Epic chnage that saved the day omg	2015-12-16 20:26:04 -05:00
NewGarbo	b4c3ce9fba	a couple more prettificatons to pvp timer messages.	2015-12-16 23:19:04 +00:00
NewGarbo	eb9ba92fb1	one more quick message change/fix	2015-12-16 22:53:24 +00:00
NewGarbo	2ee1ccbcf9	qa changes to pvp safety	2015-12-16 22:48:55 +00:00
William Burns	ee202bc7f5	Add MineplexPlayer -> ArcadePlayer	2015-12-16 22:32:34 +00:00
William Burns	4077aa808f	Add to Arcade and Hub	2015-12-16 22:01:51 +00:00
William Burns	370c59ce75	Added custom data	2015-12-16 21:52:41 +00:00
NewGarbo	d619a9644b	few changes to pvp timer, and fixed bugs etc	2015-12-16 18:25:30 +00:00
Sarah	4e9e0243cd	Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into type-wars # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java # Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java	2015-12-16 18:16:08 +01:00
Keir	ad9620bb3d	Fix formatting.	2015-12-16 16:02:45 +00:00
Keir	3ecb4c7fb8	Report handlers are now parsed and displayed correctly.	2015-12-16 16:01:19 +00:00
Keir	db5327d2e4	Online reports can now be updated without re-sending all the data (ie we don't want to update all the chat messages when a member of staff handles a report). Misc. changes and fixes.	2015-12-16 15:51:01 +00:00
Keir	cd18d2a94f	ReportServer fixes and improvements.	2015-12-16 15:05:00 +00:00
William Burns	baf0f254bb	Custom data, waiting for JLO	2015-12-16 14:41:57 +00:00
Keir	6f82f8349d	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report # Conflicts: # Plugins/.idea/modules.xml # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java	2015-12-16 14:07:56 +00:00
Keir	9c7c6fdb37	Don't treat these ints as strings (quicker comparison).	2015-12-16 13:58:05 +00:00
Keir	56d606adf0	Constants cannot hold arrays.	2015-12-16 13:38:48 +00:00
Virizion	628ee8a137	Some small fixes.	2015-12-16 00:02:21 -05:00
Virizion	7fa1963268	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-15 23:06:13 -05:00
Mysticate	d16dd4a9d2	Merge remote-tracking branch 'origin/master' into update-paintball	2015-12-15 19:35:55 -05:00
Mysticate	4566577c68	Die player cache	2015-12-15 19:26:09 -05:00
Keir	b5149d2da7	Implemented williams frontend design.	2015-12-16 00:22:55 +00:00
Mysticate	b36bf37197	Merge remote-tracking branch 'origin/master' into update-paintball	2015-12-15 19:22:38 -05:00
William Burns	958399be59	Merge branch 'feature/report' of ssh://184.154.0.242:25565/min/mineplex into feature/report	2015-12-15 22:17:15 +00:00
William Burns	bc88a35cea	Add my first design!	2015-12-15 22:17:05 +00:00
Keir	398fcfdcba	Update php code to parse new report data. Main class is now view.php.	2015-12-15 22:13:23 +00:00
Keir	5528c7c885	Push iml file.	2015-12-15 21:55:42 +00:00
Keir	1042032836	Update the web side to handle to handle the new changes.	2015-12-15 21:36:54 +00:00
Keir	6d9bcb8e66	Reworked serialization and store more data in json files for later parsing. Internally store UUIDs for reports and convert them as needed for display to user. Many other misc. changes and refactorings.	2015-12-15 21:30:45 +00:00
NewGarbo	7ac1fd86b4	made pvp timer players immune to skills	2015-12-15 21:12:49 +00:00
NewGarbo	baef84f4d9	fixed pvp timer subtitles bugged out	2015-12-15 20:09:54 +00:00
Shaun Bennett	211e440e67	Merge remote-tracking branch 'remotes/origin/master' into develop # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java	2015-12-15 15:00:14 -05:00
Shaun Bennett	aef704d972	Slight winter reward rarity changes	2015-12-15 14:58:09 -05:00
Shaun Bennett	5f14d6675f	Fix shard values	2015-12-15 14:56:19 -05:00
Shaun Bennett	07f610d4bd	More Fixes	2015-12-15 14:45:12 -05:00
Shaun Bennett	607c164753	Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop	2015-12-15 13:55:01 -05:00
Shaun Bennett	92b82d786b	Don't give Winter Holiday Chests to offline players	2015-12-15 13:34:47 -05:00
Shaun Bennett	b9a688c4e7	Update monthly bonuses	2015-12-15 13:07:49 -05:00
Shaun Bennett	e3e757da8a	Fix mounts owned count	2015-12-15 13:06:11 -05:00
Shaun Bennett	3edba0fac6	Fix Grinch Hat	2015-12-15 12:28:06 -05:00
Shaun Bennett	f2107b7b79	Merge remote-tracking branch 'origin/develop' into develop	2015-12-15 12:07:40 -05:00
Shaun Bennett	2216fdc52c	Dont disable new gadgets in games	2015-12-15 12:07:34 -05:00
Sarah	40ae7743c6	reverting last "fix"	2015-12-15 14:20:21 +01:00
NewGarbo	6a346790f7	disable tutorial	2015-12-15 12:00:56 +00:00
NewGarbo	1da04b84b5	test push (change version to 0.17d)	2015-12-15 11:57:33 +00:00
NewGarbo	c63bac6433	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-12-15 11:42:16 +00:00
libraryaddict	47ad563596	Spawn nametags far far away from players	2015-12-15 22:46:30 +13:00
AlexTheCoder	6c1c40a972	- Fixed command bugs	2015-12-15 02:25:16 -05:00
AlexTheCoder	02f6a14f07	- Game commands	2015-12-15 02:06:59 -05:00
Sarah	cf58fdee4a	trying to fix the spigot Chat spam thingy.	2015-12-15 05:29:59 +01:00
Cheese	871c97f7af	changed chest %'s	2015-12-15 09:25:44 +11:00
Sarah	afa45c47ca	Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into pregametutorial	2015-12-14 14:23:42 +01:00
NewGarbo	9137fcfe40	loads of changes (pvp timer, unsafe stuff)	2015-12-14 12:39:00 +00:00
AlexTheCoder	73c84c530e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2015-12-14 06:40:16 -05:00
AlexTheCoder	ee63332062	- Moved setting changes	2015-12-14 06:39:35 -05:00
Cheese	0f38c7b287	increased minimum coal	2015-12-14 22:12:50 +11:00
Cheese	951cd65903	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-14 22:05:22 +11:00
Cheese	045bc760c2	increassed cooldown, people getting trapped perm	2015-12-14 22:05:08 +11:00
Cheese	809ff649be	lowered rarities a bit	2015-12-14 22:03:09 +11:00
Shaun Bennett	7181a26e58	Remove pointless equals()	2015-12-14 05:56:39 -05:00
Cheese	9e72e5adf1	nicer text	2015-12-14 21:43:11 +11:00
Cheese	daa9f165b1	removed coins from gadgets	2015-12-14 21:41:47 +11:00
Cheese	52394c89dd	fixed skins beign wrong way around	2015-12-14 21:34:27 +11:00
Cheese	0ecd5a05f5	fixed hat ownership reduced coal cost	2015-12-14 21:32:06 +11:00
Cheese	00de6880ba	fixed wrong types	2015-12-14 21:25:30 +11:00
Cheese	342e9f2345	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-14 20:53:49 +11:00
Cheese	1189535748	icon fixes	2015-12-14 20:53:34 +11:00
Shaun Bennett	816c057eb3	Notify server about opening chest	2015-12-14 04:49:44 -05:00
Shaun Bennett	6ec8ec4c01	Merge pull request #97 in MIN/mineplex from william-gladiators to master * commit 'd91e4ab4f756746b31c7ebdd3e7d33c139ea7d30': Another door bug, and a title fix. Health looks nicer. Bug fixes. Title shortened.	2015-12-14 03:45:55 -06:00
Shaun Bennett	daf1d29ce0	Fix Carl	2015-12-14 04:44:11 -05:00
Shaun Bennett	50bf97ae4a	Fancy treasure changes	2015-12-14 04:19:15 -05:00
Cheese	670eaa1954	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-14 19:16:03 +11:00
Shaun Bennett	e4fd97467f	More treasure changes	2015-12-14 03:14:52 -05:00

... 13 14 15 16 17 ...

7222 Commits