Ben
|
2070f0925d
|
teleport to spawn after tutorial ends
|
2016-03-26 22:49:06 +00:00 |
|
Ben
|
0559ad9567
|
remove "you have not set a home" message and added a set home message
|
2016-03-26 22:45:20 +00:00 |
|
Ben
|
23cfa8ec25
|
mine diamonds fix (have to mine 11 instead of 10)
|
2016-03-26 22:36:27 +00:00 |
|
Ben
|
f201898420
|
mine diamond fix
|
2016-03-26 22:35:06 +00:00 |
|
Shaun Bennett
|
970d5a307c
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-03-27 09:17:39 +11:00 |
|
Shaun Bennett
|
bace0b2557
|
Add Mining shop Location
|
2016-03-27 09:14:12 +11:00 |
|
Ben
|
9e0ba029b4
|
uhhh what
|
2016-03-26 22:10:19 +00:00 |
|
Shaun Bennett
|
caf8170a32
|
Tutorial Changes
|
2016-03-27 08:47:34 +11:00 |
|
Ben
|
a35bbeefdd
|
attack enemy goals
|
2016-03-25 12:38:01 +00:00 |
|
Ben
|
dade54e5fe
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-25 04:02:16 +00:00 |
|
Ben
|
195c990e29
|
further tutorial progress
|
2016-03-25 04:01:57 +00:00 |
|
Shaun Bennett
|
8c7d653cca
|
Store location for teleport home
|
2016-03-25 13:13:15 +11:00 |
|
Shaun Bennett
|
8afed30c5a
|
basic classes objectives
|
2016-03-25 13:07:53 +11:00 |
|
Ben
|
d23804be70
|
fixes for shaun
|
2016-03-25 01:33:55 +00:00 |
|
Ben
|
87b1bf7dd0
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java
|
2016-03-25 01:30:46 +00:00 |
|
Ben
|
3cd7a5f12a
|
NPE fix for cannons and more
|
2016-03-25 01:29:55 +00:00 |
|
Shaun Bennett
|
c221e0e24f
|
Fix potatoes
|
2016-03-25 12:26:13 +11:00 |
|
Ben
|
17c214c282
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java
|
2016-03-25 00:08:28 +00:00 |
|
Ben
|
88b0ea1b72
|
tutorial progressss es
|
2016-03-25 00:06:51 +00:00 |
|
Shaun Bennett
|
d5a89dc7fe
|
Push for ben again
|
2016-03-25 11:05:05 +11:00 |
|
Shaun Bennett
|
7c06186a4f
|
Fix cleanup and setup
|
2016-03-25 09:42:41 +11:00 |
|
Shaun Bennett
|
628604c353
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-03-25 08:44:08 +11:00 |
|
Shaun Bennett
|
051539dbf6
|
Add cleanup and setup
|
2016-03-25 08:43:37 +11:00 |
|
Ben
|
af87dc9384
|
unsynchronized siege weapon support
|
2016-03-24 21:26:40 +00:00 |
|
Ben
|
c381cc8fd7
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-24 21:14:34 +00:00 |
|
Ben
|
cfb84dd545
|
fixes for shaun
|
2016-03-24 21:14:13 +00:00 |
|
Shaun Bennett
|
85511b4c26
|
Fixes for ben
|
2016-03-25 08:13:30 +11:00 |
|
Ben
|
f000360565
|
missing a few files
|
2016-03-24 19:29:45 +00:00 |
|
Ben
|
2ef604aeaf
|
attack enemy goal
|
2016-03-24 19:11:05 +00:00 |
|
Ben
|
7920f2729b
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-24 08:59:09 +00:00 |
|
Ben
|
2eb4d89875
|
i think clans ban is broken in this commit, and i removed some unnecessary spammy debug messages.
|
2016-03-24 08:58:48 +00:00 |
|
Shaun Bennett
|
4e26d2c7f1
|
Push code for ben
|
2016-03-24 19:37:56 +11:00 |
|
Shaun Bennett
|
2a89896084
|
Tutorial
|
2016-03-24 17:32:44 +11:00 |
|
Shaun Bennett
|
dbd9567abb
|
Tutorial work
|
2016-03-24 15:22:07 +11:00 |
|
Ben
|
2e41f906d0
|
moved completely to database managed clan blacklist, instead of the old hard-coded way
|
2016-03-21 22:37:35 +00:00 |
|
Ben
|
264e5d34b2
|
missing some files
|
2016-03-21 05:52:02 +00:00 |
|
Ben
|
723f62b8f9
|
incognito fixes and loads of other fixes
|
2016-03-20 01:06:46 +00:00 |
|
Ben
|
ef1d6ede24
|
many fixes
|
2016-03-19 06:31:37 +00:00 |
|
Ben
|
a21d43e58f
|
fix NPE
|
2016-03-19 06:13:39 +00:00 |
|
Ben
|
c4fbae4bd1
|
added clan name blacklist and changed clans ban GUI
|
2016-03-19 06:11:32 +00:00 |
|
Ben
|
6172be5d76
|
few changes
|
2016-03-19 00:13:31 +00:00 |
|
Ben
|
2e9562fc50
|
fixed NPE with one of the tutorial goals. fixed silent chest. fixed invsee, updated regions for new map
|
2016-03-18 22:31:36 +00:00 |
|
Ben
|
8c7da5e98a
|
some goals didn't commit
|
2016-03-18 03:01:42 +00:00 |
|
Ben
|
3ba138a8d7
|
some more objectives.
|
2016-03-18 03:01:11 +00:00 |
|
Ben
|
995d454f87
|
tutorial additions.
|
2016-03-18 02:47:51 +00:00 |
|
Ben
|
3b764920e1
|
duplicate messages
|
2016-03-18 01:22:15 +00:00 |
|
Ben
|
a4cbe54c78
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-18 01:21:25 +00:00 |
|
Ben
|
2cf59ced8b
|
new pvp timer management, fixed build house task, fixed incognito
|
2016-03-18 01:18:35 +00:00 |
|
Ben
|
a3db70ad9c
|
clear player inventory on tutorial start (and give map)
|
2016-03-17 09:44:03 +00:00 |
|
Ben
|
e6f4375041
|
build house goal [still broken]
|
2016-03-17 02:23:05 +00:00 |
|