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 |
|
NewGarbo
|
e9fd661311
|
disabled koth
|
2015-12-02 18:25:53 +00:00 |
|
NewGarbo
|
8fea5afdce
|
fixed message on tick (might be cause of laggg)
|
2015-12-02 06:56:58 +00:00 |
|
NewGarbo
|
92c1abf221
|
a few last touches
|
2015-12-02 06:04:53 +00:00 |
|
NewGarbo
|
8db5ffe5c7
|
forcejoin command for ADMIN+ and fixed auto tree replanting.
|
2015-12-02 05:54:00 +00:00 |
|
NewGarbo
|
3a4e453ac3
|
made it so that you can only use /reset in safe zones
|
2015-12-02 05:18:04 +00:00 |
|
NewGarbo
|
d6ca52e4a4
|
modifications
|
2015-12-02 05:11:09 +00:00 |
|
NewGarbo
|
b8e2086928
|
changes to tutorial
|
2015-12-02 00:19:48 +00:00 |
|
NewGarbo
|
ba27d94158
|
fixed skiptutorial message not displaying
|
2015-12-01 23:23:11 +00:00 |
|
NewGarbo
|
cffb6bd62f
|
bunch o' changes
|
2015-12-01 23:01:41 +00:00 |
|
Keir
|
9508556d57
|
Refactor.
|
2015-12-01 22:47:51 +00:00 |
|
NewGarbo
|
a7d6026c07
|
made skip tutorial messages be seen whilst in tutorial
|
2015-12-01 22:33:47 +00:00 |
|
NewGarbo
|
69cb395f5a
|
made entire clan know about disband
|
2015-12-01 22:30:05 +00:00 |
|
NewGarbo
|
35ae89ab1f
|
fixed players from being able to eat their carrot in the making money task
|
2015-12-01 19:37:53 +00:00 |
|
NewGarbo
|
ea099d7a82
|
fixed some annoying bugs and fixed certain messages not showing in tutorial
|
2015-12-01 18:41:33 +00:00 |
|
NewGarbo
|
fbf9c8eb0c
|
made certain messages visible in tutorial that are actually required to be seen
|
2015-12-01 13:37:34 +00:00 |
|
NewGarbo
|
f536bf23e5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-12-01 12:06:25 +00:00 |
|
NewGarbo
|
d32e6fdb96
|
Got rid of deployed tasks. using different system now. (untested)
|
2015-12-01 11:28:14 +00:00 |
|
Jonathan Williams
|
03a1f19df9
|
Fixed memory leaks in Disguise and Recall.
Removed debug messages in ItemMapManager
|
2015-11-30 23:49:16 -06:00 |
|
NewGarbo
|
1a851679c4
|
made it so players cannot see chat whilst in tutorial
|
2015-11-30 20:40:30 +00: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 |
|