Ben
|
88b0ea1b72
|
tutorial progressss es
|
2016-03-25 00:06:51 +00: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 |
|
Ben
|
929981419e
|
disable item dropping & block breaking
|
2016-03-17 01:52:36 +00:00 |
|
Ben
|
add651780b
|
priority chat filters, fixed siege weapon clicking listeners being incorrect
|
2016-03-17 01:06:07 +00:00 |
|
Ben
|
b164ff0729
|
Update res pack
|
2016-03-16 23:56:39 +00:00 |
|
Ben
|
1c1ed1613a
|
allow kill command while in void/after other damage methods
|
2016-03-16 23:56:30 +00:00 |
|
Ben
|
d625b20ea8
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
|
2016-03-16 22:48:04 +00:00 |
|
Ben
|
93767b7a90
|
tutorial changes, chat filter system, commented out all web stuff for analytics.
|
2016-03-16 22:46:18 +00:00 |
|
Ben
|
2c9021fb81
|
some chat formatting
|
2016-03-16 22:31:35 +00:00 |
|
Joseph Prezioso Jr
|
7cf49dbe3b
|
Refactored code to correct errors from previous commit
|
2016-03-15 20:46:30 -04:00 |
|
Joseph Prezioso Jr
|
5fdd3e0872
|
Updated North, South, East, and West Spawns and Centers
|
2016-03-15 20:12:09 -04:00 |
|
Ben
|
0d237370e1
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-15 23:33:09 +00:00 |
|
Ben
|
7589c63904
|
analytics progress
|
2016-03-15 23:32:56 +00:00 |
|
Ben
|
8897f2e86e
|
fixed NPE
|
2016-03-15 23:11:08 +00:00 |
|
Ben
|
4638ba909d
|
siege weapon finalizations & analytics (wip)
|
2016-03-15 22:52:13 +00:00 |
|
Shaun Bennett
|
4e85a315f9
|
Objectives!
|
2016-03-15 11:50:35 -05:00 |
|
Shaun Bennett
|
e53b8616d1
|
A ton of tutorial work
|
2016-03-15 10:29:43 -05:00 |
|
Ben
|
d7de4381a3
|
add 200ms damage delay to cannon damages. and add temporary damage holograms
|
2016-03-15 00:49:37 +00:00 |
|
Ben
|
13bbcc51dc
|
remove cannon pickup feature
|
2016-03-15 00:23:59 +00:00 |
|
Ben
|
3ae89e12a8
|
improve cannon UI
|
2016-03-15 00:21:37 +00:00 |
|
Ben
|
c556d7b3c3
|
fix ConcurrentModificationException
|
2016-03-15 00:21:15 +00:00 |
|