Mineplex2018-withcommit

JarvisBigBalls/Mineplex2018-withcommit

Author	SHA1	Message	Date
William Burns	0d4bd91b57	lag detection thing	2015-12-11 22:47:07 +00:00
Sarah	09e5aed6e7	Adding some descriptions.	2015-12-11 22:06:23 +01:00
Morten	bfaaf0a33b	Did some reguested bug fixed and challenge changes	2015-12-11 20:49:39 +01:00
xGamingDudex	6d1e4b6cab	Merge remote-tracking branch 'origin/master' into project-cosmetics	2015-12-11 18:09:09 +01:00
William Burns	6456d7bd66	Scoreboard change and breaking blocks.	2015-12-11 16:55:15 +00:00
William Burns	1dcbf5f7fd	Couple of fixes	2015-12-11 16:34:04 +00:00
Thanos paravantis	d7bef0d117	Fishing Day and Anvil Dance fixes and minor changes. - Changed TNT spawn criteria, now only spawning while fishing hook is in water. - Changed grass on Fishing Day map, excluded possible spawn locations that are included in spawn points. - Fixed fireworks from Anvil Dance spawning on other challenges.	2015-12-11 18:12:06 +02:00
Thanos paravantis	3f4980a90f	Merge branch 'master' into thanos-mineware	2015-12-11 13:32:24 +02:00
Shaun Bennett	ac6d3c2c8f	merge with master	2015-12-11 06:27:23 -05:00
Cheese	d7f39bdfd8	costume sets	2015-12-11 20:59:55 +11:00
William Burns	523c1875ef	fix	2015-12-11 06:58:11 +00:00
Jonathan Williams	95a81ef368	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java	2015-12-11 01:26:20 -05:00
Jonathan Williams	222173ab17	Improved and implemented GameProfile caching.	2015-12-11 01:24:59 -05:00
AlexTheCoder	42065fc5dc	- Fixed duplicate code	2015-12-10 23:22:08 -05:00
AlexTheCoder	6878e4489d	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2015-12-10 22:49:19 -05:00
AlexTheCoder	fe933913e8	- Fixed maps - Spawners	2015-12-10 22:48:57 -05:00
Virizion	68360c6705	shortened if	2015-12-10 22:17:10 -05:00
William Burns	a760dba783	i lied.	2015-12-11 02:59:16 +00:00
William Burns	7a597d90b7	final push goodnight	2015-12-11 02:48:06 +00:00
William Burns	1607345f04	title + debug	2015-12-11 02:41:44 +00:00
William Burns	563a0f0ec7	remove tutorial and no flicker	2015-12-11 02:30:44 +00:00
Shaun Bennett	2694787590	Reverting	2015-12-10 20:59:57 -05:00
William Burns	f8d7aeb5ea	before revert	2015-12-11 01:32:32 +00:00
William Burns	dda5ac6728	work	2015-12-11 01:20:36 +00:00
Sarah	4abad9e1c4	fixing chat and test commands.	2015-12-11 02:00:26 +01:00
Sarah	ffb75a7832	Adding CustomEnding	2015-12-11 01:44:19 +01:00
William Burns	626a812844	Many changes	2015-12-11 00:40:54 +00:00
Shaun Bennett	a9e6224eca	Merge remote-tracking branch 'origin/project-cosmetics' into project-cosmetics Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2015-12-10 19:21:33 -05:00
Shaun Bennett	72a8aaf556	Merge remote-tracking branch 'remotes/origin/master' into project-cosmetics Conflicts: Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java	2015-12-10 19:18:49 -05:00
xGamingDudex	a6a4c8be36	Cosmetic Update + Added GadgetDisable Event + Renamed GadgetActivateEvent to GadgetEnable event + Added hat framework, and some example hats + Added sets and Frost Lord set + Fixed some imports + Added new way of checking ownership of gadgets + Added some utility methods to GadgetManager + Added support for alternative package name of gadgets + Fixed coal + New Blood Helix particle	2015-12-11 01:05:32 +01:00
William Burns	4cf33eef05	Tutorial changes!	2015-12-10 21:32:14 +00:00
William Burns	624e8bbe89	Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators	2015-12-10 20:56:03 +00:00
William Burns	0bd276c16a	Merge branch 'pregametutorial' of ssh://184.154.0.242:25565/min/mineplex into pregametutorial	2015-12-10 20:53:01 +00:00
William Burns	8d7b03e3f6	Added the ability to have title AND subtitle per TutorialText.	2015-12-10 20:52:41 +00:00
William Burns	2951088005	Tutorial changes/additions.	2015-12-10 20:48:13 +00:00
Virizion	c73bd54aec	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-10 15:38:17 -05:00
William Burns	3586642414	Added back the tutorial.	2015-12-10 19:32:25 +00:00
William Burns	af7c058f22	Lots of bug fixes / additions since the testing 12/9/15.	2015-12-10 19:06:07 +00:00
Sarah	0f8028f6e6	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java	2015-12-10 12:24:11 +01:00
Thanos paravantis	e17669427e	Merge branch 'master' into thanos-mineware Conflicts: Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs	2015-12-10 10:03:41 +02:00
Thanos paravantis	e6125b74ef	Commit all changes before pulling from master.	2015-12-10 09:59:37 +02:00
libraryaddict	1ee1e7a04b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-12-10 20:02:39 +13:00
libraryaddict	eaf3937004	Fix the damage while walking on falling block	2015-12-10 20:02:12 +13:00
Virizion	0e9d401717	Restore block when break is cancelled because it can be in the air phase and not get restored.	2015-12-09 22:32:39 -05:00
Virizion	9b53e15b4f	More stuff.	2015-12-09 21:38:00 -05:00
Virizion	662d3b464f	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-09 21:15:39 -05:00
Virizion	0ff87cf134	Stuff.	2015-12-09 21:14:45 -05:00
Cheese	fabf3dab59	updated blocksearch	2015-12-10 13:12:01 +11:00
Sarah	c94c84f203	Some fixes	2015-12-10 02:59:22 +01:00
Sarah	76b29756ff	Fixing some stats and disabling Chat spam messages.	2015-12-10 02:02:36 +01:00
Virizion	be6f9ac6dc	Capitalize enum names.	2015-12-09 19:17:12 -05:00
William Burns	87a834c01b	FIX	2015-12-10 00:03:57 +00:00
William Burns	90896073d4	debug	2015-12-10 00:03:17 +00:00
William Burns	cea2716851	fight man	2015-12-09 23:59:20 +00:00
William Burns	05bd55f720	iter	2015-12-09 23:53:04 +00:00
William Burns	b8a2304edd	work	2015-12-09 23:39:00 +00:00
William Burns	3ad0a3db6e	fix	2015-12-09 23:14:08 +00:00
William Burns	17c989d941	Less per-player arena stuff	2015-12-09 22:39:04 +00:00
William Burns	513db5dd8d	doing byes	2015-12-09 21:33:31 +00:00
William Burns	852be97bae	Work	2015-12-09 20:16:16 +00:00
Keir	8459cf0f95	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java	2015-12-09 18:13:26 +00:00
Sarah	a5c46545df	fixing timer being shown.	2015-12-09 14:44:22 +01:00
Virizion	507761d5b0	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-08 21:24:21 -05:00
William Burns	c021fbf9ed	Bounce baby bounce.	2015-12-08 23:27:38 +00:00
William Burns	d709071feb	Much fix, many wow.	2015-12-08 23:20:42 +00:00
Shaun Bennett	2e49611035	LinkedHashMaps, Buttons	2015-12-08 17:45:27 -05:00
Shaun Bennett	7f75749194	Merge remote-tracking branch 'origin/master'	2015-12-08 16:55:14 -05:00
Cheese	26c5c419f8	fixed a bug where old displayName would be used after name was updated.	2015-12-09 08:38:05 +11:00
Sarah	484dce18e1	Changing some Achievement things, to allow double values and dividing, Adding WPM, fixing some bugs.	2015-12-08 22:34:42 +01:00
Virizion	8051486fcb	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-08 16:14:41 -05:00
William Burns	a83ede3caa	Handling slow movers	2015-12-08 21:14:19 +00:00
William Burns	7bdbd5a6af	Woo almost done!	2015-12-08 21:10:27 +00:00
Cheese	2decc049c5	fixed my muddling of perks	2015-12-09 07:47:07 +11:00
Christopher Jozsa	0b8e0409b6	Merge pull request #92 in MIN/mineplex from update-SSM to master * commit '504a49278cb7e140029e4c2ceb85f3defe524a33': SSM kit description change, grammar mistake SSM Pig bomb bug fix	2015-12-08 14:29:32 -06:00
Shaun Bennett	ca71f1f64f	Merge remote-tracking branch 'origin/master'	2015-12-08 14:32:17 -05:00
William Burns	d598f83ec0	More progress	2015-12-08 18:17:43 +00:00
Teddy	504a49278c	SSM kit description change, grammar mistake	2015-12-08 16:35:49 +00:00
William Burns	f8f95c64e5	Fixing arena moving	2015-12-08 15:10:29 +00:00
William Burns	4e2a422f27	Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java	2015-12-08 13:13:18 +00:00
William Burns	2b12016e14	Progress	2015-12-08 13:12:30 +00:00
Shaun Bennett	addb2c8c0e	Fix java 8 compiler issue	2015-12-08 08:02:40 -05:00
William Burns	e6d995008e	Arenas	2015-12-08 10:44:24 +00:00
Virizion	d22a905206	Lot more stuff! :D	2015-12-07 23:29:33 -05:00
Shaun Bennett	42a0354c9e	Now Playing, Preference to disable ads	2015-12-07 18:28:05 -05:00
William Burns	43192317ad	Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators	2015-12-07 23:20:21 +00:00
William Burns	55f0453897	Start of re-write	2015-12-07 23:20:03 +00:00
Virizion	ec4a21a282	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-07 18:19:16 -05:00
Sarah	0619fb857f	fixing invisibility.	2015-12-07 23:44:02 +01:00
Keir	67b3fe1d23	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java	2015-12-07 18:11:40 +00:00
Sarah	3f7eef35d5	Forcefield range.	2015-12-07 18:59:06 +01:00
Sarah	dfb1837e81	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java	2015-12-07 18:54:19 +01:00
Shaun Bennett	7984c0ac31	Add !	2015-12-07 06:12:49 -05:00
Cheese	a39b11ce67	slowed meteors	2015-12-07 21:56:00 +11:00
Cheese	d318a5cf87	interacto!	2015-12-07 21:53:34 +11:00
Cheese	e1efcabfbf	chat sale msgs	2015-12-07 20:39:31 +11:00
Cheese	7b11baf24b	Christmas sale bossbars	2015-12-07 20:20:49 +11:00
Cheese	8c4615203c	sale message	2015-12-07 20:07:20 +11:00
Cheese	ed3bea8e85	DONE!	2015-12-07 18:36:05 +11:00
Cheese	5c632a1e3a	sharper target	2015-12-07 18:20:12 +11:00
Cheese	1a0d90a495	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-07 18:06:43 +11:00
Cheese	fea637db80	fixed some freeze	2015-12-07 18:06:26 +11:00
Shaun Bennett	ecde1dd314	Merge remote-tracking branch 'origin/master'	2015-12-07 02:06:09 -05:00
Shaun Bennett	44a5bcb793	remove titan chest message, update pumkin message, holiday MB/DMT words	2015-12-07 02:06:00 -05:00
Cheese	d75d7a2c8f	snowfight finish	2015-12-07 17:56:35 +11:00
Cheese	1ada06af91	rewrote lots!	2015-12-07 17:36:45 +11:00
Virizion	6904f7c9a9	Tons more stuff on the checklist.	2015-12-06 22:54:45 -05:00
Cheese	5486d8acf6	more prep	2015-12-07 13:42:59 +11:00
Cheese	54ec0e39bb	more polisshhhh on snowfight enabled xmas chests	2015-12-07 13:25:32 +11:00
Cheese	cbafb2ba91	fixes	2015-12-07 13:04:45 +11:00
Cheese	0c397d6a81	simplified kits and intro	2015-12-07 13:02:26 +11:00
xGamingDudex	c36182b8d4	Cosmetic Update New: + New GUI System + Candy Cane Particle + Candy Cane Double Jump + Candy Cane Death Effect + Candy Cane Arrow Trail + Snowman Morph + Baby Reindeer Mount + Pet Coal Apparition Fixed/Updated: * Added getTick to UpdateEvent and UtilTime * Added more methods to UtilParticle * Gadget manager isMoving now counts flying as moving * Updated some cosmetics	2015-12-07 02:53:14 +01:00
Cheese	b2a595b01b	snwo fight changes	2015-12-07 12:02:53 +11:00
Mysticate	09f7a03444	Quick changes to improve things.	2015-12-06 20:00:22 -05:00
AlexTheCoder	118bde5484	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2015-12-06 19:57:27 -05:00
Sarah	072856be7d	teleportations.	2015-12-06 23:19:53 +01:00
Mysticate	b5967a1205	Uncommented bouncy balls	2015-12-06 17:14:51 -05:00
Mysticate	e74b83f8f2	Merge remote-tracking branch 'origin/master' into update-paintball	2015-12-06 17:12:29 -05:00
Mysticate	5e57caa94d	Final tweaks to random armorstand	2015-12-06 17:09:33 -05:00
Cheese	6f16eeead7	missin files	2015-12-07 08:48:55 +11:00
Sarah	10d26ca32b	timer fixes.	2015-12-06 22:41:04 +01:00
Virizion	ca7e5d0d6d	remove later	2015-12-06 16:37:00 -05:00
Sarah	64f8ee7280	fixing some timings.	2015-12-06 21:48:21 +01:00
Sarah	3260550368	adding proper forcefield for minions and giants.	2015-12-06 19:38:23 +01:00
Mysticate	88dcdaa445	Merge remote-tracking branch 'origin/master' into update-paintball Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java	2015-12-06 12:00:06 -05:00
Mysticate	11b2748a5a	Quick thing before merge	2015-12-06 11:45:10 -05:00
AlexTheCoder	4278f3fa99	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla	2015-12-06 03:51:08 -05:00
AlexTheCoder	430de10008	- Everything except maps [probably should've committed sooner]	2015-12-06 03:47:07 -05:00
Cheese	35c362b8bf	small youtuber perms	2015-12-06 18:08:36 +11:00
Cheese	d095e14b4c	Merge branch 'monster-league'	2015-12-06 16:33:21 +11:00
Cheese	9880e9a3c7	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-12-06 16:32:59 +11:00
Cheese	040e94f1fb	bouncy	2015-12-06 16:32:45 +11:00
Shaun Bennett	32a6d572ee	Disable gadgets in arcade for player count > 40	2015-12-05 22:56:15 -05:00
Cheese	5aabd00972	set hub to christmas removed snowball pickup disabled arrows sticking into players from ALL projectiles	2015-12-06 14:55:28 +11:00
Virizion	9144ab7b3f	Fixed some demolition stuff.	2015-12-05 20:30:21 -05:00
Virizion	d3ce0d6434	Some more stuff on the checklist.	2015-12-05 19:57:48 -05:00
Sarah	114ae33d89	fixing spawns and monster slowdown.	2015-12-06 00:00:50 +01:00
Sarah	90c6d0a83f	spelling fixes, disabling Particles, fixing mob limit.	2015-12-05 22:17:45 +01:00
Thanos paravantis	b64f561659	Merge branch 'MortensRawBugFixes' into thanos-mineware Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java	2015-12-05 22:54:50 +02:00
Thanos paravantis	a943808250	Remove old unused build race challenge.	2015-12-05 22:52:52 +02:00
Morten	e8f7b140df	Added Achievements and fixed bugs.	2015-12-05 21:47:13 +01:00
Sarah	4c4b997453	fixing giant facing.	2015-12-05 19:00:44 +01:00
Virizion	62c49fa8e6	some more stuff on the checklist	2015-12-04 23:04:52 -05:00
Keir	ef6fd0eaa3	Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java # Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java # Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java	2015-12-05 00:05:05 +00:00
Sarah	a3d6af884d	spawns after tutorial and Giants facing each other.	2015-12-05 00:57:27 +01:00
Cheese	4a53667539	gadget restructure converted frost lord and titan particles into 4 subcategories.	2015-12-05 10:22:00 +11:00
Thanos paravantis	91e0547612	Merge branch 'master' into thanos-mineware Conflicts: .gitignore	2015-12-04 22:04:46 +02:00
Thanos paravantis	e27ce2587d	Finalizing Fishing Day Challenge.	2015-12-04 22:01:47 +02:00
Sarah	35534afd4a	overall runtime.	2015-12-04 19:54:02 +01:00
Sarah	1bb40b21d3	Tutorial/Phase Time.	2015-12-04 19:49:28 +01:00
Virizion	efbabb1519	Players now look at the middle of the middle block instead of the corner.	2015-12-03 21:27:10 -05:00
Virizion	465f8c28f6	Set FixSpawnFacing to false so that out looking at the middle feature would work.	2015-12-03 21:13:33 -05:00
Virizion	bb708911d6	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-12-03 21:10:31 -05:00
Virizion	9951701ded	Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it.	2015-12-03 19:51:11 -05:00
fooify	91aaf5f2fb	world's smallest bugfix - admin->co-host	2015-12-03 16:45:30 -08:00
fooify	348f2d8e4c	Merge remote-tracking branch 'origin/master' into foo	2015-12-03 16:31:16 -08:00
Sarah	19254fc4a0	Prepare Timer flag.	2015-12-03 18:06:27 +01:00
Virizion	ee51766e1f	Removed teleports. Made the spawns face the middle but it doesn't work yet because of GameTeam changing the direction again.	2015-12-02 22:12:53 -05:00
Virizion	f0c28e6234	Updated references to the util method.	2015-12-02 20:20:14 -05:00
Sarah	27f335779a	adding tutorial sounds and flag for it.	2015-12-02 19:39:44 +01:00
Keir	9508556d57	Refactor.	2015-12-01 22:47:51 +00:00
Sarah	b0e16f6612	Zombie smash Color.	2015-12-01 17:05:55 +01:00
Sarah	d335e58652	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java	2015-12-01 17:01:44 +01:00
fooify	06ef964000	removed important debug thing	2015-11-30 19:33:03 -08:00
fooify	ed96c8e3b3	fixed ssm enderman always facing south on teleport	2015-11-30 19:27:34 -08:00
Virizion	1ad534366e	Switch item dropping to the new util method.	2015-11-30 22:09:15 -05:00
Virizion	d24135771f	Fixed formatting by adding bodies to all for loops.	2015-11-30 19:10:59 -05:00
Virizion	ae8a10d55d	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-11-30 18:50:21 -05:00
Cheese	7217cd0f33	remove conditions upon death	2015-12-01 10:44:13 +11:00
Sarah	e2cfcef55b	RunTasksSync Flag.	2015-11-30 16:58:41 +01:00
Sarah	dc68375ec8	TimeBetweenPhase Flag.	2015-11-29 21:48:39 +01:00
Virizion	e7960d65e0	Moved classes into separate packages so it is more organized.	2015-11-29 14:36:51 -05:00
Virizion	840b784239	Removed some redundant calls and replaced them with a call to one method.	2015-11-29 13:42:30 -05:00
Virizion	e09e5851a6	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-11-29 01:17:17 -05:00
Sarah	66fd85af1f	Adding Phase Event.	2015-11-28 23:32:09 +01:00
Virizion	278082caed	Finished the checklist. I might recode eliminations since I kind of don't like it right now.	2015-11-28 15:18:06 -05:00
fooify	8cdae7ce1a	Merge remote-tracking branch 'origin/master' into foo	2015-11-28 09:33:47 -08:00
fooify	0dff0ffe1d	fixed bacon blast exloding blocks fixed sg compass pointing to teammates	2015-11-28 09:32:54 -08:00
Thanos paravantis	eb820b4650	Change alive check with isDone() method. Make explosions on fishing day more realistic.	2015-11-28 17:03:10 +02:00
libraryaddict	28947643e0	More updates for dual version	2015-11-29 02:54:16 +13:00
libraryaddict	d4ab57e4e7	Update for 1.9 dual version	2015-11-28 19:38:58 +13:00
Cheese	963caae719	Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes'	2015-11-28 16:00:28 +11:00
Sarah	ad54d28b0d	fixing teleportation issues.	2015-11-27 22:29:29 +01:00
Thanos paravantis	8d58cb9055	Update Fishing Day challenge.	2015-11-27 22:14:13 +02:00
Sarah	fd0c5cf273	Adding some more flags.	2015-11-27 20:47:57 +01:00
Sarah	e81aa72c7e	Merge branch 'rankdescriptions' of http://184.154.0.242:7990/scm/min/mineplex	2015-11-27 20:33:18 +01:00
Thanos paravantis	2b48745ba0	Sort methods and event listeners, remove outdated custom fishes, organize imports.	2015-11-27 18:51:27 +02:00
Thanos paravantis	7a7a274b40	Update Fishing Day challenge.	2015-11-27 18:45:54 +02:00
Shaun Bennett	a5ebf9b059	Fixes for release	2015-11-27 05:53:57 -05:00
Shaun Bennett	0b0710458f	Hub updates/try to fix chiss stuff	2015-11-27 03:22:17 -05:00
Cheese	4e2f48b37e	Merge branch 'master' into clans-beta Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java	2015-11-27 19:16:30 +11:00
Virizion	3d74c9ca05	Fixed some bugs and finished some items on the checklist, too many to put down here.	2015-11-26 23:10:19 -05:00
Keir	edf93ec43f	Initial ChatSnap implementation.	2015-11-26 16:55:27 +00:00
Sarah	9e1d522876	Increase Render distance on particles, Don't spawn mob until "protect him from evil minions" title appears and changing some timings.	2015-11-26 16:47:31 +01:00
Sarah	33383af18a	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-26 16:37:57 +01:00
Sarah	c74732af39	One more fix.	2015-11-26 16:37:18 +01:00
Sarah	cb67e42f96	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-26 16:27:24 +01:00
Sarah	21f859f579	fixing 2 seconds delay.	2015-11-26 16:26:49 +01:00
Sarah	efc05803ac	Minion spawn.	2015-11-26 16:25:44 +01:00
Sarah	40259a26f1	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-26 16:12:51 +01:00
Sarah	a653f053a5	Adding 2 Seconds delay.	2015-11-26 16:12:13 +01:00
Sarah	9f3c3589b2	Particle render distance.	2015-11-26 16:09:29 +01:00
Sarah	3128a6005b	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-26 16:06:53 +01:00
Sarah	eddbde5ebd	Changing length formula.	2015-11-26 16:06:15 +01:00
Virizion	de82806fc0	Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder	2015-11-25 22:53:06 -05:00
Virizion	6a6807d6f0	- Added time left progress bar - Added subtitle to countdown 5, 4, 3, 2, 1, TIME'S UP when a build is about to end - Added an elder guardian who floats and shoots lasers at the losers builds and blows the blocks up with an explosion - Added a subtitle to show who was eliminated - Prevented players from entering other build areas	2015-11-25 22:45:23 -05:00
libraryaddict	55ff04ca93	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex	2015-11-26 15:49:54 +13:00
libraryaddict	3e8a53562e	Add new hologram interaction thingy so holograms can catch interactions that they would normally block	2015-11-26 15:49:28 +13:00
Cheese	55f5f95869	added no ammo display	2015-11-26 13:05:27 +11:00
Cheese	65a1441e1f	-Fixed smoke being removed when bomb was planted in it -Fixed being unable to defuse bomb in smoke -Fixed older smokes removing newer intersecting smokes -Grenades will still detonate after being burned -Bizon now gives $600 per kill -Added replacement smoke on gun fire -Added shell ejecting particles on gun fire -Removed gun bobbing when firing -Changed ammo display location	2015-11-26 12:56:26 +11:00
Sarah	32ee1c285a	merging pregametutorial into type wars.	2015-11-26 00:29:28 +01:00
Sarah	063299ab3a	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-26 00:23:02 +01:00
Sarah	809faf3098	changing teleport mechanic.	2015-11-26 00:14:15 +01:00
Shaun Bennett	cc75bafb4c	Bugs and thugs	2015-11-25 16:45:04 -05:00
Thanos paravantis	941c996085	Update mineware class. Add underscore in variable name.	2015-11-25 23:18:27 +02:00
Thanos paravantis	e0bb8f60d4	Merge branch 'MortensRawBugFixes' into thanos-mineware Conflicts: Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeAnvilDance.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBlockLobbers.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBuildRace.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeFallingBlocks.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeFastFood.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeWaveCrush.java	2015-11-25 23:14:22 +02:00
Thanos paravantis	db8781cacb	Merge branch 'master' into thanos-mineware	2015-11-25 23:05:14 +02:00
Thanos paravantis	104beef730	Update branch with latest fishing day version.	2015-11-25 23:03:02 +02:00
Shaun Bennett	ff5d828dd7	Merge with master, lots of clans fixes/work	2015-11-25 14:50:49 -05:00
xGamingDudex	84fde1c087	Fixed double jump and entity ground tool. Fixed isGrounded so that it doesn't return false positives when too close to a wall. Added 500ms recharge to double jump, preventing instant recharge allowing players to jump twice before having to touch the ground again.	2015-11-25 16:42:32 +01:00
Sarah	de9262882a	fixing "enemy's" and some merge isssues.	2015-11-25 16:03:13 +01:00
Cheese	360f3db2ed	fixed grenade vertical rebound bug	2015-11-25 17:48:32 +11:00
Cheese	8ceb6ccfca	minestrike update!	2015-11-25 17:41:00 +11:00
Sarah	fac7d152ae	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gametutorial/TutorialPhase.java	2015-11-24 16:25:44 +01:00
Sarah	2a64d06bdd	removing some debug.	2015-11-24 16:24:22 +01:00
Sarah	95b4ad74e8	fixed silencing and adding possibilty to change text.	2015-11-24 16:23:03 +01:00
Sarah	7708f879dc	Fixing attack damage.	2015-11-24 16:15:07 +01:00
Sarah	49f6679537	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java	2015-11-24 15:43:59 +01:00
Sarah	46362a3d5f	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java	2015-11-24 15:38:52 +01:00
Cheese	913d079623	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-24 15:23:53 +11:00
Cheese	7454cf7443	MS + Champs bugs, balance and more	2015-11-24 15:23:37 +11:00
fooify	f300fd2c98	Merge remote-tracking branch 'origin/master' into foo	2015-11-23 15:34:27 -08:00
Sarah	66598ce97e	adding teleport flag.	2015-11-23 16:16:33 +01:00
Morten	19803a00ab	Added the Wither Assault fixes to it's own Branch	2015-11-22 19:06:24 +01:00
Morten	ccaa86662c	Added a bunch of changes + another game	2015-11-22 18:58:07 +01:00
Keir	f0e24468d5	Enable reporting functionality for Arcade and Clans plugins.	2015-11-22 14:23:17 +00:00
Virizion	ddc5427ae3	Merge branch 'master' into virizion_speed_builder # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java	2015-11-21 14:20:53 -05:00
Sarah	171696ff0d	final tutorial implementation.	2015-11-21 18:24:17 +01:00
Sarah	15032ac7ff	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-21 18:19:12 +01:00
Sarah	cba5aef9f1	small fix	2015-11-21 18:18:13 +01:00
Sarah	e10a63254a	saving typewars state	2015-11-21 18:16:24 +01:00
Sarah	746cc597ab	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-21 17:02:27 +01:00
Sarah	6a29d2a2d6	adding some getters.	2015-11-21 17:01:17 +01:00
Sarah	d0b5f6d8ac	starting implementation of Type wars tutorial.	2015-11-21 16:56:56 +01:00
Sarah	01f67e9d3e	Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars	2015-11-21 16:37:49 +01:00
Thanos paravantis	52f94f625f	Update Fishing Day challenge. - Update map creation. - Add explosion support if the player does not catch any fish.	2015-11-21 16:36:05 +02:00
Thanos paravantis	49b8aa74a6	Update Fishing Day challenge.	2015-11-21 13:26:58 +02:00
Thanos paravantis	19b79398da	Remove static and final keywords from constants.	2015-11-21 11:21:18 +02:00
Cheese	91e40d0e61	hide testing server MOTD	2015-11-21 13:37:19 +11:00
Cheese	5b8191e57c	fixed kick history stack direction	2015-11-21 11:42:59 +11:00
Cheese	02d09f2843	fixed slime dying bug removed morphs	2015-11-21 11:37:17 +11:00
Cheese	9ef99cee20	fixed merge issues	2015-11-21 11:21:54 +11:00
Cheese	6eb1bef1c6	Merge branch 'master' into minestrike-update Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java	2015-11-21 11:09:28 +11:00
Cheese	87a30513de	Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-21 11:08:23 +11:00
Cheese	4a0cc79abf	fixed silence not working in non-champs servers	2015-11-21 11:08:09 +11:00
AlexTheCoder	8b480cc32b	Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-20 18:40:42 -05:00
AlexTheCoder	1274dc860d	- Stuff for chiss	2015-11-20 18:40:20 -05:00
Cheese	2f91ca5a8a	fixed errors	2015-11-21 10:35:17 +11:00
Cheese	4a70e4da90	more fixies	2015-11-21 10:34:08 +11:00
Cheese	4d128d9c7a	fixed some skills and wierd hitbox error	2015-11-21 10:29:48 +11:00
Cheese	e0885feea6	Merge branch 'master' into alex-ctf	2015-11-21 09:40:07 +11:00
Sarah	97471b0d9c	Finalizing Game Tutorials.	2015-11-20 23:38:02 +01:00
Cheese	0bc64fec16	Proxy limit fixes	2015-11-21 09:28:15 +11:00
Thanos paravantis	473f0ebcc7	Add first work in progress version of Fishing Day challenge.	2015-11-20 23:27:32 +02:00
Cheese	cfc0aa7d05	reverted to size 2 ball	2015-11-21 08:20:02 +11:00
Sarah	2a4d20650a	Saving for branch switching.	2015-11-20 19:04:11 +01:00
Thanos paravantis	80c95f1995	Merge branch 'master' into thanos-mineware	2015-11-20 17:02:40 +02:00
AlexTheCoder	386032a4f5	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-20 06:03:30 -05:00
AlexTheCoder	f51358552a	-B	2015-11-20 05:57:29 -05:00
Cheese	3067d9f281	final push for the day	2015-11-20 15:22:43 +11:00
Cheese	ed2f3a064c	MORE ML!	2015-11-20 14:31:01 +11:00
Mysticate	3f37b893d3	Worked on double.	2015-11-19 20:29:20 -05:00
Cheese	3a5ab3f17c	Merge branch 'master' into monster-league	2015-11-20 11:51:07 +11:00
Cheese	1cc92cea1b	and the files	2015-11-20 11:50:33 +11:00
Cheese	c4745c18b6	ML update	2015-11-20 11:50:20 +11:00
Mysticate	f7011032bc	Switching branches	2015-11-19 19:49:46 -05:00
Mysticate	f02e2b2e72	Formatting	2015-11-19 18:02:07 -05:00
Mysticate	e816a79f37	Reformatted	2015-11-19 17:51:25 -05:00
Mysticate	502f12f00f	Fixed paintball to the max. :>>	2015-11-19 17:46:07 -05:00
Cheese	e14f5a36bd	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-20 08:34:19 +11:00
Cheese	f33eedf36d	text fix	2015-11-20 08:33:51 +11:00
Sarah	0fedb99660	Changing the tutorial visuals and texts.	2015-11-19 21:04:50 +01:00
Sarah	ad280c96c9	adding interactive Chat elements.	2015-11-19 20:45:40 +01:00
Virizion	975b1df477	Added the title message when a perfect match. Turns out having a '%' in the text caused it not to appear.	2015-11-18 22:03:04 -05:00
fooify	6d0879a175	Re-fixed Barbarian bug	2015-11-18 17:31:28 -08:00
Virizion	796f116cfd	Merge branch 'master' into virizion_speed_builder	2015-11-18 19:27:42 -05:00
Virizion	937d024ea5	Empty builds are auto eliminated. Damage player 9001 so the elimination is handled by the managers and not us. If there are not enough build areas for the players, the game ends. Shows a message that you completed the build if you complete it correctly. It also plays a sound. It would have a title but the title wasn't showing up for some reason...	2015-11-18 19:26:19 -05:00
Sarah	a8ba1f1ea6	some perspektive changes to the tutorial and removing prepare timer.	2015-11-18 22:33:47 +01:00
Virizion	76db2710ae	It should have been all got the build 100% correct not all got the same score.	2015-11-18 16:10:44 -05:00
Sarah	f2830e653e	Making last changes to the tutorial	2015-11-18 19:25:12 +01:00
Sarah	bff9a065d9	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars # Conflicts: # Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java # Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java # Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java # Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java	2015-11-18 18:08:51 +01:00
Sarah	64970ab8d6	adding little tutorial at the start of the game.	2015-11-18 17:53:35 +01:00
Shaun Bennett	1eff698a34	Merge pull request #75 in MIN/mineplex from william-global to master * commit 'a11ca138e764417c23a0060dd134ef7c49741295': ranks woops easy fix rawr and fixes Added the ability to give out game loot. Reformatting titles Added GlobalGiveCoins. Changes Gems a little and the manager. More global stuff! Added GlobalGiveGems. Global Packet work. Added giveitem sub-command.	2015-11-18 10:15:33 -06:00
William Burns	e16ee9036a	Added the ability to give out game loot.	2015-11-18 14:35:40 +00:00
Virizion	8145b127ba	Changed the score algorithm so if all players have the same score, nobody is eliminated.	2015-11-17 20:04:23 -05:00
fooify	4198e73120	Fixed SG Barbarian bug	2015-11-17 16:05:49 -08:00
William Burns	a28adc9673	More global stuff! Added GlobalGiveGems.	2015-11-17 18:26:19 +00:00
Mysticate	1342a8ac9f	Class	2015-11-17 11:38:15 -05:00
Mysticate	448dd33c1a	Switching branches c:	2015-11-17 11:38:02 -05:00
William Burns	0f7c52391f	Global Packet work. Added giveitem sub-command.	2015-11-17 08:19:36 +00:00
Cheese	adfc2f19eb	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-17 09:20:15 +11:00
Cheese	46505a8e8e	converted to new res pack locations	2015-11-17 09:19:33 +11:00
libraryaddict	208d90c4bc	Fixed getTargetBlock being 0 when its infinite	2015-11-17 10:18:42 +13:00
Virizion	2e9ac8df4d	First commit.	2015-11-15 22:06:11 -05:00
Mysticate	399edbab29	Sniper work	2015-11-15 12:47:45 -05:00
fooify	5767d4e2db	SSM bug fix: magma cube flame dash doesn't make player invisible	2015-11-14 16:08:14 -08:00
Mysticate	746aab7786	Merge remote-tracking branch 'origin/master' into Myst_KITS Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/PlayerCopy.java	2015-11-14 14:50:48 -05:00
fooify	db21d627d8	Merge remote-tracking branch 'origin/master' into foo	2015-11-14 09:13:51 -08:00
Morten	0a907fb661	Final stable version reached. All challenges work as intented. Now I will start working on the scoreboard and possibly some kits? Thanos will continue with some challenge creations. But we are approaching the final version of Mineware	2015-11-14 15:01:04 +01:00
Thanos paravantis	b4f9899fb1	Rename Block Runner to Build Race. Final changes on Treasure Digger map creation.	2015-11-14 16:00:51 +02:00
Thanos paravantis	c2c99c1d5d	Add additional checks for spectators on challenge events.	2015-11-14 14:31:46 +02:00
Thanos paravantis	3f4955de0d	Fix carrot item not being added to player inventory on Fast Food challenge.	2015-11-14 13:58:23 +02:00
Thanos paravantis	ecbc3f3b5d	Add additional check on Treasure Digger while placing decorations on the map.	2015-11-14 11:37:31 +02:00
Thanos paravantis	5ca96b5614	Update Treasure Digger, improved chest loot and map creation. Code refactoring on several challenges.	2015-11-14 11:23:25 +02:00
Cheese	259397b6ae	READY 2 GO	2015-11-14 12:52:14 +11:00
fooify	f9f4c2addc	fixed several smash bugs and one global issue	2015-11-13 17:28:25 -08:00
Thanos paravantis	f242919759	Update Treasure Digger (previously Evolution of Combat).	2015-11-13 23:54:17 +02:00
AlexTheCoder	016e54977d	- Finish game [FINALLY]	2015-11-12 21:16:58 -05:00
Cheese	9de3981dec	ms update	2015-11-13 11:24:11 +11:00
fooify	a0c0f6b891	Slightly bumped Monster Maze jump time value	2015-11-12 16:19:33 -08:00
Shaun Bennett	0b41450603	Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" This reverts commit `6c17b2926c`.	2015-11-12 17:51:13 -05:00
Shaun Bennett	6c17b2926c	Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta" This reverts commit `ce1c09b88f`, reversing changes made to `1aef7fe0b9`.	2015-11-12 16:35:31 -05:00
Sarah	4958ce347d	Fixing boss not despawning bug, scoreboard end bug and some achievements.	2015-11-12 18:41:40 +01:00
AlexTheCoder	bc1b185f0e	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-12 02:44:54 -05:00
AlexTheCoder	a8b27e66d1	- Finalized game to chiss and sigils' requirements minus flag status in scoreboard, will add next commit - Fixed items ever being lost from treasurechests	2015-11-12 00:06:21 -05:00
fooify	ac4a276aff	fixed bridge bug "Death Bomber counts suicides as well"	2015-11-11 20:38:36 -08:00
fooify	8a0906587d	Merge remote-tracking branch 'origin/master' into foo	2015-11-11 20:15:31 -08:00
NewGarbo	ce1c09b88f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta Conflicts: Plugins/.idea/compiler.xml Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java Plugins/Libraries/craftbukkit.jar Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java	2015-11-11 19:35:44 +00:00
Morten	e28878eec2	Quick update	2015-11-11 20:23:34 +01:00
Thanos paravantis	1830d5eaa3	Update projectile manager usage on challenges.	2015-11-11 14:06:32 +02:00
Thanos paravantis	d93c2c7108	Merge branch 'master' into thanos-mineware Conflicts: Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java	2015-11-11 13:55:28 +02:00
Thanos paravantis	ba9d468619	Update Evolution of Combat challenge.	2015-11-11 13:49:35 +02:00
Cheese	3ed680e1c2	ms update	2015-11-11 15:55:48 +11:00
Cheese	d971e3c8a3	ms update	2015-11-11 12:46:58 +11:00
Cheese	520eb55b88	Merge branch 'master' into minestrike-update Conflicts: Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java	2015-11-11 07:43:50 +11:00
Cheese	b3125e40ff	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-11 07:43:01 +11:00
Morten	148a4e9425	Merge branch 'master' into MortensRawBugFixes	2015-11-10 17:16:00 +01:00
Morten	2ef32a14df	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex # Conflicts: # Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs # Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/holeinwall/Wall.java	2015-11-10 17:15:23 +01:00
Morten	2128a0d711	Updating to 1.8... sigh	2015-11-10 17:13:27 +01:00
fooify	394d680470	Merge remote-tracking branch 'origin/master' into monster-league	2015-11-10 07:09:19 -08:00
fooify	ca1177685f	totally WIP commit	2015-11-10 07:08:08 -08:00
AlexTheCoder	d654f1f4b1	- Fixed class edit in lobbies - Fixed conflict between rave suit and assassin	2015-11-10 06:17:25 -05:00
libraryaddict	1a2c163ce2	Fix scoreboard out of bounds error	2015-11-11 00:03:08 +13:00
AlexTheCoder	e165cad50f	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-10 04:53:32 -05:00
Cheese	0a9c97c32a	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-10 18:05:01 +11:00
Shaun Bennett	2707173a8b	Merge with 1.8 Branch	2015-11-10 01:48:33 -05:00
Cheese	83248a8fec	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex	2015-11-10 09:11:27 +11:00
Cheese	0ae5330634	squid changes	2015-11-10 09:11:10 +11:00
NewGarbo	c6ff845efa	arcade weird thingy	2015-11-09 20:28:41 +00:00
Sarah	18ab3d0f5b	Mob shrinking and some Word fixes.	2015-11-09 15:40:49 +01:00
Jonathan Williams	ba7d5bbcdc	Fixed Arcade!	2015-11-09 03:24:20 -06:00
NewGarbo	7a8a5918c0	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta Conflicts: Plugins/.idea/dataSources.xml Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java CONFLICTS ALL FIXED	2015-11-09 08:59:37 +00:00
Morten	1958fa9f5e	quick save	2015-11-08 14:31:56 +01:00
AlexTheCoder	9e24a5005f	- Completed CTF	2015-11-08 03:04:17 -05:00
AlexTheCoder	211298327f	- Fixed banners, begun work on patterns	2015-11-08 02:42:31 -05:00
AlexTheCoder	dfbf19c66a	Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf	2015-11-08 01:02:06 -05:00
AlexTheCoder	fb7fcccf24	- Reverting back to banners	2015-11-08 01:01:18 -05:00
Cheese	cc2e5bc6e4	minestrike update!	2015-11-08 11:30:19 +11:00
Morten	a905726544	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex	2015-11-07 16:44:00 +01:00
Morten	d4bd1d7f93	Added Chiss' suggestions and fixed up pretty much everything This is a stable version, I just need Thanos to send me his final changes on his games	2015-11-07 16:36:22 +01: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
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
Thanos paravantis	7009e46693	Several updates and bug fixes. Evolution of Combat rework (See ChallengeNewEvolutionOfCombat).	2015-11-06 20:25:38 +02: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
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	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
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
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	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
libraryaddict	c25b1969de	More progress	2015-11-04 04:00:53 +13: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
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
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
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	5d58c56c27	fixed kit bug	2015-10-31 18:31:13 +11:00
Cheese	225f067ab3	fixed some projectile stuff	2015-10-31 18:22:53 +11:00
Cheese	b9d7c80f80	cow kit	2015-10-31 13:25:57 +11:00
Thanos paravantis	5c2c5ab280	Fast Food: Core functionality, workspace update.	2015-10-30 20:56:04 +02:00
Thanos paravantis	3ae333a15e	Setting up Fast Food Challenge.	2015-10-30 17:43:43 +02:00
Thanos paravantis	dca5e06eb9	Merge branch 'master' into thanos-mineware	2015-10-30 17:14:03 +02: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
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
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
AlexTheCoder	cf26541461	- More Bugfixes	2015-10-28 18:16:52 -04:00
Mysticate	d0e49280a4	Added a sniper kit! :D	2015-10-28 13:34:03 -04:00
libraryaddict	0486404c4b	Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java	2015-10-28 14:38:34 +13:00
libraryaddict	5ec932d1ca	Fixing bugs	2015-10-28 14:36:48 +13:00
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
Sarah	e3049fd22e	performance update for Minions and reducing nuke particles.	2015-10-26 17:54:45 +01:00
AlexTheCoder	f5b4f28848	- Fixed achievements - Various balance patches/audio changes	2015-10-26 00:25:33 -04: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
Thanos paravantis	0d406f1992	Evolution of Combat: Removed hunger, added 60 second peace time, several gameplay changes.	2015-10-25 13:45:35 +02:00
AlexTheCoder	08fd1b5790	- Fixed MPS Whitelist for usernames with non-lowercase characters	2015-10-24 20:49:09 -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
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
Shaun Bennett	40afcaf26b	Global Packet Commands	2015-10-23 15:07:53 -04: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	e3e7dd4694	Titan rewards from mythical chests	2015-10-23 02:08:31 -04: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	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
Thanos paravantis	fba3578e1e	Merge branch 'master' into thanos-mineware	2015-10-22 17:19:28 +03:00
Thanos paravantis	c459ef94ed	Updating with latest modifications, no other features added.	2015-10-22 17:16:48 +03:00
libraryaddict	ddb8d592f8	Remove all is1_8 checks	2015-10-22 18:37:14 +13:00
William Burns	e6bec41ca8	Fix "code too large" error.	2015-10-21 20:29:44 +01:00
Thanos paravantis	f6df946ea9	Evolution of Combat: General bug fixes, improved hunger, added protection so players can't get off the island.	2015-10-21 18:05:18 +03:00
Thanos paravantis	1360988366	Evolution of Combat, implementing hunger damage when player is idle.	2015-10-20 22:39:11 +03:00
Sarah	6860f013d0	Fixing some spelling typos chat filtering and the scoreboard.	2015-10-20 19:23:58 +02:00
libraryaddict	07f032a5d2	Fix wither pet making sounds, fixed worldtime.	2015-10-21 04:22:31 +13:00
Thanos paravantis	89953396b2	Evolution of Combat minor changes to the "first weapon crafted" title functionality.	2015-10-20 17:59:56 +03:00
Thanos paravantis	33baf90d51	New Mineware challenge, first version of Evolution of Combat. Still work in progress.	2015-10-20 17:38:47 +03:00
libraryaddict	5d671d3300	Fix borders	2015-10-20 04:37:42 +13:00
Sarah	b7b99687c8	decreasing nuke animation	2015-10-19 01:34:48 +02:00
libraryaddict	55f97ef984	More fixes, along with a fix for Block Hunt	2015-10-19 06:21:16 +13:00
AlexTheCoder	547c8ca726	- Bugfixes	2015-10-18 06:14:54 -04: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
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
Thanos paravantis	a247150b4c	Removing debug information, minor improvements on Block Runner.	2015-10-17 13:00:53 +03:00
Thanos paravantis	e4a1d81d8d	Pushing latest bug fixes, will make more improvements tomorrow on Block Runner.	2015-10-16 23:27:23 +03:00
Thanos paravantis	fde6617c6b	Block Runner (renamed from Heavy Blocks) bug fixes. Added additional checks on the block place event.	2015-10-16 20:34:50 +03:00
Thanos paravantis	c5dcf5d45a	Mineware Challenge Updates (see description below) - Added Block Runner challenge, may apply changes. - Minor updates to Anvil Dance and Falling Block challenges.	2015-10-16 19:34:09 +03: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
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	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
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
Thanos paravantis	5ed6988041	Updating	2015-10-14 18:35:44 +03:00
Morten	1c1184d58e	Changed up some suggestions after major test	2015-10-14 16:55:06 +02: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
Shaun Bennett	88709f85b6	Merge with master	2015-10-13 18:13:01 -04:00
Sarah	d925ae7f8d	adding animation for Speed Boost, fixing mob item dropping.	2015-10-13 15:53:48 +02:00
libraryaddict	58a86c5abb	That's the easy stuff done..	2015-10-13 19:49:15 +13:00
AlexTheCoder	0bd026f506	- Fixed merge issues	2015-10-12 18:04:35 -04:00
AlexTheCoder	f497eab633	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf Conflicts: Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java	2015-10-12 17:54:11 -04:00
Sarah	9010b8bfe9	removing some unneeded stuff and fixing tag overlaying	2015-10-12 22:01:23 +02:00
libraryaddict	cef52368a3	Hologram fixes	2015-10-13 08:59:13 +13:00
Morten	3c85079d6d	Small fixed. Preparing updating.	2015-10-12 21:26:40 +02: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
Morten	040f99f62a	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex	2015-10-12 16:00:20 +02:00
Morten	768fa2223b	Added 7 new games (some ok, others scrapped)	2015-10-12 15:55:45 +02:00
AlexTheCoder	dceba51060	- Fix random blockhunt bug with mounts and infestor	2015-10-12 03:09:40 -04:00
Cheese	2b9a66e7b2	more ssm update	2015-10-12 16:32:23 +11:00
Cheese	6a173073a4	added flag to projectiles work on cow kit	2015-10-12 14:39:14 +11:00
Mysticate	3eb36a6581	Prevented farming	2015-10-11 22:43:21 -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
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
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	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	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	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	88b4ac96e5	- Achievement stuff	2015-10-09 23:15:19 -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
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	97ef4a4252	Pushing titan giveaway stuff for laptop	2015-10-09 18:23:47 -04:00
Mysticate	ff1431b652	Fixed players glitching to chests before game starts.	2015-10-09 10:21:35 -04: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	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	483ab13c2b	workaround for error where accountid is never set	2015-10-09 12:04:35 +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	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	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	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
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
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
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
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
Mysticate	3f6490f14a	Gave health on safe pad <<<<<3	2015-10-01 10:47:37 -04: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
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	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
Mysticate	2d173a5be4	Fixed a jumper perk.	2015-09-28 21:03:58 -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	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
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
Mysticate	a0ec656bc1	Fixed another tracker.	2015-09-25 12:49:21 -04:00
Morten	1c995b14e8	Ignore this	2015-09-25 18:03:10 +02:00
Mysticate	b2f1f7d2ae	Fixed the tracker for pilot.	2015-09-25 11:38:32 -04:00
Morten	59d1a949c4	Created an "END" event for challenges	2015-09-25 17:04:47 +02:00
AlexTheCoder	1cc503bd3b	- Added resupply points [requested]	2015-09-25 04:37:54 -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	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
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
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
Morten	7838ad2bce	For Bisko to pull	2015-09-22 16:12:51 +02:00
Cheese	4519f2dda1	Merge branch 'EventGameUpdates'	2015-09-22 14:59:17 +10: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
Morten	a5398cb773	Added new challenges and fixed a lot of bugs.	2015-09-19 19:01:13 +02:00
AlexTheCoder	3a1acb9f37	- Code Cleanup - Transitioning to banners fully - Preparation to remove banner bugs	2015-09-19 00:41:23 -04: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
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
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
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
Sarah	b56813deef	Improving /e commands (/e kick, /e area, etc)	2015-09-12 04:33:10 +02:00
fooify	5824ec6df0	lots of changes to monster maze, check trello for list	2015-09-07 07:08:00 -07:00
Morten	6ea9a15e6d	Added a bunch of games	2015-09-07 11:46:08 +02: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
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
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
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
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	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	32a257fa55	Fix bug https://trello.com/c/Jf7bht6V/138-general-tp-before-game-starts	2015-08-31 15:11:57 -04:00
Sarah	58ae09ebd4	saving Project for pulling.	2015-08-31 11:32:18 +02:00
AlexTheCoder	129464a845	Added CTF to MPS menus	2015-08-31 04:42:36 -04: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
Mysticate	becfbe1f13	Fixed possible game breaking bug :S	2015-08-30 20:09:47 -04: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
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
Mini-Chiss	d944d2e5c4	Merge branch 'Myst_EVO'	2015-08-29 23:54:28 -07:00
Mini-Chiss	64b9cd201c	snake crap	2015-08-29 16:02:14 -07:00
libraryaddict	6ae801314c	Fix spawning	2015-08-29 15:07:51 -07:00
libraryaddict	5030ae7d57	For Chiss, may the code never break.	2015-08-29 15:03:22 -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
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	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	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	c98a85c2ba	Added local storage of login time. Hooked in onlineTime bonus feature to real values.	2015-08-28 22:09:42 -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	3f1c4d24b9	Merge branch 'Myst_EVO'	2015-08-28 21:00:00 -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
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
Jonathan Williams	e9b33668bc	Added donorsOnline to MinecraftServer snapshot Refactored Rank class to use lowercase methods.	2015-08-28 13:22:04 -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
libraryaddict	379ee9271a	Merge pull request #43 in MIN/mineplex from clans/world-events to clans-beta * commit '9d3f125c9eb1139e6d5cfbdbe63158161e6a488b': Iron Wizard, fixed iron golem custom name Push golem block shot as per request	2015-08-27 16:34:46 -05:00
libraryaddict	9d3f125c9e	Iron Wizard, fixed iron golem custom name	2015-08-27 14:18:10 -07:00
Mysticate	f2f6afb6ca	Fixes :D	2015-08-26 20:10:58 -06:00
Mysticate	a351a8f1ed	Minor improvements.	2015-08-26 13:47:01 -06: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
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	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
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
Morten	f9fecebeec	Minor update ;)	2015-08-22 11:01:37 +02:00
Mysticate	cbaaee60d9	Removed mob spectating method from evolving.	2015-08-21 13:00:08 -04: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
Mysticate	86ad6a09de	Used armor stands for evolving.	2015-08-20 13:04:22 -04: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
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	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
fooify	a47022d242	Merge remote-tracking branch 'origin/master' into monster-maze	2015-08-17 14:54:19 -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	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	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	25f93bac2e	fixed logic on setgame	2015-08-15 12:27:11 +02: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
Mysticate	ac18dd3b79	Fixed iron golem select message. Removed slot change message.	2015-08-14 20:22:00 -04: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
Mini-Chiss	80588a308b	balanaced brawler	2015-08-13 21:03:48 +02:00
Mini-Chiss	a1ba2cffac	fixed needler not doing posion	2015-08-13 20:56:02 +02:00
Mysticate	eaad787075	Removed the base kit and replaced it with Iron Golem.	2015-08-13 08:16:33 -04: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	f3b58fe9b6	disabled team armor command in games D:	2015-08-13 12:51:57 +02: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
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	d6f17c609b	carl	2015-08-12 08:58:46 +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
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	89dab7ec85	some little fixes	2015-08-11 16:33:32 +02:00
Mini-Chiss	cfcfbbed3b	removed double gem	2015-08-11 13:34:32 +02:00
Mini-Chiss	b348c62a3f	Merge branch 'EventGameUpdates'	2015-08-11 13:01:33 +02:00
Shaun Bennett	fe153bee11	Fix revert issues	2015-08-11 03:19:27 -05:00
Sarah	2c30d20cb1	changing OP method, setHost permissions and /e command.	2015-08-11 09:26:01 +02:00
Sarah	d457e3a955	changing the setOP Event.	2015-08-11 08:36:39 +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	a618b19b73	Small changes	2015-08-10 14:32:35 -04:00
Sarah	fef269b856	Fixing /e set.	2015-08-10 17:28:27 +02:00
Mysticate	1804d668e1	A few small tweaks. Removed the "Frozen" effect.	2015-08-10 08:42:03 -04: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
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
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	ee65c72e86	and wizards!	2015-08-09 18:46:02 +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
Sarah	0d70fb6b96	removing deop of Admins and adding OP condition to setHost.	2015-08-09 16:55:10 +02:00
Mysticate	b9edb92c1e	Ready for full on testing.	2015-08-09 01:08:43 -04:00
Mysticate	5298fa341e	Removed the revolving thing.	2015-08-08 16:13:54 -04:00
fooify	db521668a9	more changes! it's getting pretty cool now x)	2015-08-07 14:20:15 -07: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
Sarah	181b778a9c	Fixing some bugs and disallow MPS while disguised.	2015-08-07 07:39:40 +02:00
Morten	608e8bf693	For Sarah <3	2015-08-07 05:40:16 +02:00
Shaun Bennett	be18dc1bf5	Add experience rewards to reward manager	2015-08-06 21:41:56 -05:00
Morten	1680b652db	Added Hat layer skin Added Sneak animation With love from Morten <3	2015-08-07 03:10:17 +02:00
Sarah	d8041ba582	Fixing Players can disguise as disguised Players.	2015-08-06 20:57:56 +02:00
fooify	0a9f7cc888	Merge remote-tracking branch 'origin/master' into monster-maze	2015-08-06 10:13:54 -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
Sarah	4a10f8d71a	fixing very last bugs. Ready to push!!!	2015-08-06 13:23:38 +02:00
Sarah	6947b54e66	16 char limit and Steve Skin.	2015-08-06 09:45:02 +02:00
Sarah	5809359449	Random Player disguises.	2015-08-06 09:19:19 +02:00
Sarah	208ce95c97	No youtuber Disguise.	2015-08-06 09:11:39 +02:00
Sarah	b52a9477fe	No Staff disguises!	2015-08-06 09:07:30 +02:00
Sarah	16a8164030	Fixing last bugs and disabling coin bombs while diguised.	2015-08-06 08:42:09 +02:00
fooify	b5d1202674	YET MORE WORK ON MM	2015-08-05 13:09:26 -07:00
fooify	551451c533	moar changes	2015-08-05 10:30:27 -07:00
Sarah	a15e8e1b95	Fixing more /disguise bugs.	2015-08-05 15:23:16 +02:00
Sarah	83da6b7a9a	Improving the /disguise command even more. ;D	2015-08-05 13:32:05 +02:00
AlexTheCoder	cc24bb78d3	Fixed Cows being able to fly if they had the Rabbit Farmer kit	2015-08-05 03:07:19 -04:00
Mini-Chiss	5d7cc59909	fixed cases where negative stats were being uploaded	2015-08-05 08:56:52 +02:00
Sarah	91de6a1852	last fix...	2015-08-05 08:40:09 +02:00
Sarah	511c61611a	fixing earlier commit.	2015-08-05 08:32:52 +02:00
Sarah	e55557e1fd	Improving the /disguise command.	2015-08-05 07:57:52 +02:00
Mini-Chiss	88fe5b3ec6	Merge branch 'MPS-Maps' Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java	2015-08-04 17:37:32 +02:00
Mini-Chiss	1fd5c51f03	DINGO ATE MY BABY	2015-08-04 17:33:23 +02:00
Sarah	ec3bc7cc38	Try fixing the map selection.	2015-08-04 17:04:49 +02:00
William Burns	644d6c9914	Whitelist fixes. Implemented MapSource.	2015-08-04 11:21:58 +01:00
Mini-Chiss	13d139d197	team kills/deaths only store for 3 games now	2015-08-04 08:46:00 +02:00
Mysticate	d88a37832b	Work on evolving	2015-08-03 18:22:31 -06:00
AlexTheCoder	a86fdc3c21	Fixed new classes not appearing in repository	2015-08-03 18:45:16 -04:00
AlexTheCoder	b53b98d6e3	Milk The Cow: New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost New Perk - Steady Hands: - Lowers the amount of milk lost by a dead player to 3 - Removes losing milk in farmer's bucket when a cow charges into them New Kit - Sturdy Farmhand: - Iron skin damage reduction of 2.0 - Implements Steady Hands perk - 2000 gems	2015-08-03 18:30:42 -04:00
Mini-Chiss	2d07cc571c	reduced invis in OITQ	2015-08-03 18:53:00 +02:00
Mini-Chiss	2f571aed25	fixed bugs from my vel fixes, WHOOPS. normalisation :(	2015-08-03 18:19:31 +02:00
Mini-Chiss	40e2b6216e	oops, was right before, reverting change.	2015-08-03 16:30:38 +02:00
Mini-Chiss	f350e4efe5	further fixed gem stuff!	2015-08-03 16:25:31 +02:00
Mini-Chiss	67fd0e2c1d	fixed MPS awards formatting	2015-08-03 16:24:43 +02:00
Mini-Chiss	ab670a03fb	fixed logic error that was displaying gems wrong	2015-08-03 16:23:50 +02:00
Mini-Chiss	e10d26dae1	reduced respawn time in OITQ removed respawn msg for short respawn times	2015-08-03 16:18:59 +02:00
William Burns	817b8b03f6	Whitelist fixes etc.	2015-08-03 13:40:13 +01:00
William Burns	0c5cc25634	Stuff	2015-08-03 12:48:17 +01:00
William Burns	4ad19e4579	Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps	2015-08-03 10:52:00 +01:00
Mini-Chiss	bb2e15c4fd	made it so games can set another game as its 'kit source' so games can share kit unlocks	2015-08-03 11:38:16 +02:00
Mini-Chiss	1d0bfbdf2d	fixed team sheep displaying in UHC lobby	2015-08-03 10:56:23 +02:00
Mini-Chiss	b26e01649b	removed requirement for ach kit	2015-08-03 10:13:46 +02:00
Mini-Chiss	eac8a3cd1c	fixed OITQ kit being unobtainable	2015-08-03 10:12:37 +02:00
Mini-Chiss	472409dc4b	fixed broadcast formatting	2015-08-03 10:06:15 +02:00
Mini-Chiss	2e1bccb3ad	DUN ALLOW overful	2015-08-03 09:02:28 +02:00
Mini-Chiss	0a84bd69d8	fixed some OITQ stuff	2015-08-02 23:17:23 +02:00
Mysticate	0a20a04903	Used packets to spectate the rotation bat.	2015-08-02 10:48:00 -06:00
Mini-Chiss	4cc810f1c0	Merge branch 'Myst_KITS'	2015-08-02 17:55:53 +02:00
Mini-Chiss	afc41c8831	converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity	2015-08-02 11:50:26 +02:00
Mini-Chiss	ac4755a5a9	Fixed incorrect velocity	2015-08-02 11:24:34 +02:00
Mysticate	9c14e3d35a	Worked on evolution	2015-08-01 17:24:12 -06:00
fooify	519449e015	lots of stuff (:	2015-08-01 11:42:32 -07:00
Mysticate	62072077c1	Fixed evolution rotation	2015-08-01 00:47:44 -06:00
fooify	e4141a1b72	Merge remote-tracking branch 'origin/master' into snow-sprint	2015-07-31 07:32:17 -07:00
Mini-Chiss	ae8d351145	Merge branch 'SSM2PlayerTeams'	2015-07-31 14:09:55 +02:00
Sarah	fba10e4cbd	fixing the long term "Kit" bug ;D	2015-07-31 14:08:08 +02:00
Sarah	b2c538b189	little tag fix.	2015-07-31 13:40:39 +02:00
Sarah	60a1768821	Fixing Team display bug on disbanding.	2015-07-31 13:05:28 +02:00
Mini-Chiss	b2a567673c	disabled sale msg added double gem weekend	2015-07-31 09:53:52 +02:00
Mysticate	53a3a29cd2	Extreme revisions. Cheers!	2015-07-31 00:50:32 -06:00
fooify	e59f2751f3	more stuff changed to snow sprint	2015-07-30 17:31:26 -07:00
fooify	014cac31f0	more changes to snow sprint	2015-07-30 14:04:39 -07:00
fooify	6c39c08abf	some progress on snow sprint	2015-07-30 11:59:04 -07:00
Mini-Chiss	a3d768af6b	added res pack for HH	2015-07-30 15:07:40 +02:00
Mini-Chiss	31fd19aab5	added res pack for CC	2015-07-30 15:07:05 +02:00
Mini-Chiss	8a5088e181	fixed SGT deathmatch not working	2015-07-30 14:47:59 +02:00
Mini-Chiss	45d117a95a	added armor hotbar to smash fixed scoreboard in snowfight	2015-07-30 14:45:28 +02:00
Mysticate	f02924987e	Did things	2015-07-30 04:30:19 -06:00
Mini-Chiss	8ef93c0b33	Merge branch 'SSM2PlayerTeams'	2015-07-30 08:42:50 +02:00
Sarah	30fa3b3309	Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams	2015-07-30 03:07:41 +02:00
Sarah	37e432f0b2	Git fix.	2015-07-30 03:07:21 +02:00
Sarah	bf75594853	Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams	2015-07-30 02:33:51 +02:00
Sarah	de4d0a7dc3	Fixing needler, projectiles in SW and "Banannas...".	2015-07-30 02:33:06 +02:00
Mysticate	a5d73d791a	Thing	2015-07-29 16:14:38 -06:00
fooify	7c4786e7d2	Merge remote-tracking branch 'origin/master' into foo	2015-07-29 14:15:24 -07:00
fooify	5da23fa322	Merge branch 'foo' of http://Fooify@184.154.0.242:7990/scm/min/mineplex.git into foo	2015-07-29 14:13:07 -07:00
fooify	db5c5a9888	crosses fingers please work!	2015-07-29 14:12:52 -07:00
Mini-Chiss	97a144150b	fixed an NPE that was causing games not to end in MS	2015-07-29 21:51:18 +02:00
Mysticate	ab49407584	Things	2015-07-29 11:52:44 -06:00
Aaron Brock	d583598477	Fixed double-half-slabs (line 68) Signed-off-by: Aaron Brock <TheMineBench@gmail.com>	2015-07-29 10:49:20 -07:00
Mini-Chiss	be910cced9	gamemode color change	2015-07-29 17:00:36 +02:00
Mini-Chiss	0e55ce1879	removed old hint	2015-07-29 16:54:30 +02:00
Mini-Chiss	1004203b34	fixed up some merge issues	2015-07-29 16:48:49 +02:00
William Burns	13af2cec74	Pick highest voting button	2015-07-29 15:44:29 +01:00
Mini-Chiss	52844d7b80	Merge branch 'EventGameUpdates' Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java	2015-07-29 16:41:35 +02:00
Mini-Chiss	71bedbe0fc	Merge branch 'WitherAssaultUpdate'	2015-07-29 16:37:29 +02:00
Mini-Chiss	c32e959f61	Merge branch 'SnowFightUpdate'	2015-07-29 16:36:33 +02:00
Morten	1a27dea32c	Why was these not added...	2015-07-29 16:35:57 +02:00
Mini-Chiss	d570cce1b0	Merge branch 'WitherAssaultUpdate'	2015-07-29 16:33:06 +02:00
Mini-Chiss	862cdae14f	team modes	2015-07-29 16:32:11 +02:00
Mini-Chiss	e47a343e2e	added mode for team games	2015-07-29 16:20:49 +02:00
Morten	f714bfbb0f	Adding testing achievement lol	2015-07-29 16:06:43 +02:00
Morten	b5d3ad0e0d	Adding perks	2015-07-29 16:05:43 +02:00
Sarah	9c5ca750cf	Improving /e mob command and implementing other commands.	2015-07-29 15:53:45 +02:00
Mini-Chiss	ab2c865ab3	better colors	2015-07-29 15:48:12 +02:00
Mini-Chiss	51cef64554	improved text	2015-07-29 15:29:12 +02:00
Mini-Chiss	deba3f23fa	Merge branch 'MPS-Maps'	2015-07-29 15:27:11 +02:00
William Burns	2b3fec754f	Colour change cause colour!	2015-07-29 14:25:38 +01:00
William Burns	3bc66f16b6	Woo a push	2015-07-29 14:22:49 +01:00
Mini-Chiss	b2db2e988f	Merge branch 'WitherAssaultUpdate' Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java	2015-07-29 15:13:28 +02:00
Mini-Chiss	1c2bd988f9	fixed spawns for team gameds	2015-07-29 15:10:21 +02:00
William Burns	f6e64d25a2	Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps	2015-07-29 13:27:45 +01:00
William Burns	f82defb1db	Whitelist	2015-07-29 13:27:26 +01:00
Mini-Chiss	30f0b3cb60	fixed close spawn stuff	2015-07-29 14:25:15 +02:00
Mini-Chiss	c9c3db70f3	Merge branch 'SSM2PlayerTeams' Conflicts: Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java	2015-07-29 14:08:17 +02:00
Mini-Chiss	932fe197b4	Merge branch 'perm-changes' Conflicts: Plugins/.idea/encodings.xml reverted it.	2015-07-29 14:06:21 +02:00
Mini-Chiss	ef89b96144	fixed game page bug	2015-07-29 14:02:56 +02:00
Mini-Chiss	b42be044ae	whtielisted MPS will be hidden from GUI	2015-07-29 13:20:20 +02:00
Mini-Chiss	e0ab853e57	Merge branch 'MPS-Maps' Conflicts: Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java	2015-07-29 13:03:05 +02:00
Jonathan Williams	10549601f8	Merge pull request #21 in MIN/mineplex from Myst_LOBBERS to master * commit 'd0a45461d07904f70b5e42dee391f69843fb3978': Fixed bug with direct hit Final tweaks. this is as good as it's goign to get! ;d Tweaks Fixed waller achievement thing Fixed waller kit bc I was stupid before ;c Added an exception for a map to make it night. Various improvements. Added an achievement, removed team one, touched up another. Swag.	2015-07-29 00:15:41 -05:00
Mysticate	d0a45461d0	Fixed bug with direct hit	2015-07-28 21:25:29 -06:00
Mysticate	3e0eb03112	Final tweaks. this is as good as it's goign to get! ;d	2015-07-28 20:39:55 -06:00
Mysticate	99946ef1f3	Tweaks	2015-07-28 17:29:51 -06:00
Mysticate	2e58b75a1b	Fixed waller achievement thing	2015-07-28 08:51:21 -04:00
Mysticate	dd53d268e4	Fixed waller kit bc I was stupid before ;c	2015-07-28 08:46:37 -04:00

... 17 18 19 20 21 ...

3572 Commits