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 |
|
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 |
|
Joseph Prezioso Jr
|
667ec03f06
|
Still a few more flags to go. I'll get to them tomorrow. Hopefully, I'll also figure out where/if I need to change things elsewhere in the code.
|
2016-03-24 18:43:02 -04:00 |
|
Shaun Bennett
|
7c06186a4f
|
Fix cleanup and setup
|
2016-03-25 09:42:41 +11:00 |
|
Joseph Prezioso Jr
|
eb6c385936
|
More flags changed
|
2016-03-24 17:52:02 -04:00 |
|
Joseph Prezioso Jr
|
0246ec275e
|
More flags have been changed to use the new Game Options. WHY IS NOTHING BREAKING!? Not that I'm complaining. Just really confused...
|
2016-03-24 17:47:07 -04: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 |
|
Joseph Prezioso Jr
|
b5d3a6b8c3
|
Small fix to last commit so that everything works while I continue working on getting GameOptions working
|
2016-03-24 16:34:16 -04:00 |
|
Joseph Prezioso Jr
|
4e02258124
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
|
2016-03-24 16:32:33 -04: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 |
|