Ben
|
befb27d3db
|
Finalized Vanish system
|
2016-03-09 01:45:17 +00:00 |
|
Joseph Prezioso Jr
|
ac91ba690c
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-08 16:08:14 -05:00 |
|
Joseph Prezioso Jr
|
b8f06374cd
|
Made changes to accommodate for Clan ELO's
|
2016-03-08 16:07:52 -05:00 |
|
Shaun Bennett
|
99c2fefed2
|
Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-08 12:27:45 -06:00 |
|
Shaun Bennett
|
3283b873e7
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
|
2016-03-08 12:19:28 -06:00 |
|
Ben
|
26b7ea2d59
|
fixes
|
2016-03-08 18:19:12 +00:00 |
|
Shaun Bennett
|
876a568bd0
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/OutpostRepository.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
|
2016-03-08 12:17:07 -06:00 |
|
Shaun Bennett
|
ffd9d98d2e
|
Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-08 12:15:47 -06:00 |
|
Shaun Bennett
|
e39b3de237
|
Fix errors
|
2016-03-08 12:12:44 -06:00 |
|
Shaun Bennett
|
890a3f4bc9
|
Merge develop into clans/beta
|
2016-03-08 12:09:04 -06:00 |
|
Ben
|
d86ef81056
|
weaps oops
|
2016-03-08 01:11:16 +00:00 |
|
Ben
|
9953388b92
|
iunvseeeeeeeeeeee
|
2016-03-08 00:32:36 +00:00 |
|
Ben
|
48cfe4d91c
|
fixed & inv see?
|
2016-03-08 00:27:06 +00:00 |
|
NewGarbo
|
ae42aaaab1
|
Sammy changes + cleanup
|
2016-03-07 03:25:22 +00:00 |
|
NewGarbo
|
7e2086df1c
|
flash fix, rares update, and outpost fixes
|
2016-03-06 19:55:58 +00:00 |
|
NewGarbo
|
ae2da31544
|
Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-05 23:14:32 +00:00 |
|
NewGarbo
|
8cfbe20a08
|
re-added delay to /spawn
|
2016-03-05 23:09:57 +00:00 |
|
NewGarbo
|
d92f817efc
|
fixed some teleportation bugs and a bit of cleanup
|
2016-03-05 22:50:06 +00:00 |
|
NewGarbo
|
e88736c1aa
|
changes to scepter, NPE fix
|
2016-03-05 20:46:24 +00:00 |
|
NewGarbo
|
d79107eaaa
|
new legendary weapons and nether finzlizations
|
2016-03-05 03:07:25 +00:00 |
|
NewGarbo
|
7b9ff288f3
|
nether progresssisiannsnsssss
|
2016-03-03 23:23:20 +00:00 |
|
NewGarbo
|
73d8870daf
|
nether work (forgot to commit days ago oops)
|
2016-03-02 19:42:53 +00:00 |
|
NewGarbo
|
d524645ddd
|
placed the clan name hologram thingy correctly because it's inside the outpost!!!
|
2016-02-23 19:11:29 +00:00 |
|
NewGarbo
|
d65bf965c4
|
fix only some blocks of outpost being reset and explosion particles not showing up
|
2016-02-23 18:51:34 +00:00 |
|
NewGarbo
|
2956b18821
|
some hologram work
|
2016-02-23 18:45:04 +00:00 |
|
NewGarbo
|
879a211a41
|
change siege weapon damage indicator display length
|
2016-02-23 17:00:14 +00:00 |
|
NewGarbo
|
deb22fd4e7
|
add 'time till despawn' hologram on outposts and the owner clan of the outpopsts above doors
|
2016-02-23 16:54:07 +00:00 |
|
NewGarbo
|
205e3885b8
|
disallow players on pvp timer to use bows
|
2016-02-23 16:14:56 +00:00 |
|
NewGarbo
|
41e140d5ca
|
stop players from placing water in outposts
|
2016-02-23 16:07:12 +00:00 |
|
NewGarbo
|
bcd4480f23
|
stop recruits from opening trapped chests
|
2016-02-23 15:57:12 +00:00 |
|
NewGarbo
|
306e56980c
|
remove weapon teleport fix
|
2016-02-23 14:44:07 +00:00 |
|
NewGarbo
|
de4568d448
|
accurate-ish weapon damage tracking
|
2016-02-23 13:03:50 +00:00 |
|
NewGarbo
|
f0fc2fd519
|
progress [testing github]
|
2016-02-22 20:44:00 +00:00 |
|
NewGarbo
|
76cf65c267
|
siege system changes
|
2016-02-22 09:34:04 +00:00 |
|
NewGarbo
|
db7382d01e
|
testing github?
|
2016-02-21 01:34:13 +00:00 |
|
NewGarbo
|
67c355bf65
|
remove more eclipse files
|
2016-02-19 07:22:54 +00:00 |
|
NewGarbo
|
441cf702c7
|
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
|
2016-02-19 07:22:09 +00:00 |
|
NewGarbo
|
d5583b93f2
|
remove eclipse files
|
2016-02-19 07:14:13 +00:00 |
|
Shaun Bennett
|
7714e4960c
|
Use DBPool for everything
|
2016-02-19 00:17:38 -06:00 |
|
NewGarbo
|
dc5fe21f3d
|
more npe checking
|
2016-02-18 21:53:55 +00:00 |
|
NewGarbo
|
24b834370b
|
null pointers with siege weaponl oading
|
2016-02-18 21:37:13 +00:00 |
|
NewGarbo
|
8507bb1bd8
|
all progress over this week
|
2016-02-18 21:29:42 +00:00 |
|
NewGarbo
|
e25accfba4
|
outpost saving and loadi9ng
|
2016-02-15 11:24:29 +00:00 |
|
phobia
|
d7ad2cdc58
|
moar undead fixes
|
2016-02-14 12:37:37 +11:00 |
|
NewGarbo
|
93a5ca6777
|
weapons need to be centered
|
2016-02-14 00:45:54 +00:00 |
|
phobia
|
24254635a8
|
Fixes to observer settings
|
2016-02-14 09:51:59 +11:00 |
|
NewGarbo
|
e6eb43ada8
|
PUSHING CODE BECAUSE MY HDD MIGHT BE BREAKING DOWN. THIS CODE IS UNTESTED PROBABLY DOESN'T WORK
|
2016-02-12 19:58:40 +00:00 |
|
NewGarbo
|
90570c1185
|
progress on saving outposts/wepaons so far. not finished. probably going to change it to a different format
|
2016-02-12 07:00:21 +00:00 |
|
NewGarbo
|
67b12f3ae2
|
loads of progress
|
2016-02-10 19:24:57 +00:00 |
|
NewGarbo
|
b308d1759f
|
renamed stuff to more sensible stuff. :}
|
2016-02-10 13:02:55 +00:00 |
|