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 |
|
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 |
|
NewGarbo
|
2be917e623
|
give enemy info about time before siege and after outpost is built, the health of the outpost
|
2016-02-10 13:01:31 +00:00 |
|
NewGarbo
|
69bdbdde70
|
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-02-10 11:54:36 +00:00 |
|
NewGarbo
|
35f0162882
|
make catapults rideableeeeeee
|
2016-02-10 11:09:17 +00:00 |
|
NewGarbo
|
43cf4d38ef
|
give player arrow back after failed territory siege declaration arrow thingy fire thingy ehh grammar is not needed at night :}
|
2016-02-09 21:36:58 +00:00 |
|
NewGarbo
|
e74cefeee8
|
increased siege weapon placement area, and made outposts handle siege weapons that are placed within them
|
2016-02-09 19:59:01 +00:00 |
|
NewGarbo
|
e782097563
|
shouldn't be able to fire weapons whilst in siege wait time
|
2016-02-09 19:49:25 +00:00 |
|
NewGarbo
|
2b44b88ea2
|
not being able to fire bow without the correct class and changed arrow to actually be an arrow
|
2016-02-09 19:48:48 +00:00 |
|
NewGarbo
|
67d1bffe82
|
npe and clan minimum players set for siege
|
2016-02-09 19:47:42 +00:00 |
|
NewGarbo
|
9342bee371
|
das ist gut
|
2016-02-09 17:05:59 +00:00 |
|
NewGarbo
|
99ece6eaea
|
add chest with arrwos to outpost. test for clans in area
|
2016-02-09 05:53:37 +00:00 |
|
NewGarbo
|
dd2fe36a3d
|
added "Borderlands" to Clan name blacklist
|
2016-02-08 22:23:26 +00:00 |
|
NewGarbo
|
052d3c3380
|
siege system updates
|
2016-02-08 21:33:12 +00:00 |
|
NewGarbo
|
b8471d7a8e
|
getter for crater size
|
2016-02-08 20:46:15 +00:00 |
|
NewGarbo
|
3ee3059bc7
|
against clan needs to have a getter
|
2016-02-08 18:38:30 +00:00 |
|
NewGarbo
|
9379c4190a
|
add against clan to outpsots and also renamed "clan" to "owner" to make it more obvious
|
2016-02-08 18:31:03 +00:00 |
|
Shaun Bennett
|
4f5625d63e
|
Clans Alpha 1.0 changes
|
2016-02-05 18:42:22 -05:00 |
|
phobia
|
27e4ef784c
|
WP Evade
|
2016-02-06 08:44:37 +11:00 |
|