NewGarbo
|
18504e48f7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-30 21:00:42 +00:00 |
|
NewGarbo
|
1a851679c4
|
made it so players cannot see chat whilst in tutorial
|
2015-11-30 20:40:30 +00:00 |
Jonathan Williams
|
482ec8a120
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-30 14:26:37 -06:00 |
|
Jonathan Williams
|
513810caaa
|
Fixed memory leak in MarkedForDeath
|
2015-11-30 14:26:25 -06:00 |
|
NewGarbo
|
6eb44ed87b
|
whoops.. this isn't php hehe
|
2015-11-30 19:11:18 +00:00 |
|
NewGarbo
|
813e7ee789
|
made it so that no messages are shown when in tutorial
|
2015-11-30 19:08:16 +00:00 |
|
NewGarbo
|
0862cfce72
|
fixed doors getting placed in spawn and shops
|
2015-11-30 07:26:02 +00:00 |
|
NewGarbo
|
261d6dd030
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-30 07:08:34 +00:00 |
|
NewGarbo
|
f528531b82
|
removed some testing stuff
|
2015-11-30 07:06:36 +00:00 |
Shaun Bennett
|
34c4bade06
|
Merge remote-tracking branch 'origin/master'
|
2015-11-29 19:30:51 -05:00 |
Cheese
|
02bc7ffab6
|
map changes
|
2015-11-30 11:17:23 +11:00 |
|
Shaun Bennett
|
981eead816
|
Merge remote-tracking branch 'origin/master'
|
2015-11-29 19:05:56 -05:00 |
|
Cheese
|
0f79b5814f
|
more color f ixes
|
2015-11-30 10:52:44 +11:00 |
|
Shaun Bennett
|
25bb913c4f
|
Merge remote-tracking branch 'origin/master'
|
2015-11-29 18:41:35 -05:00 |
|
Cheese
|
2ac21b1434
|
better colors
|
2015-11-30 10:40:57 +11:00 |
|
Shaun Bennett
|
4a9d53de50
|
Merge remote-tracking branch 'origin/master'
|
2015-11-29 18:33:43 -05:00 |
|
Cheese
|
18b603ec2f
|
map color changes
|
2015-11-30 10:33:08 +11:00 |
|
Shaun Bennett
|
f7f7d5fdef
|
Merge remote-tracking branch 'origin/master'
|
2015-11-29 18:26:40 -05:00 |
|
Cheese
|
e27808a011
|
map!
|
2015-11-30 10:26:07 +11:00 |
|
Shaun Bennett
|
125d9988c2
|
Merge remote-tracking branch 'origin/master'
|
2015-11-29 18:21:02 -05:00 |
|
Cheese
|
cd6ecc1e67
|
pt!
|
2015-11-30 10:20:27 +11:00 |
|
Shaun Bennett
|
06706da4cf
|
Merge remote-tracking branch 'origin/master'
|
2015-11-29 18:16:13 -05:00 |
|
Cheese
|
a886088f48
|
more changes
|
2015-11-30 10:15:50 +11:00 |
|
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 |
|
NewGarbo
|
be727e6e26
|
fixed deployed tasks not being deregistered as Listeners after being adding to Cull
|
2015-11-29 19:46:08 +00: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 |