4457 Commits

Author	SHA1	Message	Date
Sam	7a5a6c3d00	Fix duplicate message	2016-09-06 19:55:31 +01:00
samczsun	08090f5e06	PC-818 ... Seismic Charges can no longer remove barrier blocks	2016-09-05 18:25:16 -04:00
samczsun	11c97691a9	PC-937 ... This commit allows Arcade to consider spectating and vanished players when deciding to autostart a game	2016-09-05 18:25:16 -04:00
samczsun	3aaa9b2514	Sort tab list properly	2016-09-05 18:25:16 -04:00
Sam	8ebaad4736	Beta ready commit	2016-09-05 17:59:49 +01:00
Keir Nellyer	acd63c90a1	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-09-05 14:26:06 +01:00
Sam	34ee62bdc3	Fix NPE	2016-09-03 20:32:10 +01:00
Sam	b3212fc003	Particle changes	2016-09-03 20:13:08 +01:00
Sam	4b1c93150b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-03 20:12:39 +01:00
Sam	8d5d0c6272	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-09-03 18:29:37 +01:00
Sam	fc0217f1fd	More magic OITQ	2016-09-03 18:25:17 +01:00
Sam	e0424c78b2	Added spawn barrier	2016-09-03 18:24:56 +01:00
Sam	7eb148cc59	Ultimate colour change	2016-09-03 18:24:44 +01:00
cnr	374142e63f	Merge branch 'update/the-smoothest-release-we-will-never-have' into develop	2016-09-02 00:42:51 -05:00
TadahTech	e2f974e1e6	Add sounds and messages to basketball.	2016-09-02 00:40:23 -05:00
cnr	ae0d30558c	Merge branch 'update/the-smoothest-release-we-will-never-have' into develop	2016-09-02 00:12:12 -05:00
cnr	f6db5393a3	Merge branch 'project-cosmetics' into develop	2016-09-02 00:08:23 -05:00
TadahTech	9e0bb6ff96	Tweak invite starting index. ... Disable NextBestGame in an MPS	2016-09-01 20:59:28 -05:00
TadahTech	d8486abbfd	Fix minor best game issues.	2016-09-01 20:05:53 -05:00
TadahTech	a6360249b7	Use party if a player has it.	2016-09-01 08:47:43 -05:00
TadahTech	6f3d7dcd29	Merge branches 'develop' and 'update/the-smoothest-release-we-will-never-have' of https://github.com/Mineplex-LLC/Minecraft-PC into update/the-smoothest-release-we-will-never-have	2016-09-01 08:45:43 -05:00
TadahTech	41936e0efc	Remove users from the map.	2016-09-01 08:31:16 -05:00
TadahTech	fdc54e1dd1	Fix BestGame not cancelling for parties.	2016-09-01 08:29:51 -05:00
cnr	05f640266f	Fix basketball scoring infinite loop	2016-09-01 06:36:47 -05:00
TadahTech	53846acbf6	Dont let Minestrike use NextBestGame	2016-09-01 05:39:47 -05:00
TadahTech	46053e82e1	Mavs changes.	2016-09-01 02:35:31 -05:00
cnr	9cd5b73432	Merge branch 'update/basketball-game' into develop	2016-08-31 23:19:51 -05:00
Sam	57292414c6	Gems for winners	2016-08-31 22:55:13 +01:00
Sam	0b7fdc01eb	Initial balence change	2016-08-31 16:30:50 +01:00
Sam	6a139d5c55	Tiny code improvement	2016-08-31 13:28:48 +01:00
Sam	7599630328	Pyromancer Ultimate name change	2016-08-31 13:27:07 +01:00
Sam	8d222aafec	Fix increasing loop in Overtime	2016-08-31 13:26:54 +01:00
Sam	1bfebf358f	Add Overtime	2016-08-31 12:07:50 +01:00
Sam	b1faecea49	Kit Fire incorrect values	2016-08-31 12:07:25 +01:00
AlexTheCoder	8ca214a4d8	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game	2016-08-30 01:37:14 -04:00
TadahTech	a68f7395e4	Use proper server group / remove testing.	2016-08-30 00:10:38 -05:00
TadahTech	94bfc9aa15	Use proper server group / remove testing.	2016-08-29 22:33:01 -05:00
TadahTech	39ea280098	NextBestGame code and new hub releases	2016-08-29 20:21:36 -05:00
Alexander Meech	464c9fcdc3	Update steal chance	2016-08-29 20:37:02 -04:00
Sam	7a3ce9813c	Payload (OITQ)	2016-08-29 23:08:04 +01:00
Sam	9454e1f409	Skywars and Kit Progression	2016-08-29 23:07:48 +01:00
Sam	ec8ed76270	Convert old perks to new perks	2016-08-28 09:06:07 +01:00
Sam	88f4813534	Perk related issue	2016-08-28 09:05:49 +01:00
Sam	ccd855da84	Name the ultimates	2016-08-28 09:05:31 +01:00
Sam	54e8f8e5e8	Code improvement and cleanup	2016-08-28 09:05:11 +01:00
Sam	34c6e1cab7	Add the base of kit progression	2016-08-28 09:04:46 +01:00
Sam	d81ed348f3	Remove used import	2016-08-28 09:04:09 +01:00
Keir Nellyer	cd9423a8e4	De-couple chatsnap from report system	2016-08-27 22:21:56 +01:00
Sam	a35c162dc4	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-26 21:26:16 +01:00
Sam	4bc49e6133	Solve merge conflicts	2016-08-26 21:21:18 +01:00
LCastr0	3e38eb5990	Fixes to the merging conflicts	2016-08-25 20:13:59 -03:00
Sam	c2344a0494	Magnet not giving the kill	2016-08-25 20:26:18 +01:00
Sam	265ab620e4	Fix Magnet affecting teams members	2016-08-25 20:10:13 +01:00
Sam	9c5ab7c67e	Remove Fire Aspect 2	2016-08-25 20:09:50 +01:00
TadahTech	2a861460c6	Remove unused variables	2016-08-25 05:12:29 -05:00
TadahTech	b3b8f44b3a	Fix perks not being registered.	2016-08-25 05:11:52 -05:00
TadahTech	ba2bee4f25	Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java # Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java	2016-08-24 21:29:01 -05:00
TadahTech	bca19788db	Merge branches 'develop' and 'feature/lobby-update' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/lobby-update ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/progression/ProgressiveKit.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeDetailsButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/buttons/KitUpgradeMenuButton.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitDisplayMenu.java # Plugins/Mineplex.Core/src/mineplex/core/progression/gui/guis/KitInformationTrackerMenu.java # Plugins/Mineplex.Hub/src/mineplex/hub/modules/WorldManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java	2016-08-24 21:28:36 -05:00
cnr	352e1e0eb2	Merge branch 'update/skywars-finalised' into develop	2016-08-24 17:22:01 -05:00
cnr	df1fc60d3d	Merge branch 'update/skywars-finalised' into develop	2016-08-24 17:12:58 -05:00
Sam	4088d2a311	Air teleportation fix ... Makes it less likey that a player would die of fall damage when using the eye of ender	2016-08-24 19:50:38 +01:00
TadahTech	3b9d6adfbc	Lobby Update	2016-08-23 01:37:07 -05:00
Sam	e0f319ea09	Change kit internal names ... Changes the kit internal names to match the current skywars ones in order so that kit progression experience is carried over during this update.	2016-08-22 17:28:51 +01:00
xGamingDudex	7fb6ff58d0	Moved gadgets to use a whitelist system instead of blacklist for ... collisions	2016-08-22 01:00:29 +02:00
Sam	7db41a8be5	Reduce Earth kit scaling	2016-08-20 22:45:17 +01:00
Sam	28bbda23f5	Remove debug commands	2016-08-20 22:44:54 +01:00
Sam	e6530a6f44	More tweaks and fixes	2016-08-20 12:14:01 +01:00
xGamingDudex	e64324b36c	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-20 11:40:15 +02:00
Sam	dc5c2430cd	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-19 17:58:27 +01:00
Sam	c4cb5d8db4	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-19 12:56:24 +01:00
LCastr0	84c6720d1c	Fix merging errors	2016-08-18 18:30:32 -03:00
Sam	3b11a2e985	Killstreaks	2016-08-18 22:02:33 +01:00
cnr	999237fe69	Accurately report game TPS	2016-08-18 01:59:05 -05:00
cnr	405f67f8b2	Implement/activate Anticheat phase two ... - Remove anticheat guardians from Arcade - Uncomment/implement Anticheat phase two actions - Specifically: immediate ban on Kill Aura type A, VL 200. - Give moderators less-specific messages, and limit messages by severity	2016-08-17 23:23:20 -04:00
Sam	6c1bd88631	Increase passive knockback	2016-08-17 23:33:31 +01:00
Sam	1565b66395	Ore level changes	2016-08-17 23:33:17 +01:00
Sam	8d6e4a5fd3	Remove some unused code and cleanup	2016-08-17 22:28:22 +01:00
Sam	0176f31f1e	Complete implementation of kit progression	2016-08-16 18:55:26 +01:00
Sam	604f5bc2cc	Update to work with new scoreboard system	2016-08-16 11:03:12 +01:00
Sam	29a07c60ab	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-16 11:02:15 +01:00
Sam	84e5b38380	Testing session feedback	2016-08-16 10:53:37 +01:00
Sam	dac4d9595c	Change scoreboard to use new system	2016-08-15 20:28:12 +01:00
Sam	6839006bd1	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-15 20:25:01 +01:00
Sam	d5d8f07085	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple	2016-08-15 19:21:56 +01:00
Sam	df606d5e07	Changed game logic to try out multiple round concept	2016-08-15 19:19:20 +01:00
Sam	09741d4d2a	Added VersionModule (The new way to check client versions for games)	2016-08-15 19:18:51 +01:00
Sam	ea7d877d36	Some attempt at per player kits	2016-08-15 17:45:24 +01:00
xGamingDudex	e71cec874e	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-14 20:09:01 +02:00
Sam	8f4303cf39	Progress on Upgrade Details	2016-08-13 22:40:33 +01:00
Sam	33cb4db338	Minestrike - Stop vanished players being assigned teams on join	2016-08-12 19:52:23 +01:00
Sam	2915a5e3b9	Add mid-game kit changing NPCs	2016-08-11 21:16:49 +01:00
Sam	69fd78bbf2	Remove Shurikens	2016-08-11 19:05:13 +01:00
Keir Nellyer	a8e891f247	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java	2016-08-11 14:53:57 +01:00
Sam	60a46c8c10	Fire burst is now instant	2016-08-11 14:26:25 +01:00
samczsun	7de9da3d1c	Complete rework of disguising and antihack hook ... This commit completely rewrites DisguiseManager, DisguisePlayer, and PlayerDisguiseManager. Changes to disguising means that much of the core was also changed, primarily having to do with mapping by UUID versus player names. Several new API classes were added, such as EntitySelector, Managers, UtilTasks, and a brand new scoreboard API which is much more optimized and allows for much longer lines The new anticheat is hooked as well, with implementation for guardians which follow the players around. Release two code is also included, but is currently disabled via a boolean.	2016-08-10 21:03:30 -04:00
Sam	82b2541e34	PC-827 ... Team SSM - Teammates can no longer cancel each other's Blaze Firefly	2016-08-10 21:47:13 +01:00
Sam	df646b0659	PC-897 ... SG - Spectators can no longer punch fireballs from the world border	2016-08-10 21:46:37 +01:00
Sam	a02699d84a	PC-898 ... SSM - Fixes an issue where kit armor would not appear correctly in your inventory.	2016-08-10 21:46:02 +01:00
Sam	933861176d	PC-662 ... Castle Siege - Fixes the game not ending if the whole of one team left.	2016-08-10 21:45:27 +01:00
Sam	e05f90372a	Add kit upgrade details	2016-08-10 19:05:40 +01:00
xGamingDudex	907ac7473f	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into bugfix/pc-120+698	2016-08-10 16:52:37 +02:00
Sam	87dd4c5632	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple	2016-08-09 20:23:58 +01:00
Sam	c19825cbb0	Remove unused imports	2016-08-09 20:23:50 +01:00
Sam	950a46ad12	Fix Throwable Dirt's velocity	2016-08-09 14:06:39 +01:00
Sam	5fd5245978	Use attack name	2016-08-09 13:07:17 +01:00
Sam	95c23585c8	Missed a file	2016-08-09 12:53:54 +01:00
Sam	acd5e0c1d2	Added minecart colors	2016-08-09 12:53:34 +01:00
Sam	2f3ff052ff	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-08 22:59:55 +01:00
Sam	4c825cf80b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-08 22:48:33 +01:00
Sam	3bab7ffe44	Use attack name for Snowballs and Eggs	2016-08-08 22:48:13 +01:00
Sam	239761962d	Now 1.9!	2016-08-08 20:49:24 +01:00
Sam	93e49bc8a6	Stop placing and dropping of skill items	2016-08-08 16:44:13 +01:00
Sam	280ff577fa	Metal Kit skill item placing and dropping	2016-08-07 01:25:48 +01:00
Sam	44274bcc64	Projectiles, Enchanted armor & StackOverFlows ... Fixes an issue where players with enchanted armor would cause the server to frezze for an extended amount of time due to a stackoverflow error when hit by projectiles such as snowballs or eggs.	2016-08-07 01:23:03 +01:00
Sam	4173c96d32	Fixes inconsistency with the scoreboard	2016-08-06 23:56:54 +01:00
Sam	691fc309c4	Documentation	2016-08-05 22:11:25 +01:00
Sam	e6bdfe8ba7	Per player fireworks	2016-08-05 22:11:15 +01:00
Keir Nellyer	1854b71757	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2016-08-05 17:05:01 +01:00
Sam	2c6fc85fee	Logic fix and message change	2016-08-04 17:59:28 +01:00
Sam	618a132806	Payload path marker logic change	2016-08-04 17:29:40 +01:00
Sam	24c1e5fc3b	Kit items are now unbreakable	2016-08-04 17:29:01 +01:00
Sam	23b7064d43	Island ores bug	2016-08-04 16:56:13 +01:00
Sam	190ced7d97	Metal Kit tweaks	2016-08-04 16:55:52 +01:00
xXVevzZXx	91cf391724	some adjustments to UHC Survivalgames	2016-08-04 00:33:24 -04:00
cnr	3610f78b37	Merge branch 'feature/thanks' into develop	2016-08-03 22:23:46 -04:00
Shaun Bennett	e113bedea5	Fix accidentally refactoring "thanks" in strings	2016-08-03 15:11:31 -05:00
Shaun Bennett	ad6c1dd970	Adjust some text wording	2016-08-03 14:55:33 -05:00
Shaun Bennett	a61906acfa	Ignore "Testing" boostergroup when announcing activation	2016-08-03 14:24:49 -05:00
Shaun Bennett	ca13b8f29e	Fix compile errors	2016-08-03 14:18:26 -05:00
Shaun Bennett	1ae7f6cb25	Integrate the new ThankManager into Amplifiers	2016-08-03 14:03:12 -05:00
Sam	2b8754aa32	Metal Kit bug fixes	2016-08-02 23:34:12 +01:00
Shaun Bennett	f41cd8c104	Add /thank command. Update jooq files	2016-08-02 00:10:46 -05:00
Sam	62a1968b01	Experimental Metal Kit	2016-08-02 01:13:16 +01:00
Sam	bd00ac8446	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-08-01 19:34:40 +01:00
Sam	2c37af32ca	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-08-01 19:19:34 +01:00
Sam	4085453f0f	Ninja Dash stopping/not working on rails	2016-08-01 18:47:17 +01:00
Sam	71f9fd97d6	End Effect change ... Reduced the amount of TNT thrown and reduced the velocity at which they are fired.	2016-08-01 18:46:35 +01:00
Sam	8f96b15454	Ninja Dash damage radius fix	2016-08-01 17:18:01 +01:00
Sam	84a4aa5157	Reduce Shuriken damage	2016-07-31 13:47:28 +01:00
Sam	1fde433c50	More changes and fixes	2016-07-30 22:53:36 +01:00
Sam	063e05c0f3	Move subtle changes and fixes	2016-07-29 19:07:24 +01:00
Keir Nellyer	bb9dbf1da4	PC-877 Vanish report handler when teleporting to offender's server	2016-07-29 15:08:03 +01:00
cnr	8d0dc0ce08	Merge branch 'feature/party-v2' into develop	2016-07-28 21:19:52 -05:00
LCastr0	ab8d6daa2c	GitHub being annoying again	2016-07-28 19:59:49 -03:00
Sam	9b71f8c30b	Typo in KitBarrage	2016-07-28 22:49:58 +01:00
Sam	6c11037460	First QA testing session feedback	2016-07-28 22:39:05 +01:00
Sam	771f643b42	Jumping disabled during Pyromancer ULT	2016-07-28 21:01:29 +01:00
Sam	446aec5187	Add "for Team X" when picking up the Arrow powerup	2016-07-28 20:19:50 +01:00
Sam	ba03051689	Add 1 second respawn delay	2016-07-28 19:33:16 +01:00
Sam	d30703c570	Completed game logic & Kit fixes	2016-07-28 19:31:15 +01:00
Shaun Bennett	9c42f4c147	Use the proper boostergroup for amplifier thanks	2016-07-28 13:27:48 -05:00
TadahTech	ab9bf2f405	Fixes possible bug with party leaders not seeing chat. ... Adds pling when you received an invite.	2016-07-28 03:40:24 -05:00
cnr	dd38a1dd76	Merge branch 'update/clans' into develop	2016-07-27 20:40:35 -05:00
cnr	05e59ae9cc	Revert "Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"" ... This reverts commit 917b83250d.	2016-07-27 19:03:04 -05:00
Sam	00c0e38b82	Kit upgrades now display	2016-07-27 23:02:40 +01:00
xXVevzZXx	749fa36a5a	remove debug and check for Integer class	2016-07-27 16:47:08 -05:00
AlexTheCoder	031a9575ae	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-27 15:13:18 -04:00
xXVevzZXx	43c45f4094	add timer to dragon escape	2016-07-27 13:59:35 -05:00
Sam	8648581140	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-27 19:57:25 +01:00
Sam	ee38cb4c39	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-07-27 19:56:36 +01:00
Sam	888d3fb1aa	Payload logic progress	2016-07-27 19:56:31 +01:00
cnr	3cddf35d12	Refactor out legacy ConfirmationPage	2016-07-27 13:52:03 -05:00
cnr	3d0cc2a5fd	Refactor Clans gold dependency out of core	2016-07-27 13:52:03 -05:00
cnr	dc96258055	Merge branch 'feature/party-v2' into develop	2016-07-27 13:19:25 -05:00
Shaun Bennett	0d46bc4609	Add Amplifier thank button	2016-07-27 13:17:36 -05:00
xGamingDudex	161381f393	Fixed PC-698	2016-07-27 12:09:59 +02:00
TadahTech	5180e46be7	Revert party chat symbol to "@". Change team chat symbol to "#".	2016-07-24 22:17:50 -05:00
Sam	80eb7b2fd3	Gives Super Arrow on start.	2016-07-24 22:44:50 +01:00
Sam	576b92a5ce	Ultimates added to QuiverPayload	2016-07-24 22:06:14 +01:00
Sam	ef797aa599	Velocity fix	2016-07-24 21:41:42 +01:00
Sam	76da92f42e	QuiverPayload added ... Basic implementation added	2016-07-24 21:27:31 +01:00
LCastr0	f4c40c61bb	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-07-24 13:18:53 -03:00
LCastr0	195a82f78f	Github is annoying me about this, but I don't know what it is	2016-07-24 13:18:33 -03:00
Sam	a8503d2fb8	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-07-24 11:50:48 +01:00
Sam	4728a50ca9	Small message change ... Avoids using two variables	2016-07-24 11:49:57 +01:00
TadahTech	ceccf2d2ac	Don't give the item when a game is in progress.	2016-07-23 22:36:53 -05:00
Sam	50de769e36	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-24 00:13:13 +01:00
Sam	03b3c1864d	Map crumble issue ... Fixes an issue where the max distance of a map would not be calculated correctly affecting the map crumble	2016-07-24 00:12:48 +01:00
Sam	d3c9957f95	Ultimate length tweaks	2016-07-23 23:43:06 +01:00
Sam	43aae5e076	Ultimate visual and gameplay improvements	2016-07-22 22:47:29 +01:00
Keir Nellyer	c5f3f2b2d6	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-21 22:44:43 +01:00
AlexTheCoder	b87c6cfff0	Fix git removing class	2016-07-21 17:27:41 -04:00
AlexTheCoder	75cc75f40c	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-21 17:25:15 -04:00
AlexTheCoder	4a77a587f8	Fix git removing a class	2016-07-21 16:11:05 -04:00
AlexTheCoder	fc3ceddf4d	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game ... Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2016-07-21 15:47:59 -04:00
xXVevzZXx	0262452b6a	Add enchantments to items, lower arrow spawn rate and limit, give players some steak and make armor unbreakable.	2016-07-21 13:59:35 -05:00
Keir Nellyer	9b58c53e90	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-21 16:11:09 +01:00
Sam	faece2c5f8	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-21 11:13:15 +01:00
Sam	f48009d9f8	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq	2016-07-21 11:12:23 +01:00
Sam	e7658b4bf2	New kits and upgrades for old kits	2016-07-21 11:05:21 +01:00
AlexTheCoder	e5cd38c11b	Revert enjin changes	2016-07-21 05:20:47 -04:00
AlexTheCoder	2615ef74dd	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans	2016-07-21 05:09:54 -04:00
TadahTech	b48f97fd2e	Fix stupid JOOQ issue and IntelliJ.	2016-07-21 03:46:18 -05:00
cnr	9a06cce0a0	Merge branch 'feature/party-v2' into develop	2016-07-20 16:41:50 -05:00
TadahTech	67a185acc9	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-07-20 15:52:59 -05:00
AlexTheCoder	ff210271c9	Add javadocs	2016-07-20 12:21:15 -04:00
Sam	7e26480452	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-19 22:29:00 +01:00
Sam	3411a3b978	Throwable Dirt colliding issues ... Fixes the falling dirt block colliding with the thrower.	2016-07-19 22:28:56 +01:00
Sam	8b552a69de	Removal of debug message	2016-07-19 21:45:03 +01:00
Sam	765958a421	Code cleanup for PerkDirtCannon ... Cleans up some bad code in PerkDirtCannon and now removes the dirt blocks on death.	2016-07-19 20:51:14 +01:00
Sam	7470078da9	Typo in PerkFireBurst ... Should say Blaze Rod instead of Snowblock	2016-07-19 20:50:19 +01:00
Sam	588e32e1b1	Addition knockback perk for Earth Kit ... Adds a perk so that the Earth kit takes 75% less knockback while on the ground	2016-07-19 20:49:27 +01:00
Sam	0390822fd7	IceBridge item no longer droppable	2016-07-19 20:48:36 +01:00
Sam	63a0eebd02	Increased chance enchanted of armour	2016-07-19 20:48:12 +01:00
AlexTheCoder	0eac157701	Implement basketball features in the hub and begin setting up coordinates	2016-07-19 12:45:38 -04:00
AlexTheCoder	5ecfaef413	Merge branch 'feature/mavericks-master-builders' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game	2016-07-18 16:28:22 -04:00
Keir Nellyer	103f31afc1	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-18 17:17:11 +01:00
xXVevzZXx	370b0693d9	fix the server thinking it's the next week	2016-07-17 05:20:21 -05:00
cnr	0ae4b0c5e0	Temporarily disable anti-xray in UHC	2016-07-16 23:08:18 -05:00
AlexTheCoder	08850d909f	Further work on brood mother boss and nether	2016-07-16 21:59:03 -04:00
Sam	e2af4df44b	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-16 21:22:57 +01:00
Shaun Bennett	34f718b2ec	Fix improper gem/shard reward handling	2016-07-16 06:27:16 -05:00
Sam	30111eb940	Duplicate enchantment fix	2016-07-16 11:16:57 +01:00
Sam	951e07488a	GI changes from testing session	2016-07-16 11:15:33 +01:00
Sam	f012e8d4ed	Merge from develop	2016-07-16 08:41:15 +01:00
Sam	8523d56bbf	Merge fix	2016-07-16 08:33:41 +01:00
Keir Nellyer	6756d04aa7	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-15 23:56:08 +01:00
Sam	d901fce3ac	Experimental Skywars Kits	2016-07-15 23:07:17 +01:00
xXVevzZXx	728a91da0f	adding damage outsid ethe loop	2016-07-15 04:57:44 +02:00
xXVevzZXx	3070835662	enable armor protection and fix shotguns	2016-07-15 04:39:53 +02:00
xXVevzZXx	6c7f2d8b0d	fix damage in DM prepare, eating grenades and no health regen	2016-07-15 02:28:22 +02:00
Keir Nellyer	f0c2686ca7	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-14 23:01:11 +01:00
cnr	a0847b8d1a	Fix null ServerGroup uptimes value for MPSes	2016-07-14 08:08:24 -05:00
cnr	1a2e0df6ca	Only allow OPs to use minestrike debug commands	2016-07-14 07:28:33 -05:00
cnr	1d1c3ef1be	Merge branch 'thanos-mineware' into develop	2016-07-14 03:41:00 -05:00
Thanos Paravantis	40345bc93c	Fix Bawk Bawk Battles game start	2016-07-14 11:23:39 +03:00
cnr	7cc44c8bfc	Merge branch 'thanos-mineware' into develop	2016-07-14 00:22:01 -05:00
Thanos Paravantis	906762e9db	Remove debug commands	2016-07-14 08:17:36 +03:00
cnr	917b83250d	Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing" ... This reverts commit 30287a0832, reversing changes made to b8650d741d.	2016-07-14 00:10:37 -05:00
samczsun	7dcf7378ef	Many changes ... Fix spectator race condition Refactor out cut clean into modules Add combat log module Add antixray module	2016-07-13 21:30:54 -05:00
cnr	a7b30f4f59	Merge branch 'thanos-mineware' into develop	2016-07-13 21:26:25 -05:00
Shaun Bennett	a34ac42093	Amplifiers adjustment - shards only	2016-07-13 19:26:23 -05:00
Thanos Paravantis	4e985b85e6	Make final challenge changes ... - Increase Color Change delay - Make Tag Master not count for players jumping into the void	2016-07-13 23:59:01 +03:00
Shaun Bennett	369dabffae	Amplifier updates - move to boost shards only	2016-07-13 15:07:24 -05:00
Thanos Paravantis	711a04ffa8	Add Bawk Bawk Battles to hub compass	2016-07-13 21:40:31 +03:00
Thanos Paravantis	3497a4c095	Remove unused debug messages	2016-07-13 19:29:48 +03:00
Thanos Paravantis	6c11b718af	Remove suppress warnings annotations	2016-07-13 19:03:39 +03:00
Thanos Paravantis	dab3e09837	Achievement fixes, minor challenge changes ... - Fishing Day was marked as deprecated. - Surf Up will no longer track waves in which players were killed. - Make Bouncing Shadow not count players that lost. - Tag Master will now select alive players only. - Removed debug messages.	2016-07-13 18:52:14 +03:00
Thanos Paravantis	ad32f4e2f1	Remove unnecessary new string declaration	2016-07-13 18:05:35 +03:00
Thanos Paravantis	839d9263fd	Prevent game crash if started with one player	2016-07-13 18:03:38 +03:00
Thanos Paravantis	efce89a7e7	Fix Color Change platforms not removed properly	2016-07-13 17:47:17 +03:00
Thanos Paravantis	2e5d7c023f	Fix Tag Master, show bouncing block full score	2016-07-13 17:13:02 +03:00
Thanos Paravantis	6cef42d7a4	Fix merge issues	2016-07-13 13:36:59 +03:00
Thanos Paravantis	179b59af2c	Merge branch 'develop' into thanos-mineware	2016-07-13 13:28:03 +03:00
Thanos Paravantis	943dc88ca4	Modify challenge list, change display messages	2016-07-13 13:23:15 +03:00
cnr	e40abd4859	Merge branch 'thanos-mineware' into develop	2016-07-13 05:04:50 -05:00
Sam	2f6e140b34	Item in hand change (Devourer) ... Changes the item in the NPC's hand for Devourer from OBSIDIAN to a DIAMOND_CHESTPLATE	2016-07-12 21:57:37 +01:00
Sam	5382afedda	Sharpshooter arrow limit changed to 4	2016-07-12 21:56:25 +01:00
xXVevzZXx	654ab281ea	Add option of "uptimes" to servergroups	2016-07-12 15:44:29 -05:00
Thanos Paravantis	0f3b2da8b7	Fix Bouncing Block, re-add features for testing	2016-07-12 23:02:01 +03:00
cnr	daddaa477e	Merge branch 'update/brawl-games' into develop	2016-07-12 06:45:32 -05:00
xXVevzZXx	9cf5a6fb9e	Fix Absorption in OP MB, add more arrows to OP MB, fix not being able to purchase primary weapon in MS, fix skin bug in MS and fix helmet drop when scoping in Strike Games	2016-07-12 05:39:21 +02:00
xXVevzZXx	ac8a920484	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/brawl-games ... # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/GunModule.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java	2016-07-12 03:07:31 +02:00
AlexTheCoder	30287a0832	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing	2016-07-11 14:46:08 -04:00
Sam	f40299e402	Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised	2016-07-11 18:34:48 +01:00
Thanos Paravantis	6a87be13f0	Remove features that contain bugs	2016-07-11 01:02:19 +03:00
Thanos Paravantis	416b978c4f	Apply chicken attack and completion improvements ... - Chicken spectators will no longer receive the compass to prevent them from teleporting near players. - The winner of the game will not see the "You have completed the challenge." message as the game will end afterwards.	2016-07-10 15:16:17 +03:00
Thanos Paravantis	5a7e7c7623	Challenge bug fixes and improvements ... - Added crumble feature to Block Lobbers - Increased TNT height on Water Horror - Increased Lava Run difficulty - Fixed unclickable Bawk's Food Kit - Fixed chickens not attacking properly on chicken attack - Fixed dominant team not winning on team based challenges - Fixed spectators being able to break blocks on Treasure Digger	2016-07-10 13:32:24 +03:00
Thanos Paravantis	a9f41ab269	Refactor project classes	2016-07-09 12:00:06 +03:00
Keir Nellyer	5c83f09456	SnapshotRepository no longer extends MinecraftRepository ... It doesn't need to.	2016-07-08 23:26:33 -04:00
Sam	34565b2975	PC-699 ... /bc in MPS is now protected by the filter	2016-07-08 22:09:48 +01:00
Sam	07b65ad1c9	PC-621 ... Doors can now be opened in Block Hunt	2016-07-08 21:01:15 +01:00
Sam	af9611dcfd	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple	2016-07-08 21:00:34 +01:00
Thanos Paravantis	331c1bcf91	Merge branch 'develop' into thanos-mineware	2016-07-08 22:29:59 +03:00
Thanos Paravantis	7887c96cc9	Decrease delay between challenges	2016-07-08 22:28:53 +03:00
Thanos Paravantis	7ba7414101	Improvements, refactoring and bug fixes ... - Fixed heights not being calculated correctly on Kangaroo Jump. - Fixed platform not being removed entirely on Color Change (needs confirmation). - Fixed death effect items not spawning on Treasure Digger. - Fixed TNT not reaching players on Water Horror. - Fixed Dogs Vs Cats hologram being displayed continuously (flashing) (needs confirmation). - Increased score hologram elevation rate. - Spawn locations are automatically centered. - Border is now far away from challenges. - Refactored main game class.	2016-07-08 21:30:43 +03:00
TadahTech	ce72d25832	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-07-08 13:09:02 -05:00
Sam	42c578be9d	PC-612 ... Fixes an issue that removing Co-host from someone would remove their creative mode in Master Builders.	2016-07-08 17:54:42 +01:00
Sam	c16f9ec9ec	PC-688 ... Changes the description in Draw My Thing so that it reflects changes made to the tip system.	2016-07-08 17:53:22 +01:00
Sam	c607654c51	PC-692 ... Fixes an issue that allowed staff spectators to damage the King in Castle Siege	2016-07-08 17:50:33 +01:00
Sam	7940eeb0ee	PC-633 ... Allows humans in Wither Assault to place blocks under the map, allowing them to no longer get stuck	2016-07-08 17:49:38 +01:00
Sam	aae24d862a	Revert "PC-692" ... This reverts commit 7865b1ef80.	2016-07-08 17:38:53 +01:00
Sam	7865b1ef80	PC-692 ... Allows humans in Wither Assault to place blocks anywhere so that players are not able to get stuck in the ground	2016-07-08 17:37:32 +01:00
xGamingDudex	5349d26115	Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders	2016-07-08 03:41:13 +02:00
xGamingDudex	d276d8ca5d	Removed "Failure" feature and cleaned some code	2016-07-08 03:40:37 +02:00
xGamingDudex	c50ec49ad9	Minor updates ... Tweaked some location values. Added more event handling to the reveiw hub and mavericks hub. Added builder info holograms to all sides of the display slots in the mavericks hub.	2016-07-08 02:59:33 +02:00
Keir Nellyer	cb555a41ab	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-07-07 20:47:19 -04:00
Keir Nellyer	0dc17bf6fa	Further code cleanup	2016-07-07 18:12:52 -04:00
Sam	da9ad913b2	Finalisation of update	2016-07-07 23:03:23 +01:00
Keir Nellyer	4e0287ad03	Re-import report feature classes in Hub and Arcade	2016-07-07 14:01:18 -04:00
xXVevzZXx	783b20a0dc	Disable champions abilities in smash dom and disable supply chests, adjust peace announcement in Strike games, Absorbtion fix in OP MB, Countdown in CHanging Kits, more Arrows in OP MB, regen hunger in skysmash, scoped players drop helmets now, fix stuff with identifiers in GunModule	2016-07-07 15:08:57 +02:00
samczsun	63b6158fe4	More UHC Fixes ... Fixes: PC-137 PC-138 PC-497 PC-665 PC-710 PC-719 PC-754 Also fixes chunk synchronization issue, plugs potential memory leaks Fancy spectating Use enum priorities	2016-07-06 15:55:12 -04:00
cnr	17f89f6937	Merge branch 'project-cosmetics' into develop	2016-07-06 13:00:29 -05:00
Thanos Paravantis	04f0ef199c	Make CustomFirework singleton class public	2016-07-06 20:47:28 +03:00
LCastr0	63500c19c9	Removed commented lines ... Added javadocs to GadgetChangeEvent	2016-07-06 14:45:05 -03:00
Thanos Paravantis	989dd98212	Fix players not losing on Pick a Side	2016-07-06 20:41:26 +03:00
Thanos Paravantis	6a66d6cc92	Lower barrier spawn chance on Cloud Fall	2016-07-06 20:40:51 +03:00
Thanos Paravantis	7319965c45	Temporarily fix challenge completion/lose issues	2016-07-06 20:40:15 +03:00
Thanos Paravantis	47f62e2c89	Make lava run a bit more difficult	2016-07-06 20:39:37 +03:00
xXVevzZXx	36285ee101	Improve GunModule with editable variables	2016-07-06 18:55:13 +02:00
xXVevzZXx	4dedd27227	finish up editing of arrays for gamemodes	2016-07-06 18:34:15 +02:00
Thanos Paravantis	185ba600ca	Merge branch 'develop' into thanos-mineware	2016-07-06 17:48:31 +03:00
Thanos Paravantis	e326fd322c	Update Pick a Side, refactor Reverse Tag	2016-07-06 17:45:51 +03:00
Thanos Paravantis	29434b786e	Apply completion/lost bug fixes	2016-07-06 17:45:22 +03:00
xXVevzZXx	3e77ce0f00	make arrays parseable by variables	2016-07-06 14:03:41 +02:00
xXVevzZXx	a430f7e94d	Add chat messages for Peace Phase, remove arrows from chests, disable crafting, fix dropped pumpkins and disable weapon enchantments	2016-07-06 13:45:31 +02:00
Thanos Paravantis	ab4174cfb9	Refactor Red Light, Green Light and Volley Pig	2016-07-06 12:04:04 +03:00
Thanos Paravantis	e0d133ab67	Broadcast a message when timer runs out	2016-07-06 11:10:57 +03:00
Thanos Paravantis	de74716abf	Refactor Treasure Digger and Volley Pig	2016-07-06 11:10:21 +03:00
Thanos Paravantis	ae60d05bbb	Refactor Wave Crush	2016-07-06 10:25:20 +03:00
Thanos Paravantis	b40346417a	Remove unused project files	2016-07-06 10:25:05 +03:00
LCastr0	67adb34311	Fixes for the WinRooms ... Removed Freedom Chests from the menu	2016-07-06 00:00:50 -03:00
AlexTheCoder	eccd7deedc	Fix merge errors and properly force disable particles by checking the game's settings	2016-07-05 17:25:01 -04:00
Thanos Paravantis	607b92984e	Fix hologram elevation speed	2016-07-05 23:18:29 +03:00
TadahTech	9f58e57a67	Bug fixes.	2016-07-05 14:35:37 -05:00
Thanos Paravantis	00c3584c0b	Make score holograms elevate faster	2016-07-05 21:14:13 +03:00
Thanos Paravantis	6a8c30d496	Refactor Mini OITQ and Water Horror	2016-07-05 21:13:49 +03:00
Thanos Paravantis	071f0c4de7	Refactor Ore Run and Rush Push	2016-07-05 19:39:30 +03:00
Thanos Paravantis	f36244efc6	Refactor Lava Run and Milk a Cow	2016-07-05 19:27:59 +03:00
Thanos Paravantis	108031acf1	Refactor Kangaroo Jump and King of the Ladder	2016-07-05 18:53:53 +03:00
Thanos Paravantis	f64234e4d1	Refactor Falling Blocks and Fast Food	2016-07-05 18:14:31 +03:00
Connor James	c0680b3511	Merge pull request #130 from Mineplex-LLC/bugfix/mopple-sprint ... Numerous Bug fixes	2016-07-05 10:01:58 -05:00
Thanos Paravantis	ba02c94e08	Refactor Dogs Vs Cats and Egg Smash	2016-07-05 17:00:38 +03:00
Thanos Paravantis	5d01bc2863	Refactor Deadly TNT and Diamond Hunt	2016-07-05 16:30:51 +03:00
Thanos Paravantis	fe89a0f094	Refactor Cloud Fall and Color Change	2016-07-05 16:17:19 +03:00
Thanos Paravantis	361e857bc7	Refactor Build Race and Chicken Shooting	2016-07-05 15:54:43 +03:00
Thanos Paravantis	3f13c5f518	Refactor Block Lobbers and Bouncing Block	2016-07-05 14:52:25 +03:00
Thanos Paravantis	4789f640b2	Refactor Anvil Dance and Arrow Rampage challenges	2016-07-05 13:57:05 +03:00
Thanos Paravantis	ce3117ba4b	Fix anvils staying on map after challenge end	2016-07-05 13:03:42 +03:00
Thanos Paravantis	9f45c0a622	Use offset2d instead of offset	2016-07-05 13:03:02 +03:00
Thanos Paravantis	9cec81ee34	Define border after challenge is started. ... Previously, the border was defined in the challenge constructor, as a result the boundaries were not set correctly. That's because the map center on each challenge is defined in the constructor, and since the super one is called before the challenge constructor, the map center which defines part of the border was not correct.	2016-07-05 12:35:27 +03:00
Thanos Paravantis	dd55d96ccf	Delay glass removal when obsidian is far away ... On Lava Run, when obsidian is generated far away from the last created obsidian block, a delay of 1 second will be added to the total delay until the platform is removed, because normally glass is removed very quick.	2016-07-05 12:32:44 +03:00
Sam	295711d626	PC-632 ... Fixes an issue where going under the map in Wither Assault would cause you to have negative speed and not be able to move	2016-07-04 20:31:59 +01:00
Thanos Paravantis	d393ffcc51	Update debug commands for Sr.Mods	2016-07-04 22:06:01 +03:00
Thanos Paravantis	4397784f35	Add new challenge completion effect	2016-07-04 22:05:34 +03:00
TadahTech	06feb615a9	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-07-04 04:18:01 -05:00
Sam	5644589b10	PC-541 ... Covers all possible eventualities of redstone ore and glowing redstone ore	2016-07-03 20:57:58 +01:00
Sam	e96f7f1217	PC-508 ... Fixes a hit box issue with Rocket Slimes	2016-07-03 15:58:54 +01:00
Sam	bdc049efe1	PC-508 ... Fixed an NPE with Inferno	2016-07-03 15:58:19 +01:00
Sam	26361eaee0	PC-508 ... Fixes certain abilities in Team SSM that could be used to damage/knockback other team members	2016-07-02 13:38:22 +01:00
Sam	8d8824446d	PC-519 ... Fixes an issue where grenades would not do damage after you die.	2016-07-02 12:12:15 +01:00
AlexTheCoder	5e994e37da	Fix Monster Maze jumping mechanics (Fixes PC-711 and PC-634)	2016-07-01 16:37:03 -05:00
Thanos Paravantis	e2663d6448	Move spawn related methods to challenge classes	2016-07-01 17:18:03 +03:00
Thanos Paravantis	6fdbda0ed0	Refactor Dogs Vs Cats challenge	2016-07-01 17:04:06 +03:00
Thanos Paravantis	8101fced7b	Detect correct volley pig block and fix its spawn	2016-07-01 13:58:21 +03:00
Thanos Paravantis	568cbb2672	Prevent infinite spawn search loops by /mark cmd	2016-07-01 12:32:31 +03:00
Thanos Paravantis	7379b2069b	Make volley pig map size and spawns dynamic	2016-07-01 12:31:41 +03:00
Thanos Paravantis	baca63dcae	Merge branch 'develop' into thanos-mineware	2016-07-01 11:43:56 +03:00
samczsun	f6d882fcb4	Disallow placing throwing tnt	2016-06-30 21:12:12 -05:00
samczsun	c442376ccc	Oops	2016-06-30 22:04:34 -04:00
AlexTheCoder	005189c2d4	Edit kit items in OITQ to fix bow instant charge glitch (Fixes PC-203)	2016-06-30 17:41:09 -05:00
AlexTheCoder	b0303a8870	Create new equations for Protection Enchantment functionality to make it work properly (Further fix for PC-311)	2016-06-30 17:41:09 -05:00
AlexTheCoder	37e50df948	Make kits ensure association with players using them (Fixes PC-588)	2016-06-30 17:41:09 -05:00
AlexTheCoder	36bb0b9ae8	Force player visibility to refresh in games over a steady rate (Fixes PC-497)	2016-06-30 17:41:09 -05:00
samczsun	3e1c44bfa3	UHC improvements ... Lots of hacky NMS stuff. Ask me if you're confused Basically, decorate the world async Keep spawn chunks loaded Make sure view distance is capped so no chunks are genned on teleport Add regeneration and resistance on spawn to prevent damage Set health objective score manually Teleport player two times to ensure no block glitching Disable kicking and NCP while teleporting	2016-06-30 17:15:01 -05:00
xGamingDudex	6d9e84b817	Merge branch 'develop' of ... ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/F.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java	2016-06-30 23:08:31 +02:00
xGamingDudex	03511a7234	Updated values ... Updated teleport mav world value to fit new version of the map. Split themes of multiple words to new lines. Fixed bug where 16+ long lines on scoreboard would get random colors. Seem to have forgotten to include the MavWorldManager earlier... ups.	2016-06-30 22:56:26 +02:00
Sam	40124b2cdd	Updated changed method name (getThrower) ... In the ProjectileData class GetThrower was changed to getThrower, this fixes that in any of my classes	2016-06-30 17:19:53 +01:00
Sam	69bd4006d4	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint	2016-06-30 17:14:38 +01:00
Thanos Paravantis	e25a6e4327	Reset leap data when needed (death/quit/game end)	2016-06-30 05:18:39 -05:00
Thanos Paravantis	5c60819179	Prevent NPE on player interact event	2016-06-30 05:18:39 -05:00
xGamingDudex	f9208b67ef	Added schematic support for ground in MB. ... Also fixed an NPE and moved a constructor to protected.	2016-06-29 15:19:46 +02:00
xXVevzZXx	880ac6b88f	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/general-bugfixes	2016-06-29 06:21:18 +02:00
xGamingDudex	32ee27d9ee	Small bugfixes with QA ... Never re-show reviewed builds in review-server. Toggle debug messages in review-server. Fixed minor bugs with QA	2016-06-29 03:49:53 +02:00
xGamingDudex	9d8eb1f044	ArcadeManager doing .zip check, but not acting upon it	2016-06-29 03:46:58 +02:00
Thanos Paravantis	04cb0fb0b0	Use updated ProjectileUser method names	2016-06-28 23:09:52 +03:00
Thanos Paravantis	4436ba0710	Merge branch 'develop' into thanos-mineware	2016-06-28 23:05:11 +03:00
Thanos Paravantis	c5c08562c3	Merge branch 'master' into thanos-mineware	2016-06-28 23:01:42 +03:00
Thanos Paravantis	42ebb95db1	Fix NPE on zombie infection	2016-06-28 21:57:32 +03:00
Thanos Paravantis	973666a42f	Improve challenge selection system ... - Game will no longer end unexpectedly, when all challenges are played. - Challenges are now marked correctly as played.	2016-06-28 21:57:17 +03:00
Thanos Paravantis	5e9f16424c	Add shouldDie method, update zombie wrapper name	2016-06-28 20:38:32 +03:00
Thanos Paravantis	43f375fd86	Reset team data on team challenges	2016-06-28 20:37:26 +03:00
Thanos Paravantis	eea980b354	Apply smoother knockback on volley pig	2016-06-28 18:41:50 +03:00
Thanos Paravantis	c5367d4510	Remove double plants entire from spawn locations	2016-06-28 12:15:49 +03:00
Thanos Paravantis	cf434b92de	Modify punch the pig description	2016-06-28 11:47:47 +03:00
Thanos Paravantis	dc250d4bf2	Store locations after game start (fix NPE)	2016-06-28 11:47:25 +03:00
Thanos Paravantis	7218dc710f	Retrieve scoreboard data only when possible	2016-06-28 11:46:38 +03:00
xGamingDudex	8ad63ef7ea	Tweaked some code to better fitt schematics.	2016-06-28 06:29:44 +02:00
xGamingDudex	cd5555c3f9	Fixed invis entities after pasting blocks + removed debug code	2016-06-28 04:03:40 +02:00
AlexTheCoder	beeddfedd4	Force the ball to drop if the carrier is AFK	2016-06-27 21:07:44 -04:00
xGamingDudex	a69101bef3	Cleaned out some debug messages and added some java-docs.	2016-06-28 01:35:37 +02:00
xGamingDudex	65e05b9d8c	Small polish on Mavericks Master Builders	2016-06-28 01:13:34 +02:00
AlexTheCoder	5b32eb4815	Update to Kit Progression system	2016-06-27 18:47:15 -04:00
AlexTheCoder	119931ac71	Remove unneeded Data Loc	2016-06-27 18:33:01 -04:00
AlexTheCoder	ab315627ad	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game	2016-06-27 17:45:36 -04:00
xGamingDudex	d6672c44f4	Finalized the hub module and finished local testing ... Cleaned up some source. Applied some small updates. Finished local testing.	2016-06-27 00:34:17 +02:00
Keir Nellyer	dbf0bf35b4	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-26 23:00:19 +01:00
Keir Nellyer	90df695624	Merge branches 'feature/report-v2' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-26 00:18:07 +01:00
xXVevzZXx	c966620808	Change resourcepack links	2016-06-25 19:52:22 +02:00
xXVevzZXx	fbd9b17ba0	fix playeringametime being 0	2016-06-25 12:35:59 -05:00
xXVevzZXx	8d4f5f0f93	Modularize Minestrike and add Strike Games	2016-06-25 19:11:08 +02:00
Thanos Paravantis	a714144159	Implement new challenge selection system ... The new challenge selection system stores only one instance of each challenge, instead of creating new ones when the next challenge is selected. In addition to that, challenge data is now reset every time the challenge ends to be able to reuse the same resources. In a future commit, I might as well only generate the spawnpoints once in an attempt to make things as quick as possible. The new system may have some bugs, since it's not fully tested with QA yet.	2016-06-25 13:19:09 +03:00
Thanos Paravantis	bc229c44aa	Apply small changes to Zombie Infection	2016-06-25 11:56:55 +03:00
xXVevzZXx	7a55b131d4	Add SmasgDom, Smash Glags, Tiny Smash, Smash Sheep, Sky Smash, Changing Kits and OP Sheep	2016-06-25 09:11:42 +02:00
xXVevzZXx	b34d652617	Add Lucky Bridges, CookieFight and OP MB	2016-06-25 06:35:08 +02:00
LCastr0	d75abe3aea	Persistence fixes	2016-06-25 00:36:00 -03:00
LCastr0	83f4b25887	Testing persistence fixes	2016-06-25 00:33:36 -03:00
xXVevzZXx	285d94a2ca	Fill hotbar editor with glass panes	2016-06-25 04:48:59 +02:00
Keir Nellyer	323d865b57	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 ... # Conflicts: # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2016-06-24 18:13:51 +01:00
TadahTech	0cda8ab7a3	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-06-24 04:11:59 -05:00
TadahTech	8fbb06ae3d	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 ... # Conflicts: # Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2016-06-24 04:11:38 -05:00
cnr	14542d7dac	Close open UIs except for Champions kits	2016-06-24 04:10:08 -05:00
cnr	c40e07695c	Only close open UIs when choosing SSM kits	2016-06-24 04:06:28 -05:00
Shaun Bennett	560abc933c	Replace underscores with spaces in booster group	2016-06-24 03:16:42 -05:00
cnr	b58ff8c066	Add YouTube and Twitter buttons to UI	2016-06-24 01:30:10 -05:00
Shaun Bennett	fd843b88cb	Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java # Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java # Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java	2016-06-23 23:02:26 -07:00
Shaun Bennett	a9f291338f	Amplifiers GM Candidate	2016-06-23 22:49:12 -07:00
TadahTech	eeaf9fa49a	Fix chat in arcade	2016-06-23 23:24:50 -05:00
cnr	3433e0e3bc	Merge branch 'project-cosmetics' into develop	2016-06-23 18:42:47 -05:00
xXVevzZXx	e09df7ccfd	fix chests being opened by specs	2016-06-23 16:46:54 -05:00
xXVevzZXx	399ab5c363	fix supply chest protection, absorbtion effect, tnt and level bugs	2016-06-23 16:46:45 -05:00
Sam	f8080d2663	PC-574 ... Another fix for the minestrike vanish problem, this one fixes staff being assigned teams on join.	2016-06-23 22:40:15 +01:00
LCastr0	c1b7be6363	Fix merge problems	2016-06-23 16:33:20 -03:00
LCastr0	7749314e64	Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics	2016-06-23 16:11:49 -03:00
LCastr0	a441727e09	Freedom update: ... Freedom chests Freedom Aura Shock and Awe Leap of Freedom Price of Freedom Uncle Sam Morph Freedom Mount Uncle Sam Hat Persistence update: Items will still be enabled after player leaves the server	2016-06-23 16:09:31 -03:00
Shaun Bennett	1ea680cd20	Return to an invisible armor stand name	2016-06-22 21:01:37 -07:00
Shaun Bennett	bcf82ad513	Remove debug messages	2016-06-22 21:00:50 -07:00
Shaun Bennett	761e550d6c	Add shards to announcement message	2016-06-22 20:55:27 -07:00
Shaun Bennett	621d72f541	Fix merge issues, update lore text	2016-06-22 20:51:58 -07:00
Shaun Bennett	249a5c70aa	Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final ... # Conflicts: # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2016-06-22 20:35:40 -07:00
Keir Nellyer	addbd4dd88	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-23 01:21:12 +01:00
Keir Nellyer	a795ee3d0f	Fix feature initialisation code	2016-06-23 01:18:16 +01:00
Keir Nellyer	09a74e3772	Work on pushing chat snapshots to db	2016-06-23 00:38:24 +01:00
AlexTheCoder	56205a2505	Change scoring behavior to increase accuracy, increase power of right click throw, solve players becoming stuck in webs and border, solve ball becoming stuck outside border, perform other small gameplay tweaks	2016-06-22 18:25:32 -04:00
Thanos Paravantis	4e9ea23db8	Fix spawn facing, separate scoreboard functions	2016-06-22 21:47:39 +03:00
Shaun Bennett	e855a866c7	Fix more thanks and booster occurrences	2016-06-22 08:58:27 -07:00
xGamingDudex	318c137aba	Moved mavericks repository resources to core, merging review and game	2016-06-22 17:08:34 +02:00
TadahTech	d9c5e6323a	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-06-22 00:36:23 -05:00
TadahTech	4d31867e98	PC Party updates.	2016-06-22 00:35:57 -05:00
samczsun	d739df8623	UHC is faster now	2016-06-21 22:21:27 -05:00
Sam	0131850fc3	SSM fixes	2016-06-21 20:41:53 +01:00
TadahTech	a49e815765	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2	2016-06-20 16:40:33 -05:00
TadahTech	2211cf4dec	Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 ... # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2016-06-20 16:37:07 -05:00
Shaun Bennett	73183af9bf	Fixing podium npc bug	2016-06-20 00:45:57 -05:00
Shaun Bennett	afc636b7c5	Fix amplifier reward message	2016-06-19 20:16:33 -05:00
Shaun Bennett	bb8d94f38a	Fix a lot more Booster cases	2016-06-19 19:48:17 -05:00
Shaun Bennett	63b7648608	Amplifier rename, move podium backwards	2016-06-19 19:05:04 -05:00
Sam	a830b5b388	Removal of debug message and compilation error	2016-06-19 17:12:58 +01:00
Sam	e8b8a3cd66	PC-504 ... Fixes an issue where if players in SSM destroyed all of the spawn point locations, players would not be handled correctly	2016-06-19 17:10:22 +01:00
TadahTech	d572635e99	Fix spelling mistake	2016-06-19 02:19:33 -05:00
TadahTech	5316dfe0c6	Remove Spammy "Loaded default kit message". ... Fixed SSM kits not closing the GUI when the central item is clicked. Fixed Smash Crystals being carried over into the next game.	2016-06-19 02:09:17 -05:00
xXVevzZXx	95649a5f14	adjust amount of gems as win reward	2016-06-18 20:48:55 -05:00
Thanos Paravantis	cac0169827	Add last player to a random team	2016-06-18 23:51:51 +03:00
Thanos Paravantis	4c31e79e20	Allow team challenges with odd amount of players ... May apply more changes or improvements.	2016-06-18 23:18:11 +03:00
Shaun Bennett	a8e67eda88	Rename tip message PC-566	2016-06-18 14:45:39 -05:00
Shaun Bennett	2f0a559441	Add reload command, change podium to lime dye, change tip message	2016-06-18 14:41:32 -05:00
Shaun Bennett	690c6160b9	Green Armor	2016-06-18 14:27:53 -05:00
Thanos Paravantis	0b5e409ab8	Make /lose available for all to use on QA testing	2016-06-18 21:02:54 +03:00
Thanos Paravantis	fc50c90301	Update chicken attack ... - Remove unnecessary clone() method. - Change chat message when chicken attack is triggered. - Rename customizeChicken to setupChicken method. - Use Math.random() instead of UtilMath.random.nextDouble()*100. - Add hologram that displays "Chicken Minion" above every chicken. - Increase look at player radius to 4. - Use generic List instead of ArrayList.	2016-06-18 21:01:46 +03:00
Thanos Paravantis	0368500ad7	Replace QuickChangeBlockAt with resetBlock method	2016-06-18 20:56:59 +03:00
Thanos Paravantis	bccce7593f	Update second Lava Run to patch obsidian bugs	2016-06-18 20:56:33 +03:00
Sam	d167f93486	PC-507 ... Fixes an issue where Blaze's "Firefly" and "Phoenix" abilities did no damage or knockback.	2016-06-18 15:33:39 +01:00
Keir Nellyer	f34c65111b	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-18 00:48:00 +01:00
Sam	c19af4e1c5	PC-505 ... Fixed an issue where players could hit team members with Bouncy Bacon and get the health bonus from it.	2016-06-18 00:04:03 +01:00
Sam	09957c203b	PC-506 ... Fixes an issue where the creeper's passive in SSM would activate when they took starvation damage.	2016-06-17 22:24:46 +01:00
Shaun Bennett	4e3062f413	Swap Cosmetic and Booster interface slot	2016-06-17 15:23:53 -05:00
Sam	35b00679e0	PC-516 ... When out of leaps in dragon escape there is no longer the "You can now use Leap" message.	2016-06-17 18:08:37 +01:00
xGamingDudex	d6afe986ea	Update and mavericks-review-hub plugin [stand alone] ... Added NBT Utils Added Format util for color Fixed bounding box calculations in UtilBlock Improved getPlugin in UtilServer Added BuildDataCylinder Added Particle support for saving builds Added Debug command to BuildMavericks Changed some backend DB stuff for saving builds Added mavericks-review-hub plugin: *	2016-06-17 14:14:39 +02:00
Sam	cbca7e9f7e	PC-540 ... Fixed unneeded messages	2016-06-17 12:06:56 +01:00
Sam	63c2f5c855	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint	2016-06-17 12:06:17 +01:00
TadahTech	d16f83af00	Attempt to fix duplicate messages bug. I cannot reproduce in testing.	2016-06-16 21:12:17 -05:00
cnr	16f6d75dea	Revert kit name changes ... We can change this back whenever we've migrated to the new name in mssql	2016-06-16 20:36:33 -05:00
TadahTech	3dc93e5c8f	Fix rare GUI reported bug.	2016-06-16 19:46:31 -05:00
TadahTech	2e0965a064	Fix Infestor kit ... Fix rare occurrence of players getting a GUI they shouldn't (reported)	2016-06-16 19:45:36 -05:00
TadahTech	e28d411ee4	Fix evolution not progression. ... Fixed incorrect description in Gladiators Reformatted kits in Bridges	2016-06-16 18:39:37 -05:00
Sam	a20ae6b58d	PC-540 ... Fixes an issue where players could lose water blocks in Speed builders.	2016-06-17 00:31:32 +01:00
Sam	79085c1ecf	PC-541 ... Fixes an issue where glowing redstone ore would not be counted if the expected block was redstone ore.	2016-06-17 00:26:24 +01:00
Sam	3f62dd49ef	Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint	2016-06-16 23:40:19 +01:00
TadahTech	5ac6249684	Fix Bridges Kits not getting their items. ... Fix Kits breaking at Level 5	2016-06-16 15:34:23 -05:00
Shaun Bennett	ea551182b6	Make booster gui smaller	2016-06-16 15:29:05 -05:00
Sam	ce23a94f3f	PC-550 ... Fixes an issue where players would be able to interact with blocks on other people's islands in Speed Builders	2016-06-16 12:25:21 +01:00
Sam	1d3e12dfb6	PC-574 ... Fixes an issue where staff in vanish would be placed in the game after each round.	2016-06-16 12:10:39 +01:00
Sam	c3a18813ee	PC-555 ... Fixes an issue where vanished players would show up in the "Give Co-Host" and "Remove player" menus in MPS.	2016-06-16 11:39:51 +01:00
Sam	9e75cc6224	Fixes incorrect item in OITQ ... Players should now get the stone sword that is intended with the leaper kit, assuming it was some merge or pushing error.	2016-06-16 11:12:16 +01:00
Thanos Paravantis	ce7bb82d67	Update blockBreakEffect and replace old methods	2016-06-16 12:48:28 +03:00
Thanos Paravantis	49fa3377fc	Update Lava Run challenge ... This update includes bug fixes and improvements for Lava Run. - Fixed obsidian staying in the map after the challenge has ended. - Obsidian block now appears after the challenge has started, so players cannot spot it before the challenge starts. - Added block break particle when the obsidian changes position. - Players can no longer be damaged from the lava (damage is now disabled on all challenges when they end). - Minor performance update.	2016-06-16 12:37:31 +03:00
TadahTech	e7d76e2ef4	Hot fixes.	2016-06-16 03:56:32 -05:00
samczsun	d6d8d288ca	Prevent TNT duping in Bridges. Fixes PC-132	2016-06-15 22:10:43 -04:00
Shaun Bennett	cbfbd6fe1c	Booster GUI update	2016-06-15 17:40:20 -05:00
TadahTech	27afd3d96c	Kit progression update	2016-06-15 15:54:53 -05:00
Thanos Paravantis	e5cec9c976	Change min players on Treasure Digger back to 4	2016-06-14 14:44:43 +03:00
Thanos Paravantis	47a4e5d9a9	Make chickens attack with more accuracy	2016-06-14 14:41:56 +03:00
Shaun Bennett	aa785ed3d5	Code clean-up and documentation	2016-06-12 21:18:11 -05:00
TadahTech	22e22ff508	Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 ... # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/party/Party.java # Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2016-06-12 00:42:22 -05:00
xXVevzZXx	bf4de4471a	fix permanent item removal and battle items in inventory	2016-06-11 17:33:12 +02:00
xXVevzZXx	bc77605dcd	make crafted weapons in SG unbreakable	2016-06-11 16:43:56 +02:00
xXVevzZXx	a461e9cf1c	fix inventory being editable while voting phase	2016-06-11 16:27:31 +02:00
xXVevzZXx	75e36d0e08	fix pickup of dropped tnt	2016-06-11 16:13:07 +02:00
xXVevzZXx	5e551a2ba6	fix waller only being able to make two walls	2016-06-11 15:49:31 +02:00
Keir Nellyer	6bc8039dbd	Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2	2016-06-11 14:04:43 +01:00
Keir Nellyer	197acee4ae	Implement server weighting	2016-06-11 13:47:45 +01:00
Shaun Bennett	2421fd1cfe	Update booster page, proper booster rewards	2016-06-10 19:40:27 -05:00
xXVevzZXx	73d8aec494	fix breakable Armor in Wizards	2016-06-11 00:21:04 +02:00
xXVevzZXx	b13b354ce7	Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/general-bugfixes ... # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java	2016-06-11 00:20:38 +02:00
Shaun Bennett	e6920b4549	Work on booster gui, display wait time	2016-06-10 17:17:43 -05:00
Shaun Bennett	ceb4de8b35	Load booster groups for arcade	2016-06-10 16:33:53 -05:00
Thanos Paravantis	6d380c6c6f	Rename building champion to Speedy Builders	2016-06-10 22:44:13 +03:00
cnr	06cee364fc	Merge branch 'mopple' into develop	2016-06-10 14:12:07 -05:00
Sam	739fcdc649	Fixes the problem where players could not fire a bow in OITQ ... Users with high latency were not able to fire bows.	2016-06-10 16:29:27 +01:00
Thanos Paravantis	f47d2abd87	Hide map quicker from players	2016-06-10 16:44:51 +03:00
Thanos Paravantis	f277e5ca9a	Fix diamond hunt map creation	2016-06-10 16:44:11 +03:00
Thanos Paravantis	1ed27e72a6	Use resetBlock method to set air blocks	2016-06-10 16:08:06 +03:00
Thanos Paravantis	5b021d3ecc	Update all challenges to use new set block method	2016-06-10 16:03:33 +03:00
Thanos Paravantis	00f14131df	Update treasure digger to use new set block method and apply minor improvements on chicken attack	2016-06-10 15:11:48 +03:00
Thanos Paravantis	47c4e57ce4	Fix unexpected challenge end	2016-06-10 13:33:20 +03:00
Thanos Paravantis	52ce640391	Merge branch 'develop' into thanos-mineware	2016-06-10 12:15:54 +03:00
Thanos Paravantis	b08abf9a73	Apply zombie infection improvements (wip)	2016-06-10 12:13:01 +03:00
Shaun Bennett	08e47b4b1b	Enable tips in bonus gui	2016-06-09 22:41:41 -05:00
Shaun Bennett	8bf26dbc11	Use a better podium for NPC, reenable boosters	2016-06-09 18:57:48 -05:00
Shaun Bennett	35e1c2af65	Use rewardCoinsLater for giving shards	2016-06-09 18:19:22 -05:00