Commit Graph

7214 Commits

Author SHA1 Message Date
William Burns
0bbfbff0b8 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-29 18:03:49 +01:00
William Burns
2fcd809447 PC-34 - Effects/Particles when you blow up enemy 2016-03-29 18:03:28 +01:00
phobia
cd2d4c0f37 Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-03-29 22:47:39 +11:00
phobia
e75c7a3c91 PC-29 + fixes 2016-03-29 22:47:03 +11:00
phobia
eab7cbe385 PC-35 2016-03-29 16:29:03 +11:00
William Burns
f2d450d26b PC-30 - Claim land objective should use clan GUI 2016-03-29 00:07:50 +01:00
William Burns
fc473275b0 PC-37 - Move Identify shops objective before go to shops 2016-03-29 00:02:07 +01:00
Joseph Prezioso Jr
38a079846d Some basic ideas for Elo I will be experimenting with 2016-03-28 18:14:52 -04:00
Joseph Prezioso Jr
d8d952691b cleaning up my code a bit 2016-03-28 13:40:34 -04:00
Joseph Prezioso Jr
abcdadc8d0 Corrected a small error in GameOption. 2016-03-28 12:40:41 -04:00
William Burns
f8211f26cc PC-18 - Remove PVP Safety Message in Tutorial 2016-03-28 13:36:43 +01:00
William Burns
3d0d7f9d71 PC-43 - Remove join/quit messages while in tutorial 2016-03-28 12:38:57 +01:00
phobia
fd3a04e794 Fixes for tutorial
PC-39    "about energy"
PC-32    Tutorial set home bed
PC-27    Change /c GUI for creating clan
PC-41    Disband via gui not command in tutorial
2016-03-28 22:13:28 +11:00
Shaun Bennett
fa0594b5db PC-24 - Update Spawn Island Hologram 2016-03-28 13:55:37 +11:00
Shaun Bennett
9ff7e2da82 PC-21 - Combine Tutorial 1 and 2 2016-03-28 11:52:18 +11:00
Shaun Bennett
f7c57a7699 PC-22 - Update Scoreboard Text 2016-03-28 11:47:16 +11:00
Shaun Bennett
8c1b91cbf5 PC-23 - Hotbar Flashing Text 2016-03-28 11:37:35 +11:00
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
AlexTheCoder
2530bc512e - Fixed some more buggies 2016-03-26 14:02:18 -04: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
AlexTheCoder
bb28b7ad89 - Forgot to comment out 2 lines 2016-03-25 20:27:17 -04:00
AlexTheCoder
6678dffb61 - Updated everything for Sigils and chiss 2016-03-25 20:25:43 -04:00
Joseph Prezioso Jr
57a1e06406 no message 2016-03-25 20:11:35 -04:00
Joseph Prezioso Jr
f7575360db Setting up a class to handle Materials as GameOptions 2016-03-25 16:42:39 -04:00
Joseph Prezioso Jr
05ede7910e All errors have been fixed. 2016-03-25 15:27:11 -04:00
Joseph Prezioso Jr
262c6c2fa6 Quick Lunch-time bug-squashing update. Still have tons of errors to go through, but I want to make sure everything is backed up, should the weather turn foul(er) and a power outage should occur 2016-03-25 13:53:20 -04:00
Joseph Prezioso Jr
c1ef185e82 Flags have been changed and I have started to get rid of the errors that have started cropping up. 2016-03-25 12:48:39 -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