Mineplex2018-withcommit

JarvisBigBalls/Mineplex2018-withcommit

Author	SHA1	Message	Date
Shaun Bennett	addde570bb	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-11-07 14:53:35 -05:00
Shaun Bennett	bf97cf5d77	Remove debug code	2015-11-07 13:53:34 -05:00
libraryaddict	79d0466355	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2015-11-07 21:36:36 +13:00
libraryaddict	627ce08113	Add info on note particle	2015-11-07 21:35:26 +13:00
Shaun Bennett	e1f56a5d5a	Merge remote-tracking branch 'origin/master'	2015-11-07 01:10:34 -05:00
Shaun Bennett	ec7600a4a2	Giveaway tweaks	2015-11-07 01:10:27 -05:00
Cheese	c922c3248c	disabled trick or treat	2015-11-07 13:36:16 +11:00
Cheese	f4bf685e96	removed halloween hub removed titan giveaway and pumpkins	2015-11-07 13:20:29 +11:00
Shaun Bennett	4add7449eb	Merge remote-tracking branch 'origin/master'	2015-11-06 21:15:45 -05:00
Shaun Bennett	3893617d58	Logitech Giveaway (still needs testing)	2015-11-06 21:15:37 -05:00
AlexTheCoder	fafc92606c	Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java	2015-11-06 18:43:11 -05:00
Keir	783bec75db	Fix for some preferences not applying correctly.	2015-11-06 23:04:51 +00:00
libraryaddict	d3d448ccfe	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8	2015-11-07 04:47:37 +13:00
libraryaddict	cc0f12f6c8	Fix player interactions packets not working properly on armorstand and when clicking block behind entity	2015-11-07 04:45:02 +13:00
NewGarbo	b835823230	Preferences page changes to free up space, as the current preferences layout is completely full. Removed unnecessary Spawn variable in Clans.java, as it was causing a warning and warnings look ugly.	2015-11-06 13:19:02 +00:00
NewGarbo	7675b00999	Dominance event. Shaun will have to call the new events once he's done with Dominance.	2015-11-06 07:11:06 +00:00
Sarah	56966d690f	Fixing random Creepers, adding giant is under Attack message, adding start message, small fixes	2015-11-05 22:56:07 +01:00
AlexTheCoder	87d7ff8a8f	- Synced up expire times for proximity weapons	2015-11-05 02:21:36 -05:00
AlexTheCoder	61653347c7	- Fixed proximity weapons not being able to detonate	2015-11-05 02:11:20 -05:00
AlexTheCoder	9c49ab0408	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-05 01:23:40 -05:00
NewGarbo	1375623625	Added alpha messages.	2015-11-04 17:03:52 +00:00
libraryaddict	77125b3a24	Don't re-set scoreboard lines	2015-11-05 01:10:08 +13:00
libraryaddict	31b4fbec15	Fix a null	2015-11-05 00:49:26 +13:00
libraryaddict	0352e52a68	Tentative beginnings of wider scoreboards	2015-11-05 00:42:45 +13:00
NewGarbo	3ff044fddb	Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips	2015-11-04 11:32:06 +00:00
libraryaddict	a0676b7bcf	Fix tnt in SG being usable during DM invul	2015-11-04 21:44:10 +13:00
Sarah	ee7006a3de	Giant makes Sounds, lifted up Giant, randomize Minions by time played, changing spawn Items.	2015-11-04 07:17:15 +01:00
libraryaddict	21d10e4bec	Fix typo	2015-11-04 19:15:06 +13:00
libraryaddict	b3f86ba638	Fixing bugs	2015-11-04 18:34:22 +13:00
NewGarbo	8033b40011	made math in GearPage a tiny bit more understandable	2015-11-04 01:27:33 +00:00
NewGarbo	ed1e394a84	removed an unused type and a bit more cleanup; getting ready to clean up GearPage, which is... shudders	2015-11-04 00:09:46 +00:00
NewGarbo	a455804dce	some Tutorial code cleanup	2015-11-04 00:07:32 +00:00
NewGarbo	4bf92ce0a0	gah why isn't this working?! git is annoying!!!	2015-11-03 23:47:35 +00:00
NewGarbo	ecd3b0ef76	removed a multiple Mineplex.Core.Common import thingy in the core project or something. i dunno, it was causing errors so i fixed it, yay!	2015-11-03 22:06:23 +00:00
NewGarbo	b7bf4765c4	DANG YOU WILLIAM	2015-11-03 22:05:17 +00:00
NewGarbo	7f03ca0936	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta Conflicts: Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java	2015-11-03 21:19:17 +00:00
NewGarbo	78ab895a14	Added heart particles to the GiantsBroadsword healing feature, also added some strong sounds. Made it so that players using the broadsword's effects cannot attack anything. Added small smoke particle to UtilParticle. Added a burnout feature to the WindBlade, disallowing players to speed around on the ground for ever. Moved the Lapis Lazuli block particles from infront of the player, to the feet of the player when using the AlligatorsTooth, as per SamitoD's request. Removed some debug messages thrown around the code.	2015-11-03 19:49:14 +00:00
libraryaddict	c25b1969de	More progress	2015-11-04 04:00:53 +13:00
libraryaddict	f66c85d5b0	When clearing or getting items from player inventory, get it from player crafting as well	2015-11-03 18:57:41 +13:00
AlexTheCoder	c518221f6b	- Fix Merge Error	2015-11-02 22:14:48 -05:00
AlexTheCoder	c41d01e213	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-bugfixes Conflicts: Plugins/Mineplex.StaffServer/.classpath	2015-11-02 22:09:18 -05:00
AlexTheCoder	89c9f19c69	- Fixed MPS Whitelist	2015-11-02 22:08:02 -05:00
libraryaddict	975ad9e6ea	Update to master	2015-11-03 15:05:56 +13:00
libraryaddict	3de906ab19	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java	2015-11-03 14:57:25 +13:00
libraryaddict	7496ed763a	Fix wither and dead bodies bug	2015-11-03 14:41:34 +13:00
Shaun Bennett	4794cc6924	Clans Gui	2015-11-02 20:41:08 -05:00
libraryaddict	3f66e11b3d	Add fence to non-full-solids	2015-11-03 12:39:13 +13:00
Jonathan Williams	8838ea75e4	Some code cleanup for tasks.	2015-11-02 09:37:11 -06:00
Jonathan Williams	3b38302429	Optimized TaskManager task locks and calls. Run all player messages on the main thread.	2015-11-02 09:35:35 -06:00
NewGarbo	27c6ef4e9d	Success! Finished all events woohoo!	2015-11-02 10:16:13 +00:00
NewGarbo	0bc8413430	test	2015-11-02 10:11:54 +00:00
NewGarbo	74c0eac141	Bunch of fixes and new stuff: Cleaned up code everywhere. Added a ClanCreatedEvent (accidentally formatted ClansDataAccessLayer ooooops) Removed the tutorialManager access from ClansManager, as it is unneeded now. Added Lapis Lazuli block particles to Alligator's Tooth (Sammy's request.) Fixed NPE in TutorialTask#onFinish(Player);	2015-11-02 08:04:38 +00:00
Jonathan Williams	55d028d706	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-01 22:09:58 -06:00
Jonathan Williams	3a0b8d75a2	Added new support member.	2015-11-01 22:09:50 -06:00
Jonathan Williams	18bdcbec62	Fixed some NPEs with TrickDialogue Added debug messages for Tricks. Cleanup of monster targets in HubManager.	2015-11-01 22:09:36 -06:00
Shaun Bennett	9cf62cfe7f	Don't use player skulls until caching is setup and working properly	2015-11-01 22:58:22 -05:00
Cheese	cdb0fcae75	modified hideme a little :)	2015-11-02 14:37:12 +11:00
Sarah	da6bf27c77	Staff with a higher rank can see lower rank and same ranked vanished staff.	2015-11-02 04:32:07 +01:00
Jonathan Williams	cb96124feb	Added extra cleanup for FriendsGUI and AddFriendPage	2015-11-01 17:42:23 -06:00
Sarah	ebf5ad4a4e	adding boss Mobs and changing win mechanic.	2015-11-01 22:32:25 +01:00
Sarah	7c42dc3483	fixinf random Freaks.	2015-11-01 18:33:19 +01:00
NewGarbo	baa4a744fb	Fixed a whole load of bugs: Fixed the next button occasionally displaying a blank page in the gear GUI. Fixed not being able to click the back button when selecting a bow in the gear GUI. Made selectable items glowing in the gear GUI.	2015-10-31 23:11:12 +00:00
Jonathan Williams	5c2ade8270	Updated staff list.	2015-10-31 14:55:34 -05:00
Jonathan Williams	f16eee220d	Removed Debug messages.	2015-10-31 14:55:18 -05:00
Jonathan Williams	073321fb14	Refactored TrickOrTreat Stuff.	2015-10-31 14:45:42 -05:00
Sarah	71bb03420b	Adding sounds to spells, removing kits, notifications to Titles, Mob sizes/standardization, nuke -> Zombie Smash, 10 secs delay to Zombie Smash, Firebomb improvements and Freaks.	2015-10-31 18:37:19 +01:00
Cheese	92a2c2ebaa	fixed npe in kit npc creation	2015-10-31 19:55:58 +11:00
Cheese	b8b260bca1	fixed expire time on projectiles	2015-10-31 19:01:49 +11:00
Cheese	c463b80fe0	fixed insta-expire	2015-10-31 19:00:28 +11:00
Cheese	5d58c56c27	fixed kit bug	2015-10-31 18:31:13 +11:00
Cheese	3636fdfba0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-31 18:23:06 +11:00
Cheese	225f067ab3	fixed some projectile stuff	2015-10-31 18:22:53 +11:00
Shaun Bennett	cd15df0238	Merge remote-tracking branch 'origin/master'	2015-10-31 02:13:24 -04:00
Shaun Bennett	71e49854db	Add halloween hats	2015-10-31 02:10:15 -04:00
Mysticate	1a6617bce1	Changes.	2015-10-31 02:05:03 -04:00
libraryaddict	519dceb72e	Doublejumping downwards is a no no	2015-10-31 19:02:58 +13:00
Cheese	23be8aa1dd	removed unncessary stuff balanced rewards	2015-10-31 14:33:41 +11:00
Cheese	a92a52f009	Merge branch 'Myst_TRICKORTREAT'	2015-10-31 14:27:06 +11:00
Mysticate	4884032a1a	Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3	2015-10-30 23:24:32 -04:00
Cheese	b9d7c80f80	cow kit	2015-10-31 13:25:57 +11:00
NewGarbo	878f7aeafd	Potentially fixed the problem where your NPC skeleton sticks around after you log in, and attacks you.	2015-10-30 22:48:40 +00:00
NewGarbo	f54da4ee78	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-10-30 22:20:33 +00:00
NewGarbo	396ce75087	Bug fixes/Additions: - Being able to kill clan mates/create mode players who combat log. - Added a notice that the player was killed, when a player logs back in after being killed when combat logging. - Fixed Fall Damage making a player unsafe in safe territories. - Fixed Alligator's Tooth damage. - Fixed Alligator's Tooth working in lava. - Added a UtilFile to Mineplex.Core.Common, for all stuff files!	2015-10-30 22:13:19 +00:00
libraryaddict	301b8012ff	Final commit	2015-10-30 19:30:17 +13:00
libraryaddict	ea1e4b79f7	Changes from SnD branch	2015-10-30 19:25:02 +13:00
libraryaddict	ed18588a6a	Fix missing code and stuff	2015-10-30 19:12:04 +13:00
libraryaddict	da0a99d662	Spawn facing fixes	2015-10-30 16:06:47 +13:00
libraryaddict	50edf557ab	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8	2015-10-30 15:57:36 +13:00
libraryaddict	388aa1611c	Update craftbukkit, add new vegetate head, fix maze, fix SG and UHC borders, fix gust, modify kits to use new vegetate	2015-10-30 15:44:37 +13:00
Cheese	c4e93180fa	Merge branch 'master' into smash-champs-balance	2015-10-30 13:00:30 +11:00
AlexTheCoder	0be51d5629	- Even more bugfixes	2015-10-29 16:48:51 -04:00
Shaun Bennett	401350e85d	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-10-29 13:14:33 -04:00
Shaun Bennett	364d8b05af	Fix war invasion	2015-10-29 13:14:27 -04:00
Shaun Bennett	e2947718fe	Remove code that wasnt meant to be commited	2015-10-29 13:10:10 -04:00
NewGarbo	66a4b148e1	Fixed put on armour task being inconsistent.	2015-10-29 13:44:11 +00:00
NewGarbo	0c5e34ad84	Finished the tutorial changes that I wanted to add. Added a few more events for shop stuff, to make the code a bit cleaner. Might continue the idea of more events in Clans. Added an optional argument to QAResetCommand which will allow you to reset to a specific task number. Quite useful when testing tasks that are one of the last ones!	2015-10-29 12:56:00 +00:00
libraryaddict	7fca42b0e0	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java	2015-10-29 21:41:59 +13:00
libraryaddict	14df456b3d	Progres	2015-10-29 21:39:38 +13:00
NewGarbo	d0bfb2e2e9	Finishing touches with UtilItem. Lots of changes to tutorials, and added a PlayerEnterTerritory event.	2015-10-29 08:35:24 +00:00
Aaron Brock	acc915c34e	Re-added my TurfForts patch, as well as fixed the "Game Changes to build time while spectating so you don't get your blocks" glitch.	2015-10-29 01:12:12 -04:00
Aaron Brock	8dd80094b4	Fixed a little boolean derp that stopped people from breaking blocks. Signed-off-by: Aaron Brock <TheMineBench@gmail.com> (cherry picked from commit `1f0accd`)	2015-10-28 23:26:18 -04:00
Aaron Brock	9df297fc11	Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist. Signed-off-by: Aaron Brock <TheMineBench@gmail.com> (cherry picked from commit `76e4dc6`)	2015-10-28 23:25:56 -04:00
Mysticate	a707006558	Work. Deemed unsuitable due to an issue with the paintballs flying wide.	2015-10-28 21:42:41 -04:00
NewGarbo	a063da4cae	Renamed some things to comply with standards. Also moved some of the bit flags around, and moved them into seperate parts.	2015-10-28 22:55:10 +00:00
NewGarbo	afadd61431	Added a few new item categories into UtilItem, and added the bitmasks to the materials belonging to said categories. Changed from using the 32bit int data type, to using the 64bit long data type, this should give me a bit more free space for more categories to put items in to, as I already ran out of space using a regular int.	2015-10-28 22:47:30 +00:00
AlexTheCoder	cf26541461	- More Bugfixes	2015-10-28 18:16:52 -04:00
NewGarbo	cffcf245e9	UtilItem.java overhaul, complete item attribute system added.	2015-10-28 22:14:08 +00:00
Mysticate	d0e49280a4	Added a sniper kit! :D	2015-10-28 13:34:03 -04:00
NewGarbo	8ce50d1fc7	Done most of the tutorial ghost mechanic, and also switched from using task's indexes for referencing the tasks, instead using names now. This should allow for much more flexibility, and adding/removing tasks will not be such a pain! (Having to switch all of the task indexes around for any code referencing tasks.)	2015-10-28 17:08:48 +00:00
NewGarbo	765fb4ce11	Created the ClansShopItem enumeration, which has every item that can be sold in shops, with their buy and sell prices. All shops have been updated to reference this enumeration to get the prices for items. Made it so that players that are "weaklings" will be stripped of their weakling title, if the sell value of their inventory is greater than 2000 Gold. This mechanic uses the ClansShopItem enumeration, and is the main reason why it was created, since all prices were normally hardcoded into the shop page classes.	2015-10-28 07:34:13 +00:00
libraryaddict	0486404c4b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2015-10-28 14:38:34 +13:00
libraryaddict	5ec932d1ca	Fixing bugs	2015-10-28 14:36:48 +13:00
NewGarbo	8d5b6e6d90	Don't show weakling particles above players that are not alive. Also removed debug message.	2015-10-27 10:18:14 +00:00
NewGarbo	1938bcf799	Fixed the "weakling" status not updating correctly.	2015-10-27 10:01:33 +00:00
NewGarbo	b4897e91fa	Fixed bug where an NPC's hologram would still stick around after the NPC is killed, since death and regular removal over time are handled separately.	2015-10-27 08:56:41 +00:00
NewGarbo	234799e55e	Fixed infinite recursion in AlligatorsTooth. Fixed a NullPointer exception in the Gear UI when you don't select an item type and you continue on. Made a way to visually see the task you are on in the getting started tutorial, by making it dark cyan.	2015-10-27 08:32:21 +00:00
AlexTheCoder	0ab3213b7b	- Fixed permanent dwarf toss bug - Fixed skills being active while player is editing class	2015-10-27 01:38:41 -04:00
AlexTheCoder	9d6a361602	- Fixed emerald jump for Relyh	2015-10-26 23:42:52 -04:00
NewGarbo	c30ece9d8b	Improved SafeLog to use the title system and holograms! Also removed knockback for NPCS	2015-10-26 19:48:20 +00:00
Sarah	e3049fd22e	performance update for Minions and reducing nuke particles.	2015-10-26 17:54:45 +01:00
NewGarbo	da058881f8	Some bug fixes in the gear ui, added the shine to rare item factory (I FORGOT TO COMMIT THE CLASS LAST COMMIT ARGH) added alligators tooth particles & sound added wind blade power feature	2015-10-26 15:37:44 +00:00
NewGarbo	eb350a79c3	Added RareItemFactory (will add shine when lib helps me with it) and other small little fixes. Added a way to specify the amount of items in a single line in GearPage, so that armor and weapon type listings look more aesthetically pleasing.	2015-10-26 12:21:33 +00:00
AlexTheCoder	7770fa0284	- Added system to ensure banned players are removed from the network	2015-10-26 07:09:01 -04:00
NewGarbo	63406e9ce1	Moved GearManager back to it's original package, and stopped using it in GearPage. Removed commented code from GearCommand, as the gui is now finished and it is not needed anymore.	2015-10-26 07:57:00 +00:00
NewGarbo	7eab57c5dd	As per Chiss' request, made the gear ui go to next page when you choose an attribute.	2015-10-26 07:49:03 +00:00
AlexTheCoder	f5b4f28848	- Fixed achievements - Various balance patches/audio changes	2015-10-26 00:25:33 -04:00
NewGarbo	cc2aae9726	Final touches to the gear gui, making it now completely finished. hooray!	2015-10-26 00:08:03 +00:00
fooify	cbe147d705	typo fix in legendary aura description	2015-10-25 12:32:27 -07:00
fooify	7024084ce3	Update achievement kit reference text	2015-10-25 11:29:06 -07:00
fooify	f0e4416644	Fixed tnt bug (SG)	2015-10-25 10:52:56 -07:00
fooify	bb806d6260	Merge remote-tracking branch 'origin/master' into foo	2015-10-25 10:10:06 -07:00
NewGarbo	327c129f46	Fixed the rest of merge conflicts (? [I hope {shaun help me ;-;}])	2015-10-25 12:28:12 +00:00
AlexTheCoder	57da1d195a	- Resolved randomly using java 8 in this one plugin	2015-10-24 20:50:47 -04:00
AlexTheCoder	08fd1b5790	- Fixed MPS Whitelist for usernames with non-lowercase characters	2015-10-24 20:49:09 -04:00
Shaun Bennett	556d5adcd9	Change /global to /globalpacket (fixes conflict with announcement command)	2015-10-24 17:46:25 -04:00
NewGarbo	1e4b3442fa	Conflicts: Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java	2015-10-24 20:45:39 +01:00
NewGarbo	63bc492f2c	Almost completely finished the /gear ui, still a few bugs and missing features, but it's getting there. Logging off now, don't want to lose code.	2015-10-24 20:36:53 +01:00
Shaun Bennett	0d56eefd44	Titan/Rewards adjustments	2015-10-24 13:40:17 -04:00
NewGarbo	089c4420b2	Lots of progress towards a /gear gui, not finished though. commiting now because I'm leaving and don't want to lose the code.	2015-10-24 07:16:13 +01:00
libraryaddict	e3c824c512	Fix minor skywars error	2015-10-24 13:32:55 +13:00
libraryaddict	4d2b359aad	Fix wolf cub strike	2015-10-24 08:41:10 +13:00
libraryaddict	43cd0f86a9	Fix players unable to break blocks at spawn	2015-10-24 08:40:57 +13:00
libraryaddict	7f025ad029	Fix CustomExplosion	2015-10-24 08:40:43 +13:00
Shaun Bennett	40afcaf26b	Global Packet Commands	2015-10-23 15:07:53 -04:00
NewGarbo	0c29805756	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta	2015-10-23 19:27:13 +01:00
NewGarbo	11b836da8b	Added Join/Quit messages. Removed periods from attribute descriptions. Fixed legendary item lore having incorrect formatting.	2015-10-23 16:59:30 +01:00
libraryaddict	2eb8b3e234	Catch PacketHandler exceptions	2015-10-24 02:17:19 +13:00
libraryaddict	5ec4203fd9	More changes to disguise	2015-10-24 01:36:42 +13:00
libraryaddict	a450b828b7	Fix disguises custom name	2015-10-24 00:48:54 +13:00
libraryaddict	de9678a20f	Modify Craftbukkit	2015-10-23 21:28:01 +13:00
AlexTheCoder	d51b23849a	- Fixed bugs and added features	2015-10-23 03:24:01 -04:00
AlexTheCoder	f7dab72e8c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-10-23 03:23:35 -04:00
Cheese	af208da953	Merge branch 'alex-testrank'	2015-10-23 18:10:59 +11:00
Cheese	d9d0254e46	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-23 17:30:59 +11:00
Shaun Bennett	fd1638a572	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-10-23 02:17:57 -04:00
Shaun Bennett	5944b734be	More war fixes - still needs tweaking	2015-10-23 02:17:47 -04:00
Shaun Bennett	e3e7dd4694	Titan rewards from mythical chests	2015-10-23 02:08:31 -04:00
NewGarbo	4c381d41fe	Fixed second tutorial task misspelling, and added the first tutorial, which is /c help, as I completely forgot about it in the first place.	2015-10-23 06:10:09 +01:00
NewGarbo	18d998fc04	Fixed colors cutting out in the middle of the message in task information, moar fireworks!	2015-10-23 05:56:53 +01:00
AlexTheCoder	9ceb4eee94	- Take will and QA's suggestion about making the gameplay modifier a proper feature	2015-10-23 00:48:31 -04:00
AlexTheCoder	1512d87f9e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank	2015-10-23 00:28:32 -04:00
AlexTheCoder	91ddcdb149	- Testing setup	2015-10-23 00:25:38 -04:00
AlexTheCoder	5a94e33d5e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-10-23 00:24:52 -04:00
libraryaddict	aedf04b3e3	Fix renaming pet not opening proper window	2015-10-23 09:26:21 +13:00
libraryaddict	53aa1b655b	Remove custom formatter because it trims too short, don't need to commit it. Cleaned up CustomTagFix	2015-10-23 09:20:24 +13:00
libraryaddict	8cde506a2c	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8	2015-10-23 05:25:36 +13:00
libraryaddict	ddb8d592f8	Remove all is1_8 checks	2015-10-22 18:37:14 +13:00
NewGarbo	825b519890	Finalization of tutorials, made my code more consistent, and renamed any parts of code that referred to tasks as parts refer to them as "tasks." Removed unused imports, and other code cleanup stuff. Renamed EndTutorialCommand to SkipTutorialCommand as the actual command is "/skiptutorial" instaed of "/endtutorial"	2015-10-21 21:50:46 +01:00
William Burns	e6bec41ca8	Fix "code too large" error.	2015-10-21 20:29:44 +01:00
NewGarbo	bf406493e3	Fixed tutorial tasks that rely on territory entrances not working because formatting...	2015-10-21 20:14:35 +01:00
libraryaddict	3cd803cda0	Update patch files and cb	2015-10-22 08:07:10 +13:00
Shaun Bennett	00a689ea03	War work	2015-10-21 14:48:27 -04:00
NewGarbo	112f34c77f	Fixed NullPointerException when clicking outside of inventory GUI.	2015-10-21 08:10:53 +01:00
libraryaddict	5c010af8c4	Add updatehealth packet	2015-10-21 19:56:52 +13:00
Jonathan Williams	c719d693dd	Added delete benefit call for repository. Added failsafe in case inventory update didn't apply Removed 43k benefit.	2015-10-21 01:15:09 -05:00
NewGarbo	a5df50de92	On going map tutorials started and finished.	2015-10-21 06:55:06 +01:00
NewGarbo	eb203131a7	Fixed import errors since I moved the getting started tutorial to a different package.	2015-10-21 06:19:23 +01:00
NewGarbo	bd5266251b	Finalized the getting started tutorial. Added the last 5 tasks, and added a nice big ending (fireworks) Added an ugly fix to the QAResetCommand, which I am really unhappy about, but can't find any other way about it. It's only a test command though, so it'll be removed in the final releases.	2015-10-21 06:17:18 +01:00
NewGarbo	c6cf47ee4e	I did not mean to commit that one line... Oh gosh that would have been bad... (addCoins onEnterTerritory). Was just for testing shops.	2015-10-21 04:36:47 +01:00
NewGarbo	227e9f7bfc	Pretty much finished with tutorials, not fully though, but I am simply pushing so I don't lose all my work. CHANGES---- Added a little hack to ScoreboardElement.java that allows for a single element to clear the currently existing scoreboard lines output, or modify it. Coded in the functionality of 7 tasks, will do the rest now.	2015-10-21 04:27:14 +01:00
Cheese	768ef4eb97	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-21 13:00:16 +11:00
Sarah	6860f013d0	Fixing some spelling typos chat filtering and the scoreboard.	2015-10-20 19:23:58 +02:00
libraryaddict	8ceb69513a	Update patches and cb.jar	2015-10-21 05:05:27 +13:00
libraryaddict	07f032a5d2	Fix wither pet making sounds, fixed worldtime.	2015-10-21 04:22:31 +13:00
libraryaddict	ddd674e371	Packets implement Pcaket right	2015-10-20 17:19:46 +13:00
NewGarbo	a2278297de	Created the base for tutorials, and created the getting started tutorial. Have all the commands and most of the functionality in here now, but still need to do the scoreboard and some tweaking.	2015-10-19 17:16:48 +01:00
libraryaddict	b3caf7c2d4	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8	2015-10-20 04:38:12 +13:00
libraryaddict	5d671d3300	Fix borders	2015-10-20 04:37:42 +13:00
Jonathan Williams	3ef33bd9c5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-19 01:32:23 -05:00
Jonathan Williams	5e307da15a	Fix for inventory failure.	2015-10-19 01:32:12 -05:00
Sarah	b7b99687c8	decreasing nuke animation	2015-10-19 01:34:48 +02:00
Shaun Bennett	6d7f15cd6d	Fix hub time after light flicker	2015-10-18 18:52:16 -04:00
Cheese	c7a5be9570	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-19 09:03:46 +11:00
libraryaddict	55f97ef984	More fixes, along with a fix for Block Hunt	2015-10-19 06:21:16 +13:00
Shaun Bennett	0a3f942575	Fix compile issue	2015-10-18 12:42:56 -04:00
Shaun Bennett	177e482dbc	Merge remote-tracking branch 'origin/clans-beta' into clans-beta Conflicts: Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java	2015-10-18 12:35:31 -04:00
AlexTheCoder	0094fa31f0	- Accidentally edited classpath - oops	2015-10-18 06:17:44 -04:00
AlexTheCoder	547c8ca726	- Bugfixes	2015-10-18 06:14:54 -04:00
Jonathan Williams	9e7629b1fe	Added 43k player chest benefit. Updated MOTD.	2015-10-18 00:21:01 -05:00
AlexTheCoder	12319169a9	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/RadarData.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilRadar.java	2015-10-18 00:54:18 -04:00
Shaun Bennett	523378aae7	Clans War updates	2015-10-17 22:55:21 -04:00
Cheese	d901cfa12c	buildies can join full	2015-10-18 10:54:34 +11:00
libraryaddict	6f91827d57	Vector to Vector3f, updated Maze to 1.8	2015-10-18 12:40:01 +13:00
libraryaddict	02bf202d52	1.8 update	2015-10-17 13:21:03 +13:00
Shaun Bennett	589c05f8c0	Merge remote-tracking branch 'origin/clans-beta' into clans-beta # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java	2015-10-16 14:25:31 -04:00
libraryaddict	3a0781b3c7	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java	2015-10-17 00:10:32 +13:00
libraryaddict	14a524cf54	Stuff	2015-10-17 00:08:30 +13:00
Cheese	41b6fdc74e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-16 21:47:35 +11:00
Cheese	32489388c6	removed bug fix that caused SG break	2015-10-16 21:47:22 +11:00
libraryaddict	f71cb80bd0	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java	2015-10-16 22:26:07 +13:00
Jonathan Williams	172bd65c57	Monster Maze motd.	2015-10-16 04:22:54 -05:00
libraryaddict	70c76d976f	More changes	2015-10-16 22:10:13 +13:00
Jonathan Williams	62b209fede	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-16 01:57:30 -05:00
Jonathan Williams	d00fa856f3	Fixed Pets so they work correctly. Also fixed legend benefits. Fixed chest pet rewards.	2015-10-16 01:57:19 -05:00
Cheese	016cea15f3	Merge branch 'Myst_HALLOWEEN'	2015-10-16 15:01:59 +11:00
Mysticate	b8eb924ffa	Fixed timing out. Yay. I'm done. G'night	2015-10-16 00:00:08 -04:00
Cheese	577c67cacd	Merge branch 'Myst_HALLOWEEN'	2015-10-16 14:18:35 +11:00
Mysticate	b15b81a7e2	Spacing	2015-10-15 23:09:23 -04:00
Mysticate	f0a22d5c36	Fixed hammer throw	2015-10-15 23:02:51 -04:00
Mysticate	f0e0d41c42	Fixed two things.	2015-10-15 22:23:49 -04:00
Cheese	6cc33fd6c6	Merge branch 'thanos-bug-fixes'	2015-10-16 12:53:43 +11:00
Mysticate	41511dce7b	Merge remote-tracking branch 'origin/master' into monster-maze	2015-10-15 21:19:24 -04:00
libraryaddict	3dda9352e7	Progress	2015-10-16 13:32:23 +13:00
Sarah	cd4b3054fa	Fixing "Armor Stand"	2015-10-15 20:25:35 +02:00
libraryaddict	4205dc6c25	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java	2015-10-15 12:34:34 +13:00
Sarah	6f55a60de0	removing more 2 word words, adding not killable message at Firebomb.	2015-10-14 22:41:34 +02:00
Ty Sayers	98ec99cffc	Fix bug where players could retrieve teleport items out of the Travel Hub shop and later use them in their inventory. Implement a safe zone region of one chunk around all administrative clans (excluding Wilderness), to prevent players from building/claiming next to admin clans. Disable pistons throughout the server to prevent griefing. Fix left-over merge issue with donation manager.	2015-10-14 16:06:34 -04:00
Cheese	1c52bd4f64	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-14 14:34:51 +11:00
Cheese	86bad0be30	mods can check other players skills	2015-10-14 14:34:30 +11:00
Shaun Bennett	0df637b80a	Run punishBot in main server thread	2015-10-13 22:56:14 -04:00
Shaun Bennett	f683e932ae	Clans merge fixes	2015-10-13 22:24:15 -04:00
Mysticate	a049d7666f	Merge remote-tracking branch 'origin/master' into monster-maze	2015-10-13 22:14:19 -04:00
Cheese	45cd2a38e1	admins can botspam	2015-10-14 11:55:59 +11:00
Shaun Bennett	88709f85b6	Merge with master	2015-10-13 18:13:01 -04:00
Shaun Bennett	cb0d82174e	Apply botspam to chat messages as well	2015-10-13 17:41:25 -04:00
Sarah	d925ae7f8d	adding animation for Speed Boost, fixing mob item dropping.	2015-10-13 15:53:48 +02:00
Cheese	1842eae7f0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-13 23:22:58 +11:00
Cheese	d105ea5d7e	botspam addition	2015-10-13 23:19:48 +11:00
libraryaddict	58a86c5abb	That's the easy stuff done..	2015-10-13 19:49:15 +13:00
AlexTheCoder	e1d8b25e91	- Fix misc champs bugs	2015-10-13 01:24:57 -04:00
Jonathan Williams	a292fdb3c5	Added failsafe for ServerMonitor.	2015-10-12 22:26:24 -05:00
Cheese	f5b80c941c	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-13 11:58:27 +11:00
Cheese	e8388437b6	botspam now checks for chat as well	2015-10-13 11:58:14 +11:00
Cheese	3e5ac58ae9	helpers!	2015-10-13 11:23:00 +11:00
Cheese	37639a413c	fixed skill stuff	2015-10-13 11:22:10 +11:00
AlexTheCoder	0bd026f506	- Fixed merge issues	2015-10-12 18:04:35 -04:00
AlexTheCoder	f497eab633	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf Conflicts: Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2015-10-12 17:54:11 -04:00
Mysticate	be96842de5	Ultra	2015-10-12 17:02:34 -04:00
Sarah	9010b8bfe9	removing some unneeded stuff and fixing tag overlaying	2015-10-12 22:01:23 +02:00
libraryaddict	cef52368a3	Hologram fixes	2015-10-13 08:59:13 +13:00
Sarah	e969e1adeb	pushing for Lib to check because of Holograms, also editing spell names, removing 2 word words and editing the sniper spell.	2015-10-12 21:25:59 +02:00
Sarah	ff7ebeed57	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-10-12 20:23:34 +02:00
AlexTheCoder	dceba51060	- Fix random blockhunt bug with mounts and infestor	2015-10-12 03:09:40 -04:00
AlexTheCoder	bbb863ba92	- Merge conflict patch	2015-10-12 02:36:10 -04:00
Cheese	2b9a66e7b2	more ssm update	2015-10-12 16:32:23 +11:00
Shaun Bennett	1aecc9505c	Add region to titan, new MOTD	2015-10-12 01:30:31 -04:00
AlexTheCoder	bef942f6da	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank	2015-10-12 00:47:56 -04:00
Cheese	6a173073a4	added flag to projectiles work on cow kit	2015-10-12 14:39:14 +11:00
libraryaddict	dab258dcdd	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Libraries/BungeeCord.jar Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java	2015-10-12 16:22:52 +13:00
Mysticate	3eb36a6581	Prevented farming	2015-10-11 22:43:21 -04:00
Mysticate	2abf3edad4	Made items for titanic cosmetics dyes.	2015-10-11 22:29:26 -04:00
Mysticate	b6d573a4d5	Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN	2015-10-11 22:25:25 -04:00
Mysticate	7a4ccdf680	Bug fixes	2015-10-11 22:17:34 -04:00
Mysticate	dda65b4c77	Fixed tnt exploding lobbies	2015-10-11 19:56:36 -04:00
Mysticate	20dd9c683b	Merge remote-tracking branch 'origin/master' into monster-maze Conflicts: Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java Changed the scoreboard a bit, added it to MPS.	2015-10-11 10:52:45 -04:00
Mysticate	606937d227	Fixed flashbang glitch	2015-10-11 09:42:36 -04:00
Jonathan Williams	e6485a9009	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-10 23:02:36 -06:00
Jonathan Williams	5866e0cce6	Reducing max connections for the DBPool to 3.	2015-10-10 23:02:08 -06:00
Cheese	f23bf18928	adhering to mysts OCD	2015-10-11 14:50:57 +11:00
Cheese	f3e2f3c145	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-11 14:48:17 +11:00
Cheese	cb9e8f8e0b	pumpkin smasher achievement	2015-10-11 14:48:02 +11:00
Mysticate	435e74225a	Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN	2015-10-10 23:35:33 -04:00
Mysticate	83d1e011fc	Changes.	2015-10-10 23:33:54 -04:00
Jonathan Williams	998d5f6984	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-10 21:25:29 -06:00
Jonathan Williams	061a7b7c73	Fixed Pet FK errors. Added SUPPORT to acceptable updateRank command.	2015-10-10 21:24:47 -06:00
Cheese	8b75664627	queued holiday transactions	2015-10-11 12:54:35 +11:00
Cheese	6860fa608a	titan placeholder perks art fixed pumpkin gem count	2015-10-11 11:26:09 +11:00
Mysticate	72d943f51b	Restored skills to pre-eula ultra	2015-10-10 16:20:28 -04:00
Mysticate	5a8e500ec0	Fixed another thing	2015-10-10 16:15:10 -04:00
Mysticate	5e7ddb968e	Changes and bug fixes.	2015-10-10 15:54:18 -04:00
Sarah	65b0d68244	adding more mobs and hiding enemy mob name tags.	2015-10-10 16:56:21 +02:00
Cheese	da6b1316d3	removed pumpkins from MPS	2015-10-10 22:47:19 +11:00
Cheese	323842c693	fixed mods staying in flight	2015-10-10 19:36:38 +11:00
Cheese	6f14c75f70	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-10 19:28:26 +11:00
Cheese	6cf786eb8c	Merge branch 'Myst_HALLOWEEN'	2015-10-10 19:28:08 +11:00
Cheese	1026a2ae22	fixed explosions	2015-10-10 19:27:54 +11:00
Shaun Bennett	a242c6b592	Halloween Update finishes	2015-10-10 03:23:37 -04:00
Cheese	e9207acd7f	Merge branch 'alex-halloween'	2015-10-10 17:38:09 +11:00
Cheese	7bc3b4970b	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java	2015-10-10 17:34:17 +11:00
AlexTheCoder	67a1f4ce8d	Titan Giveaway: - Added Titan pumpkin animation Titan Perks (For later, Removed from Menu): - Added Kronos Particle	2015-10-10 02:31:52 -04:00
Mysticate	930cfa5cb8	DONE	2015-10-10 02:30:11 -04:00
Shaun Bennett	f1e9acbb58	Titan giveaway	2015-10-10 02:19:05 -04:00
Mysticate	245a42c8e0	animation is sexi	2015-10-10 02:13:04 -04:00
Mysticate	30a9196430	Done with animation.	2015-10-10 01:43:31 -04:00
Mysticate	9a7357e484	Work	2015-10-10 01:00:49 -04:00
AlexTheCoder	88b4ac96e5	- Achievement stuff	2015-10-09 23:15:19 -04:00
Shaun Bennett	36fabf93b6	Merge remote-tracking branch 'origin/master'	2015-10-09 23:14:13 -04:00
Shaun Bennett	bc7bf8a2e2	fixes/debug	2015-10-09 23:13:39 -04:00
Jonathan Williams	512e08af19	Removed all create table statements.	2015-10-09 21:02:35 -06:00
Mysticate	1127764cc3	Secsi	2015-10-09 22:44:49 -04:00
Mysticate	7851cb451a	Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java	2015-10-09 22:34:05 -04:00
Shaun Bennett	aa9fd1abf3	Titan giveaway work	2015-10-09 22:14:10 -04:00
Mysticate	90c685617d	Animation	2015-10-09 22:14:01 -04:00
Peter Miller	611fb88f15	Commented out unnecessary table creation statements (tables already exist in database and these statements are causing database lag under high player load).	2015-10-09 20:40:50 -04:00
Cheese	ed89f5f4cc	anim example for myst	2015-10-10 10:46:12 +11:00
Cheese	43f38c18ee	animation	2015-10-10 10:40:44 +11:00
Cheese	d99c64e45d	fixed merge error	2015-10-10 10:37:20 +11:00
Cheese	02c6eccfda	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex Conflicts: Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java	2015-10-10 10:36:42 +11:00
Cheese	7dbd9da582	dragon sale Bar	2015-10-10 10:35:48 +11:00
Shaun Bennett	ba36ff565d	Merge remote-tracking branch 'origin/master'	2015-10-09 18:23:55 -04:00
Shaun Bennett	97ef4a4252	Pushing titan giveaway stuff for laptop	2015-10-09 18:23:47 -04:00
Jonathan Williams	586cc6e3e0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-09 09:40:58 -06:00
Mysticate	ff1431b652	Fixed players glitching to chests before game starts.	2015-10-09 10:21:35 -04:00
xGamingDudex	ba171f95c6	Fixed UtilEnt.isGrounded for non-player entities. Updated UtilEnt.isGrounded(Entity) to only apply custom handling of players. Non-player entities now uses the default .isOnGround() check. Implemented to fix entities like minecart which applies custom is-on-ground checks.	2015-10-09 14:42:38 +02:00
Cheese	ff42e05a8d	Merge branch 'Myst_HALLOWEEN'	2015-10-09 14:20:58 +11:00
Cheese	99fd88473b	rank colors	2015-10-09 14:20:02 +11:00
Mysticate	fb4d08931c	Spider mount improvements.	2015-10-08 23:18:37 -04:00
Cheese	d9dd471db6	removed annoying debug	2015-10-09 14:04:12 +11:00
Cheese	c03c8163c5	fixed exploision stuff	2015-10-09 14:01:58 +11:00
Mysticate	90d0fcb36d	Merge branch 'Myst_HALLOWEEN' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_HALLOWEEN	2015-10-08 22:53:45 -04:00
Mysticate	598ea84e7a	Fixed explosions and cleaned up.	2015-10-08 22:52:57 -04:00
Cheese	d18353e592	Merge branch 'Myst_HALLOWEEN' of ssh://184.154.0.242:7999/min/Mineplex into Myst_HALLOWEEN Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java	2015-10-09 13:44:41 +11:00
Cheese	41678eaf35	fixed scoreboard bug	2015-10-09 13:42:37 +11:00
Mysticate	1011c36c43	Fixed lobby being destroyed.	2015-10-08 22:41:45 -04:00
Mysticate	96f14f4fda	Fixed kit item names.	2015-10-08 22:31:20 -04:00
Mysticate	3802d47a37	Made the thing bold.	2015-10-08 22:29:22 -04:00
Mysticate	082b16fe0d	Stuff and things to help make mounts be cool.	2015-10-08 22:28:07 -04:00
Cheese	54c76c9d9c	fixed text	2015-10-09 12:27:30 +11:00
Cheese	a234fbce1e	Merge branch 'Myst_HALLOWEEN'	2015-10-09 12:17:57 +11:00
Mysticate	ed31bf9886	Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN	2015-10-08 21:16:24 -04:00
Mysticate	9254ca9162	K reverted + fixed bug	2015-10-08 21:12:38 -04:00
Cheese	24568a40f3	Merge branch 'Myst_HALLOWEEN'	2015-10-09 12:05:24 +11:00
Cheese	483ab13c2b	workaround for error where accountid is never set	2015-10-09 12:04:35 +11:00
Cheese	17ba04348d	stats debug	2015-10-09 11:53:08 +11:00
Mysticate	84cbee4535	Fixed it again	2015-10-08 20:52:17 -04:00
Mysticate	145832b326	Fixed mounts bc chiss is bad	2015-10-08 20:50:39 -04:00
Cheese	21dc0dc962	Merge branch 'Myst_HALLOWEEN'	2015-10-09 11:47:20 +11:00
Cheese	ec5694737c	statsmanager debug rank fix	2015-10-09 11:44:12 +11:00
Mysticate	2cace7419f	Made Destructor sexi	2015-10-08 20:42:29 -04:00
Mysticate	92bab25a3f	Fixed Gust void stealing.	2015-10-08 20:38:33 -04:00
Mysticate	b8597d7161	Paintball stats.	2015-10-08 20:37:26 -04:00
Mysticate	cdb9741438	Changed the SG icon in hub, fixed EULA breaking thing in Class Shop	2015-10-08 20:36:16 -04:00
Mysticate	97d6f8fb42	Fixed placing walls in water.	2015-10-08 19:10:19 -04:00
Mysticate	8f826f6e83	Fixed blocks falling into floor in Build.	2015-10-08 19:04:51 -04:00
Mysticate	30e3c56635	Fixed ground issues in BUILD.	2015-10-08 18:58:30 -04:00
Mysticate	46bf963d44	Fixes not being able to reload dropped guns w/ 0 ammo.	2015-10-08 18:56:23 -04:00
Mysticate	979e68dcc7	Fixed the Minestrike multiple grenades bug.	2015-10-08 18:41:40 -04:00
Sarah	f8528c9cff	Fixing Nuke animation bugs.	2015-10-08 19:04:39 +02:00
Mysticate	ef62fb5adf	Made it so that when played on an MPS, HH won't give items. Yay!	2015-10-07 22:57:30 -04:00
Mysticate	8a8591ae7f	Merge branch 'master' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_HALLOWEEN Conflicts: Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java	2015-10-07 22:19:10 -04:00
Mysticate	668454f156	Fixed things	2015-10-07 22:10:57 -04:00
Mysticate	f2485854ef	Improved spider.	2015-10-07 22:06:57 -04:00
Mysticate	70f3ccf703	Fixed spider morph	2015-10-07 21:53:23 -04:00
Mysticate	e864e0867a	Adds mount spider and fixes a BH bug.	2015-10-07 21:47:10 -04:00
Cheese	3c437925f1	halloween prep	2015-10-08 12:36:00 +11:00
Cheese	191392825f	Merge branch 'Myst_EVO'	2015-10-08 12:07:21 +11:00
Cheese	f28d83cbd7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-08 12:05:51 +11:00
Cheese	c94184c5ae	reduced number of falling blocks in skywars by 80% added halloween horror mount	2015-10-08 12:04:28 +11:00
Mysticate	5378ece214	Fixed chicken being able to fly..	2015-10-06 21:09:53 -04:00
Mysticate	a0d0590777	Merge remote-tracking branch 'origin/master' into Myst_EVO	2015-10-06 21:04:49 -04:00
fooify	a177b0cd43	Merge remote-tracking branch 'origin/master' into foo	2015-10-06 16:45:01 -07:00
Shaun Bennett	8fb82507e1	Merge remote-tracking branch 'origin/master'	2015-10-06 12:24:34 -04:00
Shaun Bennett	9cb3f250e2	Remove streak record data until a better solution is done	2015-10-06 12:24:16 -04:00
Sarah	34a554584c	Making mob spawn rate dynamical, removing kill message, lowering kill animation, editing Scoreboard and changing Nuke animation.	2015-10-06 17:45:38 +02:00
Cheese	e2e2356b04	stuffs	2015-10-06 13:25:15 +11:00
Sarah	6e0e618e03	Finishing Achievements.	2015-10-06 03:20:25 +02:00
Mysticate	643f47763e	Improved consistency with the F5 message	2015-10-04 20:28:21 -04:00
Sarah	e5b69a85c2	Changing back from 2 disguises to one.	2015-10-05 02:27:37 +02:00
Mysticate	0de34c15ab	NO more endercrystal go boom boom yay	2015-10-04 20:23:41 -04:00
Thanos paravantis	9c1ba5f3d1	Changes on bomb error messages after QA recommendations.	2015-10-04 21:23:50 +03:00
Jonathan Williams	0eeea58a01	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-04 11:50:20 -05:00
Jonathan Williams	9f1c4653f4	Fix for Customer support item command with the removal of item categories.	2015-10-04 11:48:16 -05:00
alexmack929	6c73b1a5ac	Start moving i18n into master.	2015-10-04 15:24:58 +01:00
Thanos paravantis	c2518bc6c4	Some additional bug fixes were applied on the previous commit. Water damage by TNT on game lobbies is now patched.	2015-10-04 16:32:34 +03:00
Thanos paravantis	026c596de2	Minestrike bug fixes and minor changes - Added a right-click message tip when the player with a bomb tries to place by left clicking. - Changes in one of the tip messages while in game lobby. - Moltovs and Incendiaries were not triggered once thrown to the ground. - Players were able to extinguish grenade fire with a knife. - The bomb was able to be planted after a round was over. - On sniper rifles, scope was not removed if the match was ended.	2015-10-04 13:22:12 +03:00
Jonathan Williams	f9ea325da1	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-04 00:24:11 -05:00
Jonathan Williams	ba17404212	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-04 00:20:52 -05:00
Jonathan Williams	1830705692	Removed ItemCategories to reduce strain on the database with queries that are more complex than they need to be. Increased Firework recharge time.	2015-10-04 00:20:41 -05:00
Thanos paravantis	2504493ebc	Fixed four super paintball bugs. - Projectiles could paint wool in the waiting lobby. - When players fell in the void, they didn't got killed. - Players that were painted could take off their armor. - Players that were painted could logout and the skeleton would still stay there.	2015-10-04 00:34:00 +03:00
Mysticate	a7ab0cd723	ADDED MORE KITS I'M DONE HOORAY LOVE ME @CHISS	2015-10-02 22:43:29 -04:00
Mysticate	c9ff420a79	Now chooses a different maze every game.	2015-10-02 20:43:57 -04:00
Ty Sayers	17fbd42b9c	Fix bug where a players inventory was not properly updated after switching to SURVIVAL mode, causing CustomGear items to remain unhidden an JSON encoded.	2015-10-02 14:30:39 -04:00
Ty Sayers	a110cd6d9c	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-10-02 13:58:06 -04:00
Ty Sayers	661bba3714	Fix offensive skill exploit where players could swap hotbar slots quickly and keep their original offensive spell casting for a large damage and speed advantage (running and attacking). Fix bug edge-case where outgoing slot packets were being missed, causing players CustomGear items to improperly display encoded JSON data instead of a user-friendly item description.	2015-10-02 13:57:46 -04:00
Shaun Bennett	993c9783ec	Add Votifier Jar, display team stats for SG, SW, SSM	2015-10-02 13:15:02 -04:00
Shaun Bennett	9c38e8039e	Add clans to compiler	2015-10-01 22:59:42 -04:00
Shaun Bennett	5bce1b5f2e	Fix merge issues, fix observer command	2015-10-01 22:57:39 -04:00
Shaun Bennett	8911617a0c	Remove BungeeSigns again?	2015-10-01 14:01:36 -04:00
Mysticate	3f6490f14a	Gave health on safe pad <<<<<3	2015-10-01 10:47:37 -04:00
Jonathan Williams	bc84dc6817	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-10-01 07:39:17 -07:00
Jonathan Williams	631bd9cfa6	Removed sale notification. Removed queue create table query. Added try-catch for ServerMonitor to prevent stat storage from affecting normal operation.	2015-10-01 07:38:59 -07:00
Mysticate	a6d7cccbe5	Fixes	2015-09-30 22:31:03 -04:00
Mysticate	4a023c4644	Tweaks - I THINK I'M DONE HOORAY	2015-09-30 21:21:29 -04:00
Mysticate	05b735ba40	Fixed jump system	2015-09-30 20:28:35 -04:00
Mysticate	c39806a4e3	Kewl stuff. Yay	2015-09-30 20:01:51 -04:00
Mysticate	09ef2d73ae	Grammar <3	2015-09-30 19:45:29 -04:00
Shaun Bennett	b8cc967fb0	Merge remote-tracking branch 'origin/clans-beta' into clans-beta Conflicts: Plugins/.idea/compiler.xml Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java Plugins/Mineplex.Core/.classpath Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java Plugins/Mineplex.Hub/.classpath Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java	2015-09-30 19:32:33 -04:00
Mysticate	68c6ba595e	Visual enhancements.	2015-09-30 19:31:36 -04:00
Mysticate	d089ffeb30	Added a firework when a mob gets rekt	2015-09-30 18:48:45 -04:00
Mysticate	250e9cff13	Fixed a possible NPE	2015-09-30 18:43:52 -04:00
Mysticate	a25e2c575d	Peace of mind stuff.	2015-09-30 18:35:56 -04:00
libraryaddict	86cdd7a30e	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-10-01 04:39:26 +13:00
fooify	c3b2c10934	FINALLY FIXED THIS MONSTER MAZE BUG :D	2015-09-29 19:14:18 -07:00
Ty Sayers	d870ff6f11	Fix bug where Fissure could be exploited with Arctic Armour for 'water bending', allowing players to artificially create Water towers by bending temporary ice.	2015-09-29 18:47:24 -04:00
Ty Sayers	b4c9bfbb57	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear Conflicts: Plugins/.idea/compiler.xml Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java Plugins/Mineplex.Core/.classpath Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java Plugins/Mineplex.Hub/.classpath Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerNpcPage.java	2015-09-29 18:09:52 -04:00
Ty Sayers	ab1ac379a7	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-09-29 17:36:51 -04:00
Ty Sayers	bc7615a5c3	Fix Illusion bug causing the Illusion clone to not properly function and spawn inside Clan territories. Fix bug where Carrots and Potatoes purchased from the Produce shop could not be eaten. Fix bug with SQL query when adding new enemies and not initialized 'initiator' field with a proper value. Modify starting score values for clan wars to 0 instead of 20. Update CustomItem descriptions with bullet points instead of hyphens for more readable stats. Reword error messages associated with trusting non-allied clans to be more intuitive to players.	2015-09-29 17:36:42 -04:00
Shaun Bennett	f8ef46abde	Merge master code into clans	2015-09-28 21:41:05 -04:00
Mysticate	2d173a5be4	Fixed a jumper perk.	2015-09-28 21:03:58 -04:00
Shaun Bennett	14027b9780	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-09-28 21:03:00 -04:00
fooify	bcfd8fcec7	bug fixes: - fixed bugs - fixed more bugs - after that, more bugs were fixed	2015-09-28 17:54:56 -07:00
Shaun Bennett	437e62c7db	Fix priority for dupe fix	2015-09-28 20:44:57 -04:00
Shaun Bennett	8a9cc9ff14	Food Dupe Fix	2015-09-28 20:42:14 -04:00
Mysticate	00eecc0325	Fixes	2015-09-28 20:33:38 -04:00
fooify	3a10677b10	AI bug should be fixed, I need Mysticate to test though	2015-09-28 15:15:51 -07:00
Shaun Bennett	92436c8f9d	Merge pull request #60 in MIN/mineplex from alex-bugfixes to master * commit '8a94602aefc1e4ea3490da434f14205f99ba1d8e': Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text Made rank unlock lore colored based on rank required for item (QA Requested) Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for. Marked the Bunny Morph to reflect its no longer available status Fixed previous ownership not being transferred Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui	2015-09-27 22:39:50 -05:00
AlexTheCoder	5a5dbcfe67	- Assorted bugfixes	2015-09-27 23:36:51 -04:00
Mysticate	00a8cf769b	Swag	2015-09-27 14:55:37 -04:00
Mysticate	7e40d0d4bb	Lots of cool stuff	2015-09-27 12:10:52 -04:00
Mysticate	eea7ef8350	Swag	2015-09-27 02:11:28 -04:00
Mysticate	54eca7fa9e	Lots of work.	2015-09-26 23:18:05 -04:00
AlexTheCoder	cddc6674a5	- Fixed bug with Dwarf Toss	2015-09-26 19:22:17 -04:00
Jonathan Williams	eae894c879	Merge pull request #65 in MIN/mineplex from mrsomeone12_SmallFixes to master * commit '436f63860ecef028d23dae28ceb52e466e90270b': NBT overflow patch	2015-09-26 17:32:30 -05:00
Jonathan Williams	ee5934c7aa	Fix for punishments to match names exactly Fix for expiring ranks. Fix for EU Lobby count.	2015-09-26 18:31:37 -04:00
Jonathan Williams	1ad61a09e4	Should include the file with the change commit.	2015-09-26 18:30:45 -04:00
Jonathan Williams	0d8ef7fea3	Fixed lobby balancing technique. Removed random UUID for bungee redis database. Enabled bungee name in debug output for bungee rotator.	2015-09-26 18:25:29 -04:00
Mysticate	9350386361	Lots of things. :D	2015-09-26 15:08:43 -04:00
Sarah	c99851da37	finishing spells, kits and animations.	2015-09-26 14:31:17 +02:00
Mysticate	8e9a3e90a7	Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java	2015-09-26 00:00:46 -04:00
Mysticate	30d2281785	Lots of things	2015-09-25 23:59:31 -04:00
fooify	1e018cf74a	Improved Smasher	2015-09-25 20:21:06 -07:00
Mysticate	2de409c2f2	Made the mazes do things.	2015-09-25 20:14:46 -04:00
xGamingDudex	436f63860e	NBT overflow patch Patch for the NBT overflow exploit which allowed any player to overflow and drain the server for memory making it freeze and eventually crash.	2015-09-26 01:48:38 +02:00
Mysticate	a0ec656bc1	Fixed another tracker.	2015-09-25 12:49:21 -04:00
Mysticate	b2f1f7d2ae	Fixed the tracker for pilot.	2015-09-25 11:38:32 -04:00
AlexTheCoder	1cc503bd3b	- Added resupply points [requested]	2015-09-25 04:37:54 -04:00
AlexTheCoder	49908e7550	- Added game to hub text	2015-09-25 04:28:11 -04:00
AlexTheCoder	03d1d85388	- Testing improvements	2015-09-25 04:23:24 -04:00
AlexTheCoder	7c04e5608d	- Added new achievement 'Clutch' - Made new achievements needed for achievement skills	2015-09-25 04:17:20 -04:00
AlexTheCoder	218aa8c584	- Fixed all formatting	2015-09-25 03:52:34 -04:00
AlexTheCoder	f23ef8eea0	- Returned to temporary placeholder block system to prepare for 1.8 update	2015-09-25 03:41:29 -04:00
libraryaddict	88a48277c0	Flags, change to packets	2015-09-25 17:15:09 +12:00
AlexTheCoder	5f45e8c1d3	- Misc changes [increased game time, captures required]	2015-09-25 00:44:28 -04:00
libraryaddict	1394df03e0	For now, set all boss battles games to spider	2015-09-25 16:43:53 +12:00
AlexTheCoder	5b42d25bff	- Added achievement and stat stuff - Fixed banner bugs	2015-09-24 23:16:44 -04:00
Mysticate	e66d8765e7	Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze	2015-09-24 23:02:27 -04:00
Mysticate	60c4e5812a	Fixed trackers	2015-09-24 23:02:19 -04:00
fooify	69ed764483	Added another maze.	2015-09-24 19:55:43 -07:00
libraryaddict	e94eb056dc	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-09-25 14:09:18 +12:00
libraryaddict	2a77eda4fc	Spider boss code	2015-09-25 14:08:47 +12:00
libraryaddict	69517a3dcb	Refresh the name after custom stuff is done so it applies on disguises	2015-09-25 14:08:27 +12:00
libraryaddict	34d535f153	Fix custom tags, improve Packet handling	2015-09-25 14:07:51 +12:00
libraryaddict	fa30ba1e16	Fix a small issue with Future Disguises	2015-09-25 14:07:12 +12:00
libraryaddict	e8725b38ab	Colorize the messages for when a /game start fails	2015-09-25 14:06:35 +12:00
Mysticate	a9f20a573c	Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze	2015-09-24 21:10:31 -04:00
Mysticate	9a70d4997a	Fix	2015-09-24 21:10:12 -04:00
Mysticate	d9b6d8f0e3	Changes	2015-09-24 21:01:18 -04:00
AlexTheCoder	cd33bf8dd8	- Fixed updaterank and testrank scoreboard conflict	2015-09-24 11:47:50 -04:00
AlexTheCoder	a488bfab3e	- Rewritten testrank system - Multiple rank improvements for real-time use - Removed /updaterank from Jr.Dev	2015-09-24 11:44:45 -04:00
Mysticate	7445fda922	Made the thing a lot better. Yay! :D	2015-09-24 11:04:05 -04:00
fooify	4663aa3eaa	updated mazes	2015-09-24 07:29:48 -07:00
Mysticate	5de016c077	Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java	2015-09-23 23:46:21 -04:00
Mysticate	842da3d6fb	Tons of changes.	2015-09-23 23:44:10 -04:00
fooify	a301c87efc	workstuffchanges on monster maze	2015-09-23 19:23:21 -07:00
Christopher Jozsa	9a3ef895c9	Merge pull request #38 in MIN/mineplex from mrsomeone12_SmallFixes to master * commit '633cbdabe279a9ec1a57d96d6585f58a6d3754df': player.isOnGround() is controlled by packets from the player, meaning players can easily fake being on the ground resulting in infinite double jumps. player.getFallDisance() is also reset when isOnGround() returns true, meaning we'll need to manually check if the player is on the ground.	2015-09-23 19:37:48 -05:00
Sarah	0a42ab7aee	Adding spell system, spells, and more kits.	2015-09-23 22:04:45 +02:00
Mysticate	125b823a65	Fixed achievement arcade page size.	2015-09-23 15:43:14 -04:00
Mysticate	71408fabd2	One thing.	2015-09-23 15:24:34 -04:00
Mysticate	81e780d400	Merge branch 'monster-maze' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into monster-maze Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MMMazes.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/Maze.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/monstermaze/MonsterMaze.java	2015-09-23 15:23:08 -04:00
Mysticate	84331901d4	Added achievements and final polish.	2015-09-23 15:18:44 -04:00
AlexTheCoder	d5ef15cd6d	- Trying to fix errors	2015-09-23 14:00:19 -04:00
AlexTheCoder	09e44d3372	- Fixed version stuff	2015-09-23 13:47:49 -04:00
AlexTheCoder	3ee6c5c7c8	- Fix Merge Error	2015-09-23 13:25:41 -04:00
AlexTheCoder	c709980db3	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2015-09-23 13:08:25 -04:00
AlexTheCoder	512714219b	- Visual edits	2015-09-23 13:04:30 -04:00
fooify	0ad91a6b0b	more changes! :D	2015-09-23 07:10:48 -07:00
Shaun Bennett	2b902c5193	Add created by, enabled by, and disabled by to botspam module	2015-09-23 00:25:39 -04:00
Ty Sayers	3a8fd18d2e	Disable the ability to craft Fishing Rods. Fix bug where players could use the Blink or Flash skills to bypass borders on negative coordinate sides of the map and die to border control. Fix bug where players could open the enchantment table GUI and enchant items when shift clicking without an item. Fix bug where players couldn't place blocks on top of Anvils. Fix NPE bug with players clicking on Anvils while not holding an item. Fix bug where the '/c home' command cooldown was reset on a players death, allowing for abuse. Fix duplication bug where BlockToss could be exploited inside claims by throwing valuable blocks into water blocks. Fix bug where players could lose items to NPC shop inventories using inventory drag skills to drag items across open slots. Cap the member size of a clan to 20 and maximum available claim count to 8.	2015-09-22 15:28:06 -05:00
Shaun Bennett	3ae043e7d8	Merge remote-tracking branch 'origin/master'	2015-09-22 01:38:52 -04:00
Shaun Bennett	cf618abd4e	BotSpam Module	2015-09-22 01:38:45 -04:00
Cheese	4519f2dda1	Merge branch 'EventGameUpdates'	2015-09-22 14:59:17 +10:00
Shaun Bennett	86420132ce	Clan name->uuid changes	2015-09-21 20:05:16 -04:00
fooify	1f84907309	more changes to monstermaze	2015-09-20 07:40:24 -07:00
AlexTheCoder	05f47be864	- Some fixes	2015-09-19 16:38:07 -04:00
AlexTheCoder	3a1acb9f37	- Code Cleanup - Transitioning to banners fully - Preparation to remove banner bugs	2015-09-19 00:41:23 -04:00
libraryaddict	452e8a9694	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-09-19 12:11:21 +12:00
AlexTheCoder	52a5c63166	Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-09-18 20:08:43 -04:00
AlexTheCoder	d4b8cb253c	- Edited messages as per owner request	2015-09-18 20:08:22 -04:00
libraryaddict	8015f5428d	Flags stuff	2015-09-19 08:36:23 +12:00
fooify	0581474a16	lots of work on Monster Maze	2015-09-18 08:25:11 -07:00
Shaun Bennett	901dad2f8a	Add vote3 to bonusmanager	2015-09-17 22:31:18 -04:00
Shaun Bennett	6a4c9061fa	Supply drop, loot, small fixes	2015-09-17 22:19:45 -04:00
Cheese	aa30c866fd	flurrry	2015-09-18 10:22:16 +10:00
libraryaddict	5e8fc77164	Add pages to spectator and in-progress server menu	2015-09-17 04:34:45 +12:00
AlexTheCoder	e6ecd2d5e1	- Fix for stolen message	2015-09-15 18:38:02 -04:00
Sarah	362d99a819	Fixing up Gem signs, Effects etc.	2015-09-15 07:10:39 +02:00
AlexTheCoder	6c5c2f4c4e	- Added slowness to flag carriers and removed any active potion effects they had	2015-09-14 20:38:32 -04:00
AlexTheCoder	0035f3abb0	- Added requested flag location updating - Added sudden death mode when the timer runs out and the game is tied, respawning is turned off and the first to capture a flag wins	2015-09-14 18:54:40 -04:00
AlexTheCoder	2018374b06	- Fixed a color bug	2015-09-14 18:53:10 -04:00
AlexTheCoder	abaf94618c	- Increase flag respawn time - Fix flag timer being black	2015-09-14 18:42:08 -04:00
libraryaddict	655283e008	Progress on spider	2015-09-14 23:23:12 +12:00
Cheese	ac269839c5	squid skill	2015-09-14 14:14:06 +10:00
Cheese	d9142ac33f	smash balance	2015-09-14 12:34:55 +10:00
fooify	2de7fff267	Merge remote-tracking branch 'origin/master' into monster-maze	2015-09-13 08:45:34 -07:00
fooify	aa8cb8943e	more work on monster maze	2015-09-13 08:42:26 -07:00
Sarah	7ca6f58108	Adding Gem signs.	2015-09-13 10:25:44 +02:00
Sarah	353c553589	Adding more Words, Removing some Minion types and changing Items in Hotbar.	2015-09-13 10:00:18 +02:00
Sarah	216c8783a9	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-09-13 03:51:06 +02:00
Sarah	a46cb2c274	last fix in the listAreaInfo method.	2015-09-13 00:35:22 +02:00
Sarah	53d5c2fd0e	adding area info command.	2015-09-13 00:30:55 +02:00
Sarah	112f94a842	forgot to add command to remove potion effects.	2015-09-13 00:00:47 +02:00
Sarah	fcec6253cd	fixing @p on signs, adding potioneffects and gadgets to areas.	2015-09-12 23:56:38 +02:00
Sarah	b6ffee73f5	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates	2015-09-12 21:17:45 +02:00
fooify	55ac104e2c	took forever to get it working, but the maze parsing works! :)	2015-09-12 09:50:06 -07:00
Jonathan Williams	1417d31b73	Added 60s delay to timings enable check.	2015-09-11 23:57:26 -07:00
Cheese	c9971bb117	fixed duplicate rank name	2015-09-12 16:45:22 +10:00
Cheese	6216f2ced4	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-09-12 16:33:44 +10:00
Jonathan Williams	a7d4a7534f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-09-11 22:51:04 -07:00
Jonathan Williams	2380b9041d	Added automatic timings report in the event of lag. Added more exception handling around LoadingWindow	2015-09-11 22:50:53 -07:00
Cheese	119dc8ab52	changed name of method	2015-09-12 15:01:18 +10:00
Sarah	5c0ada3df6	Implementing RequiredRank file and command.	2015-09-12 06:39:40 +02:00
Cheese	4184fe20cf	minor fixes	2015-09-12 14:09:04 +10:00
Sarah	b56813deef	Improving /e commands (/e kick, /e area, etc)	2015-09-12 04:33:10 +02:00
Ty Sayers	0bafae6485	Fix bug where certain damage events threw excessive NPEs based on spawn protection checks.	2015-09-11 17:09:50 -05:00
Ty Sayers	9be0ecc598	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear Conflicts: Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/murder/MurderManager.java Additionally: Disable Endermen and Horses from spawning on the server. Fix bug where players could shoot others from within spawn and throw cobwebs from inside spawn. Fix bug where players could use the Travel Hub while combat tagged. Fix bug where Water flowed into Spawn areas. Fix bug where players could abuse BlockToss to pick up water blocks and throw them inside restricted liquid areas. Fix bug where Fissure created cracked StoneBricks which could be exploited for base raiding. Re-organize some Spawn/Safe Zone related logic into a more intuitive location (Spawn class) and add more descriptive documentation to event handlers in Spawn.	2015-09-11 17:01:04 -05:00
Ty Sayers	b4248a3d5b	Fix bug where Assassins could teleport outside of the Borders (causing their death) with several skills. Fix bug where crafting denials for certain items were not properly communicated to the user. Clean up use-cases for cancelling fishing to prevent players from not being able to use their class abilities. Fix bug where pigs could be struck my lightning using class abilities, spawning in pig zombies that could be farmed for gold.	2015-09-11 16:04:52 -05:00
Cheese	5a79c51506	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-09-10 13:57:48 +10:00
Cheese	a4cc70c3f0	new small youtuber rank	2015-09-10 13:17:11 +10:00
Ty Sayers	15b51fe575	Fix bug where Fissure skill travelled through doorways as well as increase cooldown. Fix bug where Cobwebs could be thrown inside spawn safe zones and increase cooldown. Modify StaticLazer skill's range, damage, cooldown, and damage radius for balance purposes. Remove the ability to craft TNT Minecarts and Jukeboxes. Disable fishing ability in Clans. Add the requirement that players must crouch while clicking on furnaces to be able to smelt. Fix bug where Axes weren't considered a weapon in the context of player murders.	2015-09-07 20:39:34 -05:00
fooify	5824ec6df0	lots of changes to monster maze, check trello for list	2015-09-07 07:08:00 -07:00
Sarah	4240026024	Adding Areas and a few more commands like /e kick and /e tempgadget to the event game.	2015-09-06 18:55:00 +02:00
libraryaddict	6474f5a9e9	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-09-06 16:23:18 +12:00
Sarah	5712af8ddc	Adding Redstone function signs for events.	2015-09-05 20:38:51 +02:00
fooify	c648d7c186	stuff, things...things, stuff (Monster Maze)	2015-09-05 09:30:51 -07:00
fooify	9e3f87b71e	more edits to MM - displaying more information - permanent safezones around the map - spawn now does not deteriorate, is permanent	2015-09-05 06:41:10 -07:00
Jonathan Williams	4bb100b6be	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-09-05 01:53:45 -07:00
Jonathan Williams	4ad95b54cf	Updated ServerMonitor status reporting for network.	2015-09-05 01:53:37 -07:00
Jonathan Williams	2536d8a437	Fixed out of range stats causing no stats to load. Issue fix to db for out of range stat on login.	2015-09-05 01:40:56 -07:00
Cheese	0ac808ba43	stacker pref is now only for pvp stacking.	2015-09-05 10:30:11 +10:00
Cheese	fc5ccd4a5e	fixed 'self scoring' in Soccer removed silverfish on wither pet despawn	2015-09-05 10:04:54 +10:00
Cheese	106a7dab2e	removed ability for entities to change blcoks in hub	2015-09-05 09:48:06 +10:00
Mysticate	271b86dabd	Fixed spectators slowing evolution times.	2015-09-04 11:45:42 -04:00
libraryaddict	21d9f5767e	CustomTagFix support changing and removing of names.	2015-09-04 19:23:33 +12:00
AlexTheCoder	b28419caab	Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-09-04 02:59:28 -04:00
AlexTheCoder	f05cdd4915	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-09-04 02:57:47 -04:00
Cheese	03537e4650	fixed a spacing issue	2015-09-04 12:18:02 +10:00
Cheese	0ec3a8dc10	added radar for ctf and dom	2015-09-04 12:09:26 +10:00
Jonathan Williams	921292a5c6	Added timings capture and server log copy on server kill inside server monitor.	2015-09-03 09:38:26 -07:00
Jonathan Williams	890c9d59e1	Fixed loading window bug. Added default rank for CoreClient in case of bugged login.	2015-09-03 09:38:02 -07:00
Mysticate	0c58de3c19	Glitches. Fixed the things.	2015-09-01 02:35:06 -04:00
Mysticate	b4ce33a916	Fixed things. • Added a cancelled check to No Ability • Removed tokens on quit. • Checked if players are alive before giving them places.	2015-09-01 01:59:36 -04:00
AlexTheCoder	9dc90b0e13	Added CTF to Champions stat group	2015-09-01 01:26:35 -04:00
AlexTheCoder	bff9c99e2c	Added system to mount flags on carrier's head for easier identification and disabling of abilities as per Chiss' request	2015-08-31 21:48:25 -04:00
AlexTheCoder	8a94602aef	Fixed bug https://trello.com/c/KBhgw0zK/115-hg-mismatching-achievement-text	2015-08-31 16:03:27 -04:00
AlexTheCoder	fe4586852c	Made rank unlock lore colored based on rank required for item (QA Requested)	2015-08-31 15:59:53 -04:00
AlexTheCoder	cbb0d4521c	Made Legend cosmetics follow the same rules as all other premium rank cosmetics, as many staff were previously legend and lacked access to features they had paid for.	2015-08-31 15:49:31 -04:00
AlexTheCoder	5322e9d018	Marked the Bunny Morph to reflect its no longer available status	2015-08-31 15:48:25 -04:00
AlexTheCoder	24fed013ae	Fixed previous ownership not being transferred	2015-08-31 15:39:04 -04:00
AlexTheCoder	32a257fa55	Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts	2015-08-31 15:11:57 -04:00
AlexTheCoder	b63843930f	Fixed bug https://trello.com/c/ZYS3Ddxw/134-hub-emerald-twirl-particles-are-called-green-ring-in-the-gui	2015-08-31 15:08:42 -04:00
Sarah	503b68da2f	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into EventGameUpdates	2015-08-31 11:32:47 +02:00
Sarah	58ae09ebd4	saving Project for pulling.	2015-08-31 11:32:18 +02:00
AlexTheCoder	e93db405d0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-08-31 04:48:43 -04:00
AlexTheCoder	129464a845	Added CTF to MPS menus	2015-08-31 04:42:36 -04:00
AlexTheCoder	788ec97d38	Added CTF wins to achievements for champions	2015-08-31 04:39:07 -04:00
Jonathan Williams	c61f9ce3c8	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-31 00:53:23 -07:00
Jonathan Williams	740899c09e	Added dummy CoreClient in the rare event a player joins and gets disconnected during the join event????Weird Fixes Lobby crashes.	2015-08-31 00:53:07 -07:00
AlexTheCoder	cbf8b575c6	Changed data for certain types of spawning	2015-08-31 03:28:22 -04:00
AlexTheCoder	39a79eb818	Fixed a nullpointer	2015-08-31 03:05:43 -04:00
AlexTheCoder	474f1bd0b8	Made CTF follow Chiss' specifications and also added more advanced features	2015-08-31 03:04:18 -04:00
Shaun Bennett	7c53feec71	Add axes and bows to murder detection	2015-08-30 17:59:46 -07:00
Mysticate	becfbe1f13	Fixed possible game breaking bug :S	2015-08-30 20:09:47 -04:00
Shaun Bennett	fa0fd062d4	Allow Media to join server, Supply drop work	2015-08-30 17:08:56 -07:00
Ty Sayers	eba98e7e7c	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-30 17:05:57 -07:00
Ty Sayers	6bb4e69236	Fix bug where players could shift-click items into shop page and lose it forever. Fixed bug where players couldn't place blocks against Anvils/Enchantment Tables while crouched. Fixed bug where clans could enemy other clans that had vastly fewer members than them. Fix bug where CustomGear items broke when a player entered Creative gamemode. Fixed bug where CustomGear suffix attributes did not properly format names. Fixed bug where the Frosted weapon attribute did not properly apply it's slowness effects to enemies.	2015-08-30 17:05:45 -07:00
Mini-Chiss	d79794c6d3	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-30 15:47:57 -07:00
Mini-Chiss	bb66d47e8e	meow	2015-08-30 15:47:49 -07:00
Mysticate	33d78a5efd	Fixed eating spider eye. Yay!	2015-08-30 18:39:07 -04:00
AlexTheCoder	6fefcbd953	Kit Changes/Fixes: - Fixed Kit Mobs not opening guis in Champions games - Fixed Abilities not working in CTF - Added new event when a player attempts to choose a kit - Cancelled changing kit while holding a flag	2015-08-30 17:13:08 -04:00
Ty Sayers	b0efe35531	Add restriction to ServerCommand that prevents players from directly connection to a Clans-X server, and instead insists that they join through a Clans hub.	2015-08-30 13:14:01 -07:00
Shaun Bennett	1b6833ae16	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-30 12:41:22 -07:00
Shaun Bennett	5d77202370	Add SrMod to blacklist, prevent armor from breaking when hitting people with it, stop firing block toss event if you cant use block toss	2015-08-30 12:41:15 -07:00
Ty Sayers	ab73cc2fbe	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-30 12:28:55 -07:00
Ty Sayers	54f910845e	Fix bug where murders were not properly taking place in certain instances of players wielding weapons or armour as well as in certain claimed areas. Fix bug where BlockToss could be exploited to break into an enemy clan's claimed base. Fixed bug where percent sign was not properly escaped in certain item attributes. Remove debug line from shop.	2015-08-30 12:28:44 -07:00
Shaun Bennett	908d11ead5	Disable staff from joining the full server, Fix clans login manager, fix undead camp not spawning, fix clans admin command for all players, enable server for mapdev+, add TNT, generator, and class shop back to pvp shop, fix land claiming query	2015-08-30 12:00:58 -07:00
AlexTheCoder	149d37caad	Forgot to commit with actual game	2015-08-30 04:01:01 -04:00
AlexTheCoder	eca69a8ae2	Made new branch up to date and including previous branch's code	2015-08-30 03:58:58 -04:00
Jonathan Williams	47331658ac	Merge remote-tracking branch 'remotes/origin/Myst_EVO'	2015-08-30 00:14:53 -07:00
Jonathan Williams	b59511ece4	Added duplicate login kick for network.	2015-08-30 00:12:54 -07:00
Ty Sayers	7047bbf8f6	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-29 19:06:20 -07:00
Ty Sayers	c1b356e42f	Fix asynchronous race conditions in ServerData.	2015-08-29 19:05:14 -07:00
libraryaddict	4b7a4a4d5c	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-08-29 18:58:43 -07:00
libraryaddict	cbab8861d8	SNakes!!	2015-08-29 18:58:33 -07:00
Mini-Chiss	bcdd72558d	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-08-29 18:58:21 -07:00
Mini-Chiss	368ed955ea	qwrwr	2015-08-29 18:58:12 -07:00
Ty Sayers	36a22caa1e	Fix bug where lastOnline stat for clans wasn't properly loading on server transfer.	2015-08-29 18:23:04 -07:00
Ty Sayers	4e045f438d	Prevent fire from burning blocks in spawn areas.	2015-08-29 18:12:43 -07:00
Ty Sayers	606e9e8318	Fix bug where serverId column was referenced.	2015-08-29 18:08:18 -07:00
Ty Sayers	f5b9aca708	Fix bug where serverId column was being referenced in table after it's removal.	2015-08-29 18:04:50 -07:00
Ty Sayers	da3810e5a3	Fix bug where any server initializing the ClanRepository was marked as a clans server in the database. Fix bug where administrative clans were being duplicated across different clans servers.	2015-08-29 17:57:18 -07:00
Ty Sayers	138a4cf638	Fix bug where transferring a clan to destination server would not load properly server-side.	2015-08-29 17:43:12 -07:00
Ty Sayers	f47c1b5c14	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-29 17:33:08 -07:00
Ty Sayers	b0c657b5c0	Fix bug where generator location per-clan wasn't being reset properly on server transfer.	2015-08-29 17:33:01 -07:00
Ty Sayers	5df7a5e0c9	Fix bugs related to multiple server UI and clan server transferring.	2015-08-29 17:31:54 -07:00
Shaun Bennett	4dbd2d3586	Reduce login kick time	2015-08-29 17:28:47 -07:00
Shaun Bennett	caf82ad606	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-29 17:18:24 -07:00
Shaun Bennett	c27fdf023c	Fix login manager and stats manager	2015-08-29 17:18:14 -07:00
libraryaddict	f4ade8e9f7	Snnkes	2015-08-29 17:05:47 -07:00
Shaun Bennett	820bc1af44	Setup new module for intellij, fix field ore	2015-08-29 16:56:26 -07:00
Mini-Chiss	50b6bfbe1a	snake	2015-08-29 16:54:23 -07:00
Mini-Chiss	a76610e21e	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta Conflicts: Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/boss/snake/SnakeCreature.java	2015-08-29 16:47:47 -07:00
Mini-Chiss	6bd29394b3	snake	2015-08-29 16:46:55 -07:00
libraryaddict	e2e0756b9f	Snakes anyone?	2015-08-29 16:43:40 -07:00
Mini-Chiss	05ecfb8ff0	snake workin!	2015-08-29 16:33:35 -07:00
Mini-Chiss	110222e5f3	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-08-29 16:02:21 -07:00
Mini-Chiss	64b9cd201c	snake crap	2015-08-29 16:02:14 -07:00
Ty Sayers	227a077dba	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear Conflicts: Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanInfo.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansDataAccessLayer.java	2015-08-29 15:53:42 -07:00
Ty Sayers	197309b914	Commit left-over changes to merge and pull.	2015-08-29 15:44:29 -07:00
Shaun Bennett	5db4a55dda	Enable clans login manager	2015-08-29 15:41:37 -07:00
Shaun Bennett	16b317a877	Forgot to remove debug code	2015-08-29 15:17:03 -07:00
Shaun Bennett	9ad39c1fe7	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-29 15:09:08 -07:00
Shaun Bennett	4aee4f8fd7	Fix generators	2015-08-29 15:09:02 -07:00
libraryaddict	6ae801314c	Fix spawning	2015-08-29 15:07:51 -07:00
libraryaddict	9a1469f6b0	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-08-29 15:03:32 -07:00
libraryaddict	5030ae7d57	For Chiss, may the code never break.	2015-08-29 15:03:22 -07:00
Jonathan Williams	c2c23c22e5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-29 14:55:04 -07:00
Jonathan Williams	4e32bad8dd	Fixed bug with stats pulling as int. Fixed bug with Poll recording selections wrong.	2015-08-29 14:54:57 -07:00
Ty Sayers	088068be80	Add 'Clans' to the ignored server groups for ServerMonitor to prevent interference with live Clans servers.	2015-08-29 14:51:17 -07:00
Ty Sayers	aad5942242	Fix bug with converting gems to coins not properly displaying gem amounts converted. Fix bug with shop item data values not properly being used. Globalize clans to work cross-server and implement GUI to allow players to join clans servers, view clan info from hub, and transfer their clan from server to server.	2015-08-29 14:46:18 -07:00
Shaun Bennett	5b534313f5	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-29 14:37:43 -07:00
Shaun Bennett	8f1da698d2	TNT generator storage in mysql (needs testing still)	2015-08-29 14:37:35 -07:00
Mini-Chiss	eb6a0c9e38	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-08-29 14:27:54 -07:00
Mini-Chiss	efd435396f	snake	2015-08-29 14:27:40 -07:00
Shaun Bennett	16d807db2e	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-29 14:01:45 -07:00
Shaun Bennett	62cf58bd55	Fix a bug where claiming a new land would display that land as neutral	2015-08-29 13:56:26 -07:00
libraryaddict	f0f9a4c674	Push it like a pushy pushy lady.	2015-08-29 13:46:09 -07:00
Mini-Chiss	b7b81ecaaa	snake	2015-08-29 13:38:40 -07:00
Shaun Bennett	fae27df496	Add ClansLoginManager, TNT Generators (Still needs persistence)	2015-08-29 13:35:31 -07:00
Mysticate	046fa4f8b6	Fixed possible NPE	2015-08-29 14:30:22 -06:00
Mysticate	736d88c82f	All achievements fixed. ^_^	2015-08-29 14:13:15 -06:00
Mini-Chiss	d2bc4b8cb4	SNAAAKE	2015-08-29 13:13:04 -07:00
libraryaddict	5d28509474	Snakes tail final location instead of rel movement	2015-08-29 12:38:19 -07:00
libraryaddict	bd2fda17b0	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-08-29 12:07:23 -07:00
libraryaddict	7cd98c82e9	Refactor and move BossAbiliy	2015-08-29 12:06:57 -07:00
libraryaddict	e7f861a6c2	Push golem changes, snakes code and rename bossability thingy	2015-08-29 12:04:53 -07:00
Mysticate	97c7980bbc	Fixed evolving into walls.	2015-08-29 10:54:04 -06:00
Mysticate	55a7ea0439	Fixed kit bug.	2015-08-29 10:44:11 -06:00
Mini-Chiss	9ebabed1a8	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-29 00:14:26 -07:00
Mini-Chiss	6a28845cb0	Merge branch 'Myst_EVO'	2015-08-29 00:14:15 -07:00
Mysticate	12d9888a1f	Fixed wins..	2015-08-29 00:58:53 -06:00
Jonathan Williams	f8729cbd66	Fixed Gadget.	2015-08-28 23:47:27 -07:00
Mini-Chiss	d35b5940fc	fixed achievements	2015-08-28 23:30:21 -07:00
Mini-Chiss	5ae01f95a8	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-28 23:27:35 -07:00
Mini-Chiss	181afaa2d6	Merge branch 'Myst_EVO'	2015-08-28 23:25:51 -07:00
Mysticate	b71bcfab4b	Fixed achievements. Merge ASAP	2015-08-29 00:19:39 -06:00
Jonathan Williams	d4d0c4bed6	Updated Motd.	2015-08-28 23:17:14 -07:00
Jonathan Williams	c98a85c2ba	Added local storage of login time. Hooked in onlineTime bonus feature to real values.	2015-08-28 22:09:42 -07:00
Jonathan Williams	ba4da32939	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-28 21:44:07 -07:00
Jonathan Williams	e47662f855	Added LoginTime setting as RedisTime for use in calculating time on server. Optimized redis util for time calls to calculate time different and only pull redis time once.	2015-08-28 21:44:00 -07:00
Mini-Chiss	829c1d2ae8	Merge branch 'Myst_EVO'	2015-08-28 21:30:10 -07:00
Mysticate	c40fecb03f	Removed warning from private servers	2015-08-28 22:06:13 -06:00
Mini-Chiss	041c5ab53c	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-28 21:00:34 -07:00
Mini-Chiss	3f1c4d24b9	Merge branch 'Myst_EVO'	2015-08-28 21:00:00 -07:00
Jonathan Williams	ad4ba010b7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-28 20:59:08 -07:00
Jonathan Williams	6f0309622c	Removed AccountCache. Converted that to PlayerCache and store account id in there.	2015-08-28 20:58:58 -07:00
Mysticate	bb09720450	removed previous commit jesus	2015-08-28 21:56:35 -06:00
Mini-Chiss	d68f1fa547	Merge branch 'Myst_EVO'	2015-08-28 20:50:27 -07:00
Mysticate	6628f5a1ae	Added a checker for a no kit issue	2015-08-28 21:49:57 -06:00
Mini-Chiss	19b2ff5b58	fixed scoreboard	2015-08-28 20:48:32 -07:00
Mini-Chiss	11cc4a6cea	removed msg	2015-08-28 20:45:59 -07:00
Mini-Chiss	fda866a33f	Merge branch 'Myst_EVO'	2015-08-28 20:35:59 -07:00
Mysticate	4466c10441	FIXED	2015-08-28 21:35:31 -06:00
Mini-Chiss	4ac6b22e53	Merge branch 'Myst_EVO'	2015-08-28 20:31:56 -07:00
Mini-Chiss	88ca205474	fixes	2015-08-28 20:31:29 -07:00
Mysticate	815add4c59	FIXED THE THIGNS	2015-08-28 21:28:39 -06:00
Mini-Chiss	5777309d18	Merge branch 'Myst_EVO'	2015-08-28 20:07:22 -07:00
Mini-Chiss	8238a199d5	gem stuff	2015-08-28 20:06:39 -07:00
Mysticate	cc60371c1f	Fixed perk cancelling on death	2015-08-28 21:04:35 -06:00
Mini-Chiss	d879bc68ab	Merge branch 'Myst_EVO' Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java	2015-08-28 19:59:48 -07:00
Mini-Chiss	b5b8bef39e	evo fixes	2015-08-28 19:58:51 -07:00
Mysticate	d6c8e51104	Things ^_^	2015-08-28 20:57:47 -06:00
Mysticate	ebd3fbe6d5	Merge remote-tracking branch 'origin/master' into Myst_EVO	2015-08-28 20:19:27 -06:00
Mini-Chiss	abf1f23087	double gem	2015-08-28 19:16:49 -07:00
Mysticate	56aa235e56	Fixed kit messages	2015-08-28 19:25:52 -06:00
Shaun Bennett	676817601a	Prevent players from logging into the wrong clans server	2015-08-28 17:31:09 -07:00
Mini-Chiss	c8c569281b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-28 16:18:49 -07:00
Mini-Chiss	5562345c05	Merge branch 'SarahsAwesomeBugFixes'	2015-08-28 16:02:40 -07:00
Sarah	3be6483ed3	editing /game set for test servers.	2015-08-29 01:01:05 +02:00
Sarah	0f37829b54	changing Hotbar text to money.	2015-08-29 00:56:24 +02:00
Mysticate	2d770a8dd1	More final tweaks.	2015-08-28 16:36:35 -06:00
Sarah	ccc9645c47	adding hotbar text.	2015-08-29 00:24:44 +02:00
Mysticate	513662e6e3	Fixed the block open flag.	2015-08-28 15:46:38 -06:00
Mysticate	f21ca35638	Final bug changes.	2015-08-28 15:44:41 -06:00
Ty Sayers	35c79804ac	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-28 14:17:22 -07:00
Ty Sayers	825dd66283	Fix bug where certain chunks around Fields could not have blocks broken but could have blocks placed. Add a particle effect to combat tagged players in safe zones. Restructure Spawn claiming so that the center chunk is a Safe Zone and all other chunks are regular non-safe zones.	2015-08-28 14:17:11 -07:00
Jonathan Williams	e9b33668bc	Added donorsOnline to MinecraftServer snapshot Refactored Rank class to use lowercase methods.	2015-08-28 13:22:04 -07:00
Shaun Bennett	c51a449df3	Enable caching for clans, update craftbukkit jar	2015-08-28 13:10:30 -07:00
Shaun Bennett	6f39c072a4	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-28 12:57:13 -07:00
Shaun Bennett	7761ca7e6f	Remove debug messages	2015-08-28 12:56:43 -07:00
Ty Sayers	5cdf31d0e6	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-28 12:52:12 -07:00
Ty Sayers	b98cde8b80	Fix bug where players couldn't move items in their inventory to sell gold tokens to shop. Reduce knockback amount on HeavyArrow skill for Ranger class. Prevent players who do not have the Ranger or Assassin class from being able to shoot bows. Add notification message on Smelting feature to reduce confusion among players. Fix bug with Building shop where the listed sell price and actual sell price weren't synced properly. Fix bug with all shops where purchasing items in bulk failed.	2015-08-28 12:52:02 -07:00
Shaun Bennett	cd145324d8	Fix tablist for 1.8.1+, Add ProfileCaching, update craftbukkit	2015-08-28 12:00:23 -07:00
libraryaddict	249ecdd381	Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/mineplex into clans-beta	2015-08-28 11:42:53 -07:00
libraryaddict	1f5cd624a4	Fix up iron golem, add slam attack	2015-08-28 11:42:33 -07:00
Sarah	2a236684ac	Finalizing prototype of Type wars.	2015-08-28 14:47:49 +02:00
Mysticate	571d992dbe	Fixed a few bugs.	2015-08-27 20:47:55 -06:00
Ty Sayers	6a330a66d9	Fix bug with Building shop materials not properly being purchased in bulk. Modify the notification message for combat tagged players in safezones to display on the middle of the screen instead of chat.	2015-08-27 15:46:57 -07:00
Ty Sayers	2e4c27cb11	Merge pull request #45 in MIN/mineplex from clans_custom_gear to clans-beta * commit '4ddc82f8204e322373b54c50308dc6bdb29f59b3': Fix 1.8 tablists bug by modifying Craftbukkit file PacketPlayOutPlayerInfo.class	2015-08-27 16:56:41 -05:00
Ty Sayers	ff13f51151	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-27 14:55:33 -07:00
Ty Sayers	4ddc82f820	Fix 1.8 tablists bug by modifying Craftbukkit file PacketPlayOutPlayerInfo.class	2015-08-27 14:54:56 -07:00
Shaun Bennett	4f2d861b21	Fix chat bug, enable TablistFix for clans	2015-08-27 14:53:52 -07:00
Ty Sayers	783f526b76	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-27 14:42:41 -07:00
Ty Sayers	4dcd54a9b0	Fix bug with DisguiseManager not properly handling the undisguising of non-player entities. Fix bug where FleshHook skill could be activated on players in a safe zone. Fix multiple bugs with unsafe logging system and NPC drops. Fix bug where unsafe timers and combat tagging in safe zones was not properly functioning. Fix bug with CustomGear not properly spawning with command. Add Clan Blacklist that restricts naming of Clans.	2015-08-27 14:42:07 -07:00
libraryaddict	379ee9271a	Merge pull request #43 in MIN/mineplex from clans/world-events to clans-beta * commit '9d3f125c9eb1139e6d5cfbdbe63158161e6a488b': Iron Wizard, fixed iron golem custom name Push golem block shot as per request	2015-08-27 16:34:46 -05:00
Shaun Bennett	e86bca99fd	Clans Chat	2015-08-27 14:33:50 -07:00
libraryaddict	9d3f125c9e	Iron Wizard, fixed iron golem custom name	2015-08-27 14:18:10 -07:00
Shaun Bennett	b0ee2bb669	Fix purple/black item bug, fix clans/ally chat bug with no clan, murder changes, drop player gold as items on death, add lore to crafted items	2015-08-27 13:57:57 -07:00
libraryaddict	102fcd8e73	Push golem block shot as per request	2015-08-27 11:10:17 -07:00
Shaun Bennett	adfc451e9f	You can only repair items two times, ClansAdmin commands now require admin, Fix durability bug, Fix potion effects making inventory shift	2015-08-27 09:33:44 -07:00
Mysticate	f2f6afb6ca	Fixes :D	2015-08-26 20:10:58 -06:00
Shaun Bennett	a5400b0fef	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-26 18:35:20 -07:00
Ty Sayers	c20d2c9516	Fix bug with economy gold additions/reductions not properly working and causing shops to fail. Fix bug with region resetting command and streamline the claiming of server-based faction chunks for Spawn, Shops, Fields and Borderlands.	2015-08-26 17:37:31 -07:00
Shaun Bennett	669de4c91d	Change EntitySpawnEvent to CreatureSpawnEvent	2015-08-26 16:44:39 -07:00
Shaun Bennett	e4c48e5f3f	Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta	2015-08-26 15:01:44 -07:00
Shaun Bennett	e85682d68f	Use proper item names for recipes, don't allow repairing items more than two times	2015-08-26 14:56:28 -07:00
Ty Sayers	62ffdc1ef1	Left-over commit from last update to add new /region-reset command.	2015-08-26 14:54:33 -07:00
Ty Sayers	3b999d2660	Add new /region-reset command to reset and re-claim all admin-based regions such as Spawn, Shops, Borderlands, and Fields.	2015-08-26 14:54:15 -07:00
Shaun Bennett	0dd79419eb	Update schematic files	2015-08-26 13:39:13 -07:00
Shaun Bennett	e6c4227a4f	Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta	2015-08-26 13:30:02 -07:00
Ty Sayers	fc5f57803e	Increase spawn safe-zone radius by one chunk and shift east shop location one chunk over to fit with the map.	2015-08-26 13:29:22 -07:00
Ty Sayers	c3013063de	Fix bug where NPCs were unable to spawn into safe zones. Remove Shield Smash skill from Clans.	2015-08-26 13:09:10 -07:00
Shaun Bennett	14f5cb4704	Allow breaking/placing blocks when in creative	2015-08-26 13:09:01 -07:00
Mysticate	a351a8f1ed	Minor improvements.	2015-08-26 13:47:01 -06:00
Shaun Bennett	7a66a8dad9	Merge remote-tracking branch 'origin/clans-beta' into clans-beta	2015-08-26 12:26:35 -07:00
Shaun Bennett	b13c9fe227	Field updates, War updates, bug fixes	2015-08-26 12:26:27 -07:00
Ty Sayers	52911b9534	Merge branch 'clans-beta' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear	2015-08-26 12:24:02 -07:00
Ty Sayers	9a45d1116a	Fix bug with players being able to pick up water and lava sources with empty buckets. Fix bug where death animation wasn't properly playing on entities that entered a safe zone. Increase hunger decay rate slightly. Swap the locations for Shop and Spawn zones and fix appropriate radius differences for zones.	2015-08-26 12:22:36 -07:00
Mysticate	cfdb0dfa4f	Added kits + achievements. Hurrah!	2015-08-26 13:19:17 -06:00
Mysticate	988382375f	Started adding kits	2015-08-25 23:36:18 -06:00
Sarah	15aca5dca9	Making the mob spawning prototype. still have to figure out how to move them properly.	2015-08-26 00:59:28 +02:00
fooify	e9bc0d3a5f	capitalize h	2015-08-25 08:23:22 -07:00
fooify	64ca6ecce0	Merge remote-tracking branch 'origin/master' into foo	2015-08-25 08:20:37 -07:00
fooify	1952ee7824	fix some strings mentioning "admin" in MPS	2015-08-25 08:19:09 -07:00
Shaun Bennett	062328313e	Fix errors	2015-08-24 22:24:26 -05:00
Jonathan Williams	61c80fd31d	Fixed issue with player login sessions.	2015-08-24 20:21:14 -07:00
Shaun Bennett	bf1f62057c	Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans-beta Conflicts: Plugins/.idea/misc.xml Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java	2015-08-24 22:15:08 -05:00
Shaun Bennett	6841cbac69	Clans bug fixes + shop updates	2015-08-24 22:03:26 -05:00
Jonathan Williams	b64a75cbf3	Added maintenance message.	2015-08-24 18:35:11 -07:00
Ty Sayers	69afefd66f	Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear Conflicts: Plugins/Mineplex.Core/src/mineplex/core/blockrestore/BlockRestoreMap.java Additionally, fix bug where players could fish hook to combat-tag a player in spawn and then attack them. Fix issue where players were able to empty lava and water buckets. Fix bug where monsters wandered into and around spawn zones. Fix bugs where special abilities FireBlast, ExplosiveShot, and WolfsPounce were not affecting mobs (only players). Fix bug with soup left-click punch activation not fully integrated.	2015-08-24 20:55:29 -04:00
Mysticate	7b42f2155d	Tweaks. :D	2015-08-24 20:40:34 -04:00
fooify	2e016de9e5	Fixed ignore command, now works	2015-08-24 14:07:21 -07:00
fooify	549435224f	changes to monster maze!	2015-08-24 09:58:07 -07:00
libraryaddict	ba41118da7	Load boss battles properly	2015-08-25 01:58:57 +12:00
Mini-Chiss	6249dadf91	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-23 16:27:47 -07:00
Jonathan Williams	6d3c965f14	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-23 16:26:02 -07:00
Jonathan Williams	74fd729975	Updated BungeeCord to latest version.	2015-08-23 15:48:03 -07:00
Jonathan Williams	fec8398608	UPdated ChestConverter to convert stats.	2015-08-23 15:47:03 -07:00
Jonathan Williams	34a5d9c722	Updated MotdManager to update both repositories.	2015-08-23 15:46:23 -07:00
Jonathan Williams	1e7f2f01a7	Fixed problem where UUID api was preventing client loading from db.	2015-08-23 15:38:43 -07:00
libraryaddict	8798244351	Bosses stuff	2015-08-24 08:34:29 +12:00
Mini-Chiss	d454d73ccb	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-23 11:32:48 -07:00
Mini-Chiss	69ff514bf8	changed perms on write	2015-08-23 11:31:32 -07:00
Ty Sayers	a9f5197c64	Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Database/src/mineplex/database/Account.java Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java	2015-08-22 15:18:51 -04:00
Ty Sayers	6c9a99fa1b	Fix soup consumption bug that didn't allow left clicking for use. Fix bug with item frames being destroyed inside spawn zones. Fix bug with bow deficient classes not properly receiving damage reductions on their bow attacks. Fix bug with Whirlwind Axe skill being enabled in Clans settings. Fix bug where bank related shop buttons functioned as gold token purchasables for error-displaying icons. Increasing duration on potion application from custom gear to prevent shaking inventory screen. Fix bug with gold balance changes (add/remove) weren't taking place synchronously, leading to the ability for duplication of gold and items. Fix bug where enemy'd Clans could be allied or neutral'd, as well as signaling that at-war clans were neutral. Fix bug where clans could unclaim admin chunks and ally chunks. Decrease the rate at which hunger decreases to be more accordance with 1.6 food systems. Disable Flint & Steel, Enderpearls, and Witch spawning.	2015-08-22 15:06:05 -04:00
Mysticate	cbaaee60d9	Removed mob spectating method from evolving.	2015-08-21 13:00:08 -04:00
libraryaddict	cdc92f8b2f	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-22 00:38:55 +12:00
libraryaddict	7841b17d03	Add PacketPlayOutCamera for locking view to entity	2015-08-22 00:38:37 +12:00
libraryaddict	bad339cf04	Tweak dead bodies more	2015-08-21 20:52:57 +12:00
libraryaddict	c41328d726	Dead bodies: Change to Item from disguised arrow, fix body positioning, move to Game.java to enable in all games	2015-08-21 20:40:09 +12:00
libraryaddict	39ede2064a	Bosses game progress	2015-08-21 16:12:26 +12:00
Mini-Chiss	63107b0c26	missing file	2015-08-20 20:39:20 +02:00
Mini-Chiss	15c873392a	updated give to allow naming of items.	2015-08-20 20:38:07 +02:00
Mysticate	86ad6a09de	Used armor stands for evolving.	2015-08-20 13:04:22 -04:00
xGamingDudex	633cbdabe2	player.isOnGround() is controlled by packets from the player, meaning players can easily fake being on the ground resulting in infinite double jumps. player.getFallDisance() is also reset when isOnGround() returns true, meaning we'll need to manually check if the player is on the ground. Outlines two opposite corners of the entities bounding box, scann all blocks inside, check if any of them are solid and return respectively.	2015-08-20 15:42:39 +02:00
Mini-Chiss	f97da1bdba	Merge branch 'SarahsAwesomeBugFixes'	2015-08-19 16:33:37 +02:00
Sarah	6e926b431c	Fixing snowballs and eggs in Solo Skywars.	2015-08-19 16:00:36 +02:00
Jonathan Williams	bbe5b79c7e	Disabled AntiHack create table. Fixed NPE with ServerManager	2015-08-19 04:11:34 -05:00
Mini-Chiss	3d7c81a3b4	fixed game tips	2015-08-19 08:15:22 +02:00
Mysticate	64990ed356	Fixed parse distance.	2015-08-18 21:37:52 -04:00
fooify	859a7e07d5	added the optional functionality to include air blocks in the util method getInBoundingBox()	2015-08-18 16:46:20 -07:00
fooify	15eba5b491	added more y velocity	2015-08-18 12:22:34 -07:00
Mysticate	53395a7700	Made player immovable whilst evolving.	2015-08-18 13:07:46 -04:00
Mini-Chiss	14bf8faf3a	disabled big sale	2015-08-18 09:49:53 +02:00
fooify	d489b31738	merge	2015-08-17 16:27:28 -07:00
fooify	a47022d242	Merge remote-tracking branch 'origin/master' into monster-maze	2015-08-17 14:54:19 -07:00
fooify	9343bc0048	trying to merge	2015-08-17 14:53:59 -07:00
Mysticate	75a4b3d568	Changes to make evolving easier • Speed 1 on kill • Evolve chargeup decreases 1.5 seconds per kill.	2015-08-17 10:36:28 -04:00
Mini-Chiss	b7854e6cab	added big larry to chests	2015-08-17 13:05:41 +02:00
Mini-Chiss	9eed03237b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-17 12:39:06 +02:00
Mini-Chiss	58e517a4d7	fixed null args more	2015-08-17 12:38:41 +02:00
Shaun Bennett	8ab8388344	Merge remote-tracking branch 'origin/master'	2015-08-17 05:05:36 -05:00
Shaun Bennett	5c71522b2d	Return the first UUID instead of last (AccountRepository)	2015-08-17 05:05:25 -05:00
Mini-Chiss	0a23f91592	fixed two little bogs	2015-08-17 11:53:50 +02:00
libraryaddict	1e14d29999	Clans: Migrate bosses to combat core, fix map to rotate its cursor, finished golem?	2015-08-17 21:04:26 +12:00
Shaun Bennett	dc8bec340e	Rename Quick game menu for consistency	2015-08-17 03:18:35 -05:00
Mini-Chiss	7a7543886f	fixed a ton of commands NPEing on no args	2015-08-17 09:04:39 +02:00
Mysticate	993ed0a92d	Fixed a possible NPE	2015-08-16 22:38:59 -04:00
Mini-Chiss	8cc5ff042c	fixed block hunt gem exploits	2015-08-16 09:33:15 +02:00
Mini-Chiss	91ce9cfba7	fixed a crash with fireworks	2015-08-16 08:39:03 +02:00
Mini-Chiss	8584e0355a	final fix!	2015-08-15 12:32:03 +02:00
Mini-Chiss	ba6806935d	fixed better	2015-08-15 12:31:19 +02:00
Mini-Chiss	6ac586790d	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-15 12:27:30 +02:00
Mini-Chiss	25f93bac2e	fixed logic on setgame	2015-08-15 12:27:11 +02:00
Shaun Bennett	555908a3c1	Rename preferences gui, add shop items for gold and emeralds (commented out right now), fix typo	2015-08-15 02:03:46 -05:00
Sarah	27da9b64b6	Merge branch 'KitPreferences' of http://184.154.0.242:7990/scm/min/mineplex into SarahsAwesomeBugFixes	2015-08-15 07:40:40 +02:00
Sarah	96dc86a481	Fixing map rotation.	2015-08-15 07:34:04 +02:00
Mysticate	2659dd4e39	Fixed minor bugs. Head now follows mob altitude.	2015-08-14 23:17:56 -04:00
Shaun Bennett	fda052ea90	Add treasure chest stats	2015-08-14 21:34:37 -05:00
Shaun Bennett	e89961380b	Merge remote-tracking branch 'origin/master'	2015-08-14 21:14:41 -05:00
Shaun Bennett	1eaa6446af	Fix double hologram and hopefully NPE	2015-08-14 21:14:34 -05:00
Shaun Bennett	c520bd7921	Add recharge to carl spins so that they don't get triggered twice	2015-08-14 20:43:58 -05:00
Mysticate	ac18dd3b79	Fixed iron golem select message. Removed slot change message.	2015-08-14 20:22:00 -04:00
libraryaddict	81f793d693	Iron Wizard: Commit progress	2015-08-14 20:49:17 +12:00
libraryaddict	a1ea03f74b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events Conflicts: Plugins/.idea/misc.xml Plugins/.idea/modules.xml Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java Plugins/Mineplex.Database/src/mineplex/database/Routines.java Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java	2015-08-14 19:44:56 +12:00
libraryaddict	7fb85f24d1	UtilEnt: Change CreatureLook to support LivingEntity, not just Creature	2015-08-14 19:15:35 +12:00
libraryaddict	33a6e4cb13	UtilEnt: Add CreatureLook method	2015-08-14 19:12:05 +12:00
Jonathan Williams	a2d7aa77fe	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-14 00:37:55 -05:00
Jonathan Williams	f5d934fe53	Fixed sync db calls for pets. Make sure to add/remove pets in mysql.	2015-08-14 00:37:43 -05:00
Mini-Chiss	80588a308b	balanaced brawler	2015-08-13 21:03:48 +02:00
Mini-Chiss	7157aaee2b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-13 20:56:20 +02:00
Mini-Chiss	a1ba2cffac	fixed needler not doing posion	2015-08-13 20:56:02 +02:00
Shaun Bennett	0b4dbab871	Change ticket command access to admin	2015-08-13 11:23:29 -05:00
Shaun Bennett	bd7317cf7b	Fix ticket command rollback >:D	2015-08-13 11:03:12 -05:00
Mysticate	eaad787075	Removed the base kit and replaced it with Iron Golem.	2015-08-13 08:16:33 -04:00
Mini-Chiss	5fa9135b08	renamed soccer to slimeball :)	2015-08-13 14:11:22 +02:00
Mini-Chiss	6ef3215516	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-13 13:25:41 +02:00
Mini-Chiss	534c91c706	remove items from inside soccer	2015-08-13 13:24:55 +02:00
Shaun Bennett	bc8aff31cb	Merge remote-tracking branch 'origin/master'	2015-08-13 06:12:24 -05:00
Shaun Bennett	af15476f19	Use login query to handle logins	2015-08-13 06:12:11 -05:00
Mini-Chiss	878ac82ade	fixed error!	2015-08-13 13:01:41 +02:00
Mini-Chiss	1487692609	completely disabled team armor in arcade. avoids typing it just as game starts.	2015-08-13 12:57:30 +02:00
Mini-Chiss	fc1a8e4e25	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-13 12:52:11 +02:00
Mini-Chiss	f3b58fe9b6	disabled team armor command in games D:	2015-08-13 12:51:57 +02:00
Shaun Bennett	e1d04354fb	Use dummy record for AddPlayer	2015-08-13 05:18:53 -05:00
Shaun Bennett	94c00cdb72	Adding some comments	2015-08-13 04:05:28 -05:00
Shaun Bennett	4d6e827739	Remove vote3!	2015-08-13 04:03:03 -05:00
Shaun Bennett	92c0e1452b	Add vote3	2015-08-13 04:01:53 -05:00
Shaun Bennett	0c68321e81	Global button	2015-08-13 03:58:05 -05:00
Shaun Bennett	11a4805c38	Stat stuff!	2015-08-13 03:54:23 -05:00
Shaun Bennett	4aac057956	Merge remote-tracking branch 'origin/master'	2015-08-13 03:32:40 -05:00
Shaun Bennett	05b1b91686	Carl!	2015-08-13 03:32:31 -05:00
Jonathan Williams	8476578bc0	Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master * commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324': Various Fixes.	2015-08-13 01:52:16 -05:00
Jonathan Williams	a308244966	Merge pull request #29 in MIN/mineplex from foo to master * commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits) minor grammar issue remove duplicate method manually updating something crosses fingers please work! please work... Freezes the time using doDayLightCycle instead of using a UpdateEvent. Fixed double-half-slabs (line 68) remove custom level to fix merge conflicts squirrel! fix getting snowballs from bedrock add jnr_dev to updaterank fix this agaaaaain FOOIFY IS A NOOB OKAY fix concurrentmodificationexception fix turfforts bug prevent STATIONARY_LAVA from breaking in creeper smash fix creeper smash exploding lava and bedrock fix spleef lava issue ishh also wanted this :P (let me know if I should remove it) ishh wanted it...k ...	2015-08-13 01:49:00 -05:00
Jonathan Williams	0ff7cee229	Merge pull request #32 in MIN/mineplex from Alex_MILKCOW to master * commit 'cc24bb78d3968c0c364164fb43e19724007e3833': Fixed Cows being able to fly if they had the Rabbit Farmer kit Fixed new classes not appearing in repository Milk The Cow: New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost	2015-08-13 01:45:56 -05:00
Mysticate	ed7dbddf4a	Redid how kits are done.	2015-08-13 00:12:28 -04:00
Mysticate	d7e28e9eb8	You can no longer have the option to Evolve if you kill while dead.	2015-08-12 13:28:31 -04:00
Mini-Chiss	4f163af909	fixed a uid problem with maps	2015-08-12 18:36:29 +02:00
Mysticate	a7da10cb34	You no longer remain "charging" when you die.	2015-08-12 12:12:26 -04:00
Mysticate	ad94b63903	Blaze and Enderman now take water damage.	2015-08-12 10:46:12 -04:00
Mysticate	0c3c9702d9	Small fixes. Added holograms to show kit abilities. Fireworks are now client side only. Decreased the # of emerald particles.	2015-08-12 09:44:55 -04:00
Mini-Chiss	fcfb2559b8	players cannot grab slime :O	2015-08-12 14:41:33 +02:00
Mini-Chiss	d1302e8dc3	fixed full msg	2015-08-12 12:42:59 +02:00
Mini-Chiss	5293e24469	fixed text	2015-08-12 11:58:40 +02:00
Mini-Chiss	cd5c7e7110	fixed kb	2015-08-12 11:23:19 +02:00
Shaun Bennett	37e5e97020	Fix experience reward displaying as game	2015-08-12 03:08:40 -05:00
Shaun Bennett	f81f5d82d6	Merge remote-tracking branch 'origin/master'	2015-08-12 03:00:16 -05:00
Shaun Bennett	30f20801c7	Lets hope everything works!	2015-08-12 03:00:07 -05:00
Mini-Chiss	860127631c	fixed item insta-despawn	2015-08-12 09:27:05 +02:00
Mini-Chiss	f19efb4a93	renamed football to soccer	2015-08-12 09:23:00 +02:00
Mini-Chiss	ade76791b3	optimized item cleaning	2015-08-12 09:12:49 +02:00
Sarah	a1ba0f6d86	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex	2015-08-12 09:01:20 +02:00
Sarah	2a40eee9e7	Increasing radius of items despawning.	2015-08-12 09:00:13 +02:00
Mini-Chiss	d6f17c609b	carl	2015-08-12 08:58:46 +02:00
Mini-Chiss	7ea148a802	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-12 08:58:36 +02:00
Sarah	e4eb286225	Fixing despawning.	2015-08-12 08:56:20 +02:00
Mini-Chiss	c00f9a7aaa	Merge branch 'Bonus'	2015-08-12 08:39:31 +02:00
Sarah	be699558f1	Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus	2015-08-12 08:38:18 +02:00
Sarah	af19754bcd	Implementing Carl to Arcade.	2015-08-12 08:37:54 +02:00
Mini-Chiss	7cda53cb28	carl spinner in arcade/ tutorial fixes	2015-08-12 08:36:21 +02:00
Mini-Chiss	e8963cc2af	fixed paintbrush	2015-08-12 08:10:43 +02:00
Mini-Chiss	2ed388552b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-12 07:59:39 +02:00
Shaun Bennett	99a94251fd	Fixes	2015-08-12 00:56:20 -05:00
Shaun Bennett	8e4ae35256	Merge remote-tracking branch 'remotes/origin/master' into Bonus	2015-08-12 00:56:04 -05:00
Shaun Bennett	4549c810d4	Fix for voting	2015-08-11 22:59:59 -05:00
Mini-Chiss	a7cc3e1aa6	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-08-11 21:13:59 +02:00
Mini-Chiss	d41ab3432f	remove paintbrush when moved away	2015-08-11 21:13:45 +02:00
libraryaddict	72adf21bff	Gadget Paintball: Add particles on impact, change block break effect to stone break sound.	2015-08-12 06:23:13 +12:00
fooify	07bdbdde46	minor grammar issue	2015-08-11 09:55:10 -07:00
fooify	ddc663cc75	remove duplicate method	2015-08-11 09:52:04 -07:00
fooify	10f979772b	Merge remote-tracking branch 'origin/master' into foo	2015-08-11 09:51:13 -07:00
fooify	356060eedc	more amazing changes	2015-08-11 09:41:26 -07:00
fooify	c6ec60700c	monster maze is really working now! :D	2015-08-11 09:04:45 -07:00
Mini-Chiss	18843c2cc6	Merge branch 'Bonus'	2015-08-11 17:05:59 +02:00
Mini-Chiss	83a010c215	enabled summer sale msg	2015-08-11 17:05:41 +02:00
Mini-Chiss	89dab7ec85	some little fixes	2015-08-11 16:33:32 +02:00
Sarah	f7d9476191	Hidden egg fix	2015-08-11 13:53:36 +02:00
Sarah	5c7d140521	Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus	2015-08-11 13:49:53 +02:00
Sarah	e25558fc91	Animation improvements.	2015-08-11 13:49:06 +02:00
Mini-Chiss	cfcfbbed3b	removed double gem	2015-08-11 13:34:32 +02:00
Mini-Chiss	49d54d4dd3	doesnt count rank thingy as reward if no rank. yknow	2015-08-11 13:22:58 +02:00
Mini-Chiss	b348c62a3f	Merge branch 'EventGameUpdates'	2015-08-11 13:01:33 +02:00
Sarah	2d7d7f6dde	Improving messages, animations and some Items.	2015-08-11 13:01:20 +02:00
Sarah	f3558b144c	Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus	2015-08-11 12:05:23 +02:00
Sarah	c821523240	removed vote broadcast.	2015-08-11 12:04:54 +02:00
Shaun Bennett	1c484367a1	Add hasPoll	2015-08-11 04:57:45 -05:00
Shaun Bennett	3eb7e91fbb	Removing the magical 3	2015-08-11 04:38:37 -05:00
Sarah	8abefaf856	The magical +3.	2015-08-11 11:31:51 +02:00
Mini-Chiss	4c32f32ced	removed game reward type	2015-08-11 11:17:20 +02:00
Mini-Chiss	74b83d6851	fixed!	2015-08-11 10:56:07 +02:00
Mini-Chiss	184feec875	cleany and logic	2015-08-11 10:54:24 +02:00
Mini-Chiss	f66a0439e8	no need to gen so many	2015-08-11 10:34:33 +02:00
Mini-Chiss	a1c10a7ec5	clean up	2015-08-11 10:33:44 +02:00
Mini-Chiss	1c40478e6e	SPIN DOGGY SPIN	2015-08-11 10:32:49 +02:00
Shaun Bennett	fe153bee11	Fix revert issues	2015-08-11 03:19:27 -05:00
Shaun Bennett	184c592786	Merge remote-tracking branch 'origin/Bonus' into Bonus Conflicts: Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/VoteButton.java	2015-08-11 03:12:55 -05:00
Shaun Bennett	13e7e58986	Creeper visual!	2015-08-11 03:09:21 -05:00
Shaun Bennett	c177307f70	Votifier fixes	2015-08-11 02:53:54 -05:00
Sarah	2c30d20cb1	changing OP method, setHost permissions and /e command.	2015-08-11 09:26:01 +02:00
Sarah	b99c526169	Implementing Carl message.	2015-08-11 09:09:16 +02:00
Shaun Bennett	5d3503b733	Carl rewards	2015-08-11 01:55:27 -05:00
Sarah	d457e3a955	changing the setOP Event.	2015-08-11 08:36:39 +02:00
Shaun Bennett	d2983b831e	Merge remote-tracking branch 'origin/Bonus' into Bonus	2015-08-11 00:35:44 -06:00
Shaun Bennett	d833385df4	Fix carl spinner and ticket command, Fix polls not displaying in available count, Visual fixes	2015-08-11 00:35:02 -06:00
Mini-Chiss	66f2a5df5e	renamed GAME	2015-08-11 08:32:12 +02:00
Mini-Chiss	b4e8b4f1ac	cant go spinnin while its a countin!	2015-08-11 08:24:28 +02:00
Sarah	3bedc4ce84	Improving animation timing.	2015-08-11 05:37:58 +02:00
Mysticate	bd414cd231	Merge remote-tracking branch 'origin/master' into Myst_EVO Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java	2015-08-10 19:47:53 -04:00
Mysticate	873a2f3c56	Changed slowness from 255 - 2	2015-08-10 19:45:40 -04:00
Mysticate	e81a3f7ecd	Added a method to UtilAlg.	2015-08-10 14:32:49 -04:00
Mysticate	a618b19b73	Small changes	2015-08-10 14:32:35 -04:00
Sarah	fef269b856	Fixing /e set.	2015-08-10 17:28:27 +02:00
Sarah	186e3028c2	removing temp fix "there was an error processing your request" for the Spinner.	2015-08-10 17:15:56 +02:00
Sarah	3be811e480	Fixing Spinner announcements.	2015-08-10 17:08:03 +02:00
Sarah	ed7b8949bb	Adding SpinnerFiller and SpinnerRewards.	2015-08-10 17:04:47 +02:00
Sarah	2253a63e96	Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus	2015-08-10 16:43:05 +02:00
Sarah	c6beb122e3	Adding firework animations for spinner.	2015-08-10 16:42:43 +02:00
Mini-Chiss	ad8781fd84	Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus	2015-08-10 16:14:24 +02:00
Mini-Chiss	18d11f7d68	new enums	2015-08-10 16:13:17 +02:00
Sarah	7492ed310e	Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus	2015-08-10 15:33:26 +02:00
Sarah	65fc81a2aa	improving animations again.	2015-08-10 15:33:00 +02:00
Mini-Chiss	db70df1bf4	Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus	2015-08-10 14:51:39 +02:00
Mini-Chiss	65b51a137c	new party tute room	2015-08-10 14:50:44 +02:00
Mysticate	1804d668e1	A few small tweaks. Removed the "Frozen" effect.	2015-08-10 08:42:03 -04:00
Sarah	aea081c292	Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus	2015-08-10 14:01:12 +02:00
Sarah	5781009f4e	Improving animations and some text.	2015-08-10 14:00:40 +02:00
Mini-Chiss	bd2c9aa5e6	hub stuff	2015-08-10 14:00:02 +02:00
Shaun Bennett	aa13bcf5c6	Bug fix!	2015-08-10 04:54:01 -05:00
Shaun Bennett	adb76b0681	Fix giving out gold	2015-08-10 04:51:46 -05:00
Shaun Bennett	8745884153	Various fixes	2015-08-10 04:51:11 -05:00
Shaun Bennett	b8b19ed4a5	Merge remote-tracking branch 'remotes/origin/master' into Bonus # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java # Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java # Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java # Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2015-08-10 03:24:59 -05:00
Shaun Bennett	6f8d6f8a40	Move Bonus and Poll to core	2015-08-10 01:55:50 -05:00
Shaun Bennett	a0be3fa964	Use atomic mysql operations for modifying tickets	2015-08-10 01:19:10 -05:00
Shaun Bennett	511cc76bef	Allow servers to process votifier votes, redis command gets sent to all servers (Until I can figure out why EU playertracker isnt working)	2015-08-10 00:47:36 -05:00
Shaun Bennett	28806aaf0a	Update Bonus amounts, Attempting to fix Votifier plugin for EU/US	2015-08-10 00:33:54 -05:00
Mysticate	463dfc7049	Minor Tweaks. • Fixed wrong evo location • Added a "Frozen" effect when evolving.	2015-08-10 00:21:48 -04:00
Mysticate	a19cd3559d	Renamed "Shift" to "Crouch"	2015-08-09 23:26:59 -04:00
Mysticate	158dcdc01e	Created a new way to Evolve. • Getting a kill presents you the option "Hold Shift to Evolve" • Holding shift for about 5 seconds evolves you as normal.	2015-08-09 23:25:26 -04:00
Shaun Bennett	d20fe54010	Disable carl features when carl can't be found	2015-08-09 16:36:48 -05:00
Mysticate	f8a6a25b46	Various Fixes. • Merged w/ master • Changed to William's method of Projectile limiting. - Prevented TNT hitting Teammates • Fixed gem count for Sniper • Added gems for direct hits + TNT Thrown • Removed assists counting for kills in 6 kill.	2015-08-09 15:01:27 -04:00
Mysticate	d9a8830e75	Few changes	2015-08-09 14:34:55 -04:00
Mini-Chiss	c2d066a576	ui fixes	2015-08-09 19:31:24 +02:00
Mini-Chiss	41dcc564c9	polish polish polish MAKE IT SHINE!	2015-08-09 19:02:07 +02:00
Mini-Chiss	ee65c72e86	and wizards!	2015-08-09 18:46:02 +02:00
Sarah	8c66ef7f15	changing Hub items and adding Profile GUI.	2015-08-09 18:33:44 +02:00
Mini-Chiss	fdfc9ae99d	longer games wont announce stay msgs	2015-08-09 18:17:29 +02:00
Sarah	ac5ff08fad	Git fix	2015-08-09 17:23:38 +02:00
Mini-Chiss	5a7de8ef3d	hub fixes	2015-08-09 17:21:56 +02:00
Sarah	0d70fb6b96	removing deop of Admins and adding OP condition to setHost.	2015-08-09 16:55:10 +02:00
Sarah	941e746ca9	Finalizing Poll GUI in Carl's GUI.	2015-08-09 16:47:03 +02:00
Sarah	85c8e42f53	Finalizing and improving the Carl spinner and adding creeper explosion animations.	2015-08-09 15:00:54 +02:00
Mysticate	b9edb92c1e	Ready for full on testing.	2015-08-09 01:08:43 -04:00
Mini-Chiss	b974fcf838	map parser fixes	2015-08-09 00:09:26 +02:00
Shaun Bennett	e6519206af	Add event to be called when a player tries to buy a carl spin	2015-08-08 16:29:03 -05:00
Mysticate	5298fa341e	Removed the revolving thing.	2015-08-08 16:13:54 -04:00
Mini-Chiss	cbb0cb96c8	ensured white	2015-08-08 13:54:35 +02:00
Mini-Chiss	e030331565	fixed some bugs	2015-08-08 13:51:37 +02:00
Mini-Chiss	fa7f19bde5	removed debug	2015-08-08 13:47:30 +02:00
Mini-Chiss	328c31de88	hub Update fixed bad gameid	2015-08-08 13:47:09 +02:00
Shaun Bennett	4f6dfdb856	Update carl spin button to consume tickets, Updates to Votifier Plugin, Redis Vote Command, Various bug fixes	2015-08-08 06:35:25 -05:00
Mini-Chiss	eab7aa59f2	hub update!	2015-08-08 09:27:49 +02:00
Mini-Chiss	47cb98066d	Hub fixes	2015-08-08 08:19:07 +02:00
fooify	db521668a9	more changes! it's getting pretty cool now x)	2015-08-07 14:20:15 -07:00
Mini-Chiss	33c96f51ae	fixed some stuff	2015-08-07 22:59:50 +02:00
Mini-Chiss	090c1f135d	Merge branch 'SarahsAwesomeBugFixes' Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java	2015-08-07 21:48:35 +02:00
Mini-Chiss	b22706e649	hub update part 1	2015-08-07 21:45:38 +02:00
Mysticate	858e57bb0d	edited a few things	2015-08-07 14:39:29 -04:00
fooify	f70b1231ab	AI fixes and such for Monster Maze	2015-08-07 10:32:31 -07:00
Mysticate	a9350bfacd	Merge remote-tracking branch 'origin/master' into Myst_EVO	2015-08-07 11:58:53 -04:00
Shaun Bennett	f76d9b0d37	Replace Consumers with Callbacks	2015-08-07 04:20:54 -05:00
Shaun Bennett	5ebc7080ee	Push fixes	2015-08-07 04:13:09 -05:00
Jonathan Williams	fcfb63c47d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-08-07 02:23:10 -05:00
Jonathan Williams	320a3efe5b	Remove some debug code.	2015-08-07 02:22:58 -05:00
Jonathan Williams	e8c60e6e84	Added storage of pets in mysql. Going to have live while backend process is copying data over. Updated ServerTypePage to resolve clicking issues with solo/team pages.	2015-08-07 02:22:13 -05:00
Sarah	181b778a9c	Fixing some bugs and disallow MPS while disguised.	2015-08-07 07:39:40 +02:00
Morten	f37e25e9d7	Finish push for today <3	2015-08-07 07:03:15 +02:00
Morten	608e8bf693	For Sarah <3	2015-08-07 05:40:16 +02:00
Shaun Bennett	5f435a079e	Update vote button	2015-08-06 21:59:21 -05:00
Shaun Bennett	be18dc1bf5	Add experience rewards to reward manager	2015-08-06 21:41:56 -05:00
Shaun Bennett	6311ceaa0f	Reward work for new Game reward rarity and setup for carl, work on carl spinner	2015-08-06 21:15:17 -05:00
Morten	1680b652db	Added Hat layer skin Added Sneak animation With love from Morten <3	2015-08-07 03:10:17 +02:00
Shaun Bennett	44e30a0903	SimpleGui Improvements, Change daily timer to 20 hours, Add Carl Spin button, Starter code for Spin Gui	2015-08-06 15:34:56 -05:00
Sarah	d8041ba582	Fixing Players can disguise as disguised Players.	2015-08-06 20:57:56 +02:00
fooify	67bbd3a605	kk did merge	2015-08-06 10:16:37 -07:00
fooify	0a9f7cc888	Merge remote-tracking branch 'origin/master' into monster-maze	2015-08-06 10:13:54 -07:00
fooify	f27ca9ba71	still working on merge	2015-08-06 10:13:34 -07:00
fooify	42868b2a0a	trying to merge...	2015-08-06 10:09:13 -07:00
fooify	9e92a3a68d	more changes (not really ready for testing yet though...)	2015-08-06 09:44:00 -07:00
Mini-Chiss	ebbc13c0a4	lowered headshot damage	2015-08-06 17:07:52 +02:00
Shaun Bennett	c67f4fa7e6	Votifier fixes	2015-08-06 06:45:47 -05:00
Sarah	4a10f8d71a	fixing very last bugs. Ready to push!!!	2015-08-06 13:23:38 +02:00

... 18 19 20 21 22 ...

5708 Commits