Shaun Bennett
|
607c164753
|
Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop
|
2015-12-15 13:55:01 -05:00 |
|
NewGarbo
|
6a346790f7
|
disable tutorial
|
2015-12-15 12:00:56 +00:00 |
|
NewGarbo
|
1da04b84b5
|
test push (change version to 0.17d)
|
2015-12-15 11:57:33 +00:00 |
|
NewGarbo
|
9137fcfe40
|
loads of changes (pvp timer, unsafe stuff)
|
2015-12-14 12:39:00 +00:00 |
|
libraryaddict
|
e7213fdb7e
|
Remove project specific settings
|
2015-12-13 16:41:37 +13:00 |
|
NewGarbo
|
667f076202
|
fixed unsafe timer
|
2015-12-09 10:46:05 +00:00 |
|
NewGarbo
|
425463d339
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-12-06 19:11:13 +00:00 |
|
NewGarbo
|
a9c7f088f3
|
made use ability teleport player back to where they should be
|
2015-12-06 19:10:18 +00:00 |
|
Shaun Bennett
|
11e1e53a36
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-12-05 21:36:19 -05:00 |
|
Shaun Bennett
|
d5a9a92913
|
Forgot to push these changes last update!
|
2015-12-05 21:36:07 -05:00 |
|
NewGarbo
|
5d59b1a015
|
fixed tnt blowing up in claims when offline
|
2015-12-04 18:32:46 +00:00 |
|
NewGarbo
|
bca65116ab
|
fixed task not getting cleanup up after /skiptutorial
|
2015-12-04 18:23:23 +00:00 |
|
Shaun Bennett
|
f57f4ed0aa
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-12-04 12:10:10 -05:00 |
|
NewGarbo
|
e158704534
|
fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
|
2015-12-04 15:58:51 +00:00 |
|
Shaun Bennett
|
bb382a969c
|
Fix heavy attribute, disable claim visualizer
|
2015-12-04 08:02:38 -05:00 |
|
NewGarbo
|
3b125dc8a5
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java
|
2015-12-04 11:12:19 +00:00 |
|
Shaun Bennett
|
2435ebba13
|
Disable subtasks for now
|
2015-12-04 05:16:14 -05:00 |
|
Shaun Bennett
|
5c575b41fc
|
Clans alpha 0.17
|
2015-12-04 05:15:28 -05:00 |
|
NewGarbo
|
39daf969fd
|
clan claim visualizer
|
2015-12-03 22:29:36 +00:00 |
|
NewGarbo
|
584a02ae3e
|
fixed infinite claims
|
2015-12-03 10:30:06 +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 |
|
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 |
|