Shaun Bennett
2b22639d8a
Merge remote-tracking branch 'origin/master'
2015-11-29 18:03:46 -05:00
Cheese
af77a2ddeb
fix
2015-11-30 10:03:27 +11:00
Shaun Bennett
1c71efbff7
Merge remote-tracking branch 'origin/master'
2015-11-29 17:59:39 -05:00
Shaun Bennett
58d7e8562b
update clans version for next release
2015-11-29 17:58:29 -05:00
Cheese
af61b62a47
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 09:58:06 +11:00
Cheese
7e3cab9c87
map test
2015-11-30 09:57:47 +11:00
NewGarbo
8026ad891d
fixed king of the hill
2015-11-29 21:09:18 +00:00
Sarah
dc68375ec8
TimeBetweenPhase Flag.
2015-11-29 21:48:39 +01:00
NewGarbo
be727e6e26
fixed deployed tasks not being deregistered as Listeners after being adding to Cull
2015-11-29 19:46:08 +00:00
xGamingDudex
6120c8246b
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
2015-11-29 19:11:24 +01:00
xGamingDudex
d1d58919f4
Mount bug fix.
...
Mount was put in map before removed, resulting in new mount being half
disabled.
2015-11-29 19:09:55 +01:00
xGamingDudex
2c2370f8a0
Added method to edit NoAI field on entities.
2015-11-29 19:08:26 +01:00
xGamingDudex
509835ea64
Implemented new mount data system replacing instead of entities as data.
...
+ Removed some unnecessary code
+ Made StackManager use new mount system
This system also fixes a bug allowing players "hijack" some of the
mounts as it was not properly persistent.
2015-11-29 19:08:00 +01:00
xGamingDudex
327bf8d09b
We only need to add the "Go Back" page once...
2015-11-29 18:32:24 +01:00
fooify
61df87b446
Merge remote-tracking branch 'origin/master' into foo
2015-11-29 06:37:30 -08:00
Jonathan Williams
7bdf5451d4
Upped map scan performance.
2015-11-29 02:49:12 -06:00
Jonathan Williams
1d1a1d96f8
Fixed onAbilityUsed bug with _player (presumably because it was added to cull and _player was set to null right before SkillTriggerEvent happened.)
2015-11-29 02:39:37 -06:00
Jonathan Williams
5b04a3223d
Fixed bug with Posion effect NPE (Something in champs is adding a null source).
...
Fixed bug with Tutorial cleanup.
2015-11-29 02:29:47 -06:00
Jonathan Williams
782026556e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-29 02:24:32 -06:00
Jonathan Williams
e9da258333
Lowered scan rate significantly for ItemMapManager.
2015-11-29 02:24:17 -06:00
Shaun Bennett
f82396d485
Clans changes/fixes
2015-11-29 02:41:53 -05:00
Jonathan Williams
0d5fa70632
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-28 23:05:32 -06:00
Jonathan Williams
5acf6b19a4
Fixed bed checking interval.
...
Added timing logging to map rendering.
2015-11-28 23:05:22 -06:00
Shaun Bennett
e0c5581204
Merge pull request #82 in MIN/mineplex from clans-beta to master
...
* commit '7c947ad97be2fd811a8a73dcedc9e71426c80bd4':
stuff
teleport stuff
added self clan create/delete messages
fixed task 2
tutorial tasks reset
fixed stuck manager taking 0 seconds
tutorial ending message
force join command
tutorial revamp 2.0
dupe fix
don't cull an entity if a player is nearby
added force join command for ADMIN+
fixed the clan claim box check
staff mode
creative scoreboard team. and fixed npe in tutorials
tutorial revamp [clans]
2015-11-28 22:55:04 -06:00
Shaun Bennett
7c947ad97b
Merge master
2015-11-28 23:55:00 -05:00
Jonathan Williams
c6ff01b92d
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-28 22:33:03 -06:00
Jonathan Williams
118af20f44
Updated EnjinTranslator.
2015-11-28 22:32:50 -06:00
NewGarbo
b88a842f1c
stuff
2015-11-29 03:22:52 +00:00
NewGarbo
c870d99e0e
teleport stuff
2015-11-29 02:55:45 +00:00
NewGarbo
a9afe1f068
added self clan create/delete messages
2015-11-29 02:54:40 +00:00
NewGarbo
84303234fd
fixed task 2
2015-11-29 02:48:03 +00:00
NewGarbo
392ab601c2
tutorial tasks reset
2015-11-29 02:43:12 +00:00
NewGarbo
d7658f3838
fixed stuck manager taking 0 seconds
2015-11-29 02:39:09 +00:00
NewGarbo
dc5aec33b4
tutorial ending message
2015-11-29 02:37:20 +00:00
NewGarbo
8dca384d35
force join command
2015-11-29 02:31:14 +00:00
NewGarbo
9ff9724fc8
tutorial revamp 2.0
2015-11-29 02:10:39 +00:00
Cheese
5cefe27257
cosmetic fixes
2015-11-29 11:40:19 +11:00
NewGarbo
e1be0b1dbd
dupe fix
2015-11-28 23:34:41 +00:00
Sarah
66fd85af1f
Adding Phase Event.
2015-11-28 23:32:09 +01:00
NewGarbo
aa68701ebd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-28 20:16:49 +00:00
NewGarbo
ace4548b1e
don't cull an entity if a player is nearby
2015-11-28 20:14:48 +00:00
NewGarbo
afbccba36f
added force join command for ADMIN+
2015-11-28 19:56:47 +00:00
NewGarbo
75ef42d8c9
fixed the clan claim box check
2015-11-28 19:37:03 +00: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
xGamingDudex
dc0da3987b
TitanMount fixes
...
Added so that the magma cube is looking in the direction of which the
player is flying.
Removed players ability to unequipt the armorstand that take out the
netherrack block from their head slot.
2015-11-28 17:22:17 +01:00
Cheese
51227ae4f3
fixed leak
2015-11-29 01:25:15 +11:00
xGamingDudex
24dee651da
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
2015-11-28 14:05:20 +01:00
NewGarbo
f5384a1382
staff mode
2015-11-28 09:31:18 +00:00
NewGarbo
d8ae035f84
creative scoreboard team. and fixed npe in tutorials
2015-11-28 09:20:42 +00:00
