Shaun Bennett
|
2d30983711
|
Adjust visuals
|
2016-03-28 11:29:15 +11:00 |
|
Ben
|
1aa4b4a47d
|
remove player from tutorial on kick
|
2016-03-27 15:36:54 +01:00 |
|
William Burns
|
e7245bcc11
|
Merge pull request #15 from Mineplex-LLC/feature/slack-api
Add a Slack API for sending messages through plugins.
|
2016-03-27 10:15:30 +01:00 |
|
Ben
|
e4e40baf52
|
final stuff
|
2016-03-27 06:48:23 +01:00 |
|
Ben
|
b4d340a655
|
cb fixed
|
2016-03-27 06:21:32 +01:00 |
|
Ben
|
a175ead44a
|
finished tutorial!
|
2016-03-27 05:43:31 +01:00 |
|
Ben
|
a30a591b58
|
disable certain clans commands whilst in tutorial
|
2016-03-27 02:04:33 +01:00 |
|
Ben
|
a8bd0e4406
|
add current Clan Outpost to travel shop
|
2016-03-26 23:20:03 +00:00 |
|
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 |
|
William Burns
|
c1adb7e1bc
|
Remove Slack attachment functionality (for now).
|
2016-03-26 13:12:59 -04:00 |
|
William Burns
|
29966195ee
|
Create an API for sending Slack message to multiple teams and channels.
|
2016-03-26 13:07:41 -04: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 |
|
Jonathan Williams
|
105f62e563
|
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
|
2016-03-23 16:02:30 -05:00 |
|
Jonathan Williams
|
ee22274ef5
|
Removed Stacker debug messages.
|
2016-03-23 16:02:06 -05:00 |
|
Shaun Bennett
|
3d473ad00a
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-03-23 20:39:21 +11:00 |
|
git
|
4dd756286e
|
Fix small resource pack bug
|
2016-03-23 20:32:13 +13:00 |
|
Shaun Bennett
|
e8dcc4a3e2
|
Merge branch 'develop' into clans/beta
# Conflicts:
# Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
|
2016-03-23 11:02:20 +11:00 |
|
Shaun Bennett
|
1e73adf2af
|
Increase ram and cpu for event server
|
2016-03-23 10:23:04 +11:00 |
|