Shaun Bennett
3d4cd9ee27
Fix tutorial command, add tutorial info to scoreboard, message manager, transitioning to a visual manager
2016-01-26 17:47:01 -06:00
Shaun Bennett
9884742552
Fix OrderedObjectives, Starting CombatTutorial work
2016-01-19 16:34:51 -05:00
Shaun Bennett
80d55b2c9c
It works!
2016-01-19 13:34:17 -05:00
Shaun Bennett
0f83263871
Merge remote-tracking branch 'remotes/origin/clans/beta' into clans/tutorial
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2016-01-19 11:01:11 -05:00
Shaun Bennett
947ce254da
Tutorial Gui, Fixes
2016-01-19 10:59:56 -05:00
Shaun Bennett
976779b9f2
Tutorial Work
2016-01-17 22:45:38 -05:00
NewGarbo
e71a2d2e48
quick npe fix
2016-01-16 08:20:11 +00:00
NewGarbo
1042edb134
CANNONZ!
2016-01-16 08:18:06 +00:00
NewGarbo
1faeb43b73
fixed iron block sometimes sticking around after placing cannon
2016-01-15 07:17:51 +00:00
NewGarbo
a554f1b7c6
needed to update some code with the cannon item location changing. also removed unused imports.
2016-01-15 07:00:39 +00:00
NewGarbo
f78c469875
moved cannon item to Cannon.java to be consistent with the outpost item being in Outpost.java
2016-01-15 06:59:18 +00:00
NewGarbo
e0b7be0813
made /meow give you 64 cannons and 64 outposts
2016-01-15 06:58:20 +00:00
NewGarbo
70444ff508
cannon + siege work with outposts, also moved outposts to the clans.siege package
2016-01-15 06:53:58 +00:00
NewGarbo
595ab0d763
siege work
2016-01-14 09:46:12 +00:00
NewGarbo
fb53e443e7
cleanup and cannons stuff
2016-01-12 20:27:24 +00:00
NewGarbo
f3003e795e
Implemented Outpost MK III
2016-01-12 18:59:01 +00:00
NewGarbo
6cde84ec5f
fixed outpost block placing/breaking boundary checking
2016-01-12 18:57:25 +00:00
NewGarbo
025f82e5ed
made the forcefield bump much weaker
2016-01-12 16:31:21 +00:00
NewGarbo
62f16ada81
that's not the correct bounds!
2016-01-12 07:57:35 +00:00
NewGarbo
5b4b5fb2b5
fixed outpost forcefield knocking you away even if the building is complete, also made the particles show the actual boundaries
2016-01-12 07:44:20 +00:00
NewGarbo
7d858c72f3
Merge branch 'clans/beta' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-12 07:12:18 +00:00
NewGarbo
a6be919e4a
agh lost some code ;-;
2016-01-12 07:10:22 +00:00
NewGarbo
d3452772ed
outposts work (grr git is weird trying to switch over to clans/beta)
2016-01-12 07:02:03 +00:00
NewGarbo
c873b6b886
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-12 06:58:53 +00:00
NewGarbo
d656c7a212
fixed clans banned players counting as being online after joining and their territory then being blown up
2016-01-11 18:02:03 +00:00
NewGarbo
3773ab3f0b
fixed safelog npcs sticking around some time
2016-01-11 10:14:32 +00:00
NewGarbo
60a78e396f
remove legendary announcement in chat/middle text
2016-01-11 09:16:11 +00:00
NewGarbo
d5b5ac7bb0
changed regen level on giants broadsword from 4 to 3 and made slowness last longer so that screen doesn't glitch out
2016-01-10 23:06:39 +00:00
NewGarbo
d4ccb82791
didn't push this earlier
2016-01-10 23:03:16 +00:00
NewGarbo
6673081fb3
fixed LeechingAttribute from throwing an error when setting health above 20
2016-01-10 22:31:51 +00:00
NewGarbo
04c7f2c1f1
made pressure plates, buttons, and levers from working with block toss
2016-01-10 22:20:50 +00:00
NewGarbo
bccee71ff7
made signs placed by muted players get cleared on being placed
2016-01-10 21:16:49 +00:00
NewGarbo
734351011a
made all old clans ban clients get unloaded. there seems to have been problems with certain clients not unloading.
2016-01-10 21:15:50 +00:00
NewGarbo
9c3a62a308
made it so punished players can't place signs
2016-01-10 21:03:34 +00:00
NewGarbo
68808efb49
made players not be able to chat while chat is silenced
2016-01-10 20:57:12 +00:00
NewGarbo
fa3de2a479
made clans ban messages not public
2016-01-10 20:55:29 +00:00
NewGarbo
51872faa04
fix mutes not working
2016-01-10 20:53:55 +00:00
Shaun Bennett
46695f8449
Fix hub fly for YOUTUBE_SMALL
2016-01-09 18:44:32 -05:00
Shaun Bennett
83e5c7399e
Fix YOUTUBE_SMALL preferences
2016-01-09 18:41:19 -05:00
Shaun Bennett
8193b5121b
Dont allow /disguise for YOUTUBE_SMALL
2016-01-09 18:39:47 -05:00
Shaun Bennett
cd3037e7e5
Fix treasure purchases
2016-01-09 18:37:24 -05:00
NewGarbo
fa509f0043
fixed giant's broadsword giving HUGE regen. PLEASE PUSH ASAP
2016-01-09 19:58:31 +00:00
Shaun Bennett
2df626b35e
Fix CustomDataManager crash
2016-01-08 18:06:33 -05:00
Shaun Bennett
511b39caa7
Merge branch 'master' into develop
2016-01-08 17:05:54 -05:00
Shaun Bennett
ee73b374a6
Forgot to uncomment in ClansLoginManager
2016-01-08 06:36:59 -05:00
Shaun Bennett
a75e2c15b8
Merge remote-tracking branch 'origin/develop' into develop
2016-01-08 06:35:37 -05:00
Shaun Bennett
8d197c9ece
Merge pull request #120 in MIN/mineplex from bugfix/disguise-command to master
...
* commit '5482d1dc402eb2746d65323d5f08b51b97285a54':
Fixing "kicked for Flying"
Fixing Join/Quit messages
updating denial message
Love you Sarah <3
Fixing Disguise File
update /Disguise for Hub as well
updating /disguise
2016-01-08 05:35:17 -06:00
Shaun Bennett
15109707f3
Merge pull request #119 in MIN/mineplex from clans/alpha to develop
...
* commit '025615d080b8b925f319a2f7707d2c3fa4755a88':
Clans Alpha 0.18b fixes
2016-01-08 05:34:35 -06:00
NewGarbo
025615d080
Clans Alpha 0.18b fixes
2016-01-08 11:24:36 +00:00
Sarah
5482d1dc40
Fixing "kicked for Flying"
2016-01-08 12:17:28 +01:00
