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 |
|
Ben
|
2e41f906d0
|
moved completely to database managed clan blacklist, instead of the old hard-coded way
|
2016-03-21 22:37:35 +00:00 |
|
Ben
|
264e5d34b2
|
missing some files
|
2016-03-21 05:52:02 +00:00 |
|
Ben
|
723f62b8f9
|
incognito fixes and loads of other fixes
|
2016-03-20 01:06:46 +00:00 |
|
Ben
|
ef1d6ede24
|
many fixes
|
2016-03-19 06:31:37 +00:00 |
|
Ben
|
a21d43e58f
|
fix NPE
|
2016-03-19 06:13:39 +00:00 |
|
Ben
|
c4fbae4bd1
|
added clan name blacklist and changed clans ban GUI
|
2016-03-19 06:11:32 +00:00 |
|
Ben
|
6172be5d76
|
few changes
|
2016-03-19 00:13:31 +00:00 |
|
Ben
|
2e9562fc50
|
fixed NPE with one of the tutorial goals. fixed silent chest. fixed invsee, updated regions for new map
|
2016-03-18 22:31:36 +00:00 |
|
Ben
|
8c7da5e98a
|
some goals didn't commit
|
2016-03-18 03:01:42 +00:00 |
|
Ben
|
3ba138a8d7
|
some more objectives.
|
2016-03-18 03:01:11 +00:00 |
|
Ben
|
995d454f87
|
tutorial additions.
|
2016-03-18 02:47:51 +00:00 |
|
Ben
|
3b764920e1
|
duplicate messages
|
2016-03-18 01:22:15 +00:00 |
|
Ben
|
a4cbe54c78
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-18 01:21:25 +00:00 |
|
Ben
|
2cf59ced8b
|
new pvp timer management, fixed build house task, fixed incognito
|
2016-03-18 01:18:35 +00:00 |
|
Ben
|
a3db70ad9c
|
clear player inventory on tutorial start (and give map)
|
2016-03-17 09:44:03 +00:00 |
|
Ben
|
e6f4375041
|
build house goal [still broken]
|
2016-03-17 02:23:05 +00:00 |
|
Ben
|
929981419e
|
disable item dropping & block breaking
|
2016-03-17 01:52:36 +00:00 |
|
Ben
|
add651780b
|
priority chat filters, fixed siege weapon clicking listeners being incorrect
|
2016-03-17 01:06:07 +00:00 |
|
Ben
|
b164ff0729
|
Update res pack
|
2016-03-16 23:56:39 +00:00 |
|
Ben
|
1c1ed1613a
|
allow kill command while in void/after other damage methods
|
2016-03-16 23:56:30 +00:00 |
|
Ben
|
d625b20ea8
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
|
2016-03-16 22:48:04 +00:00 |
|
Ben
|
93767b7a90
|
tutorial changes, chat filter system, commented out all web stuff for analytics.
|
2016-03-16 22:46:18 +00:00 |
|
Ben
|
2c9021fb81
|
some chat formatting
|
2016-03-16 22:31:35 +00:00 |
|
Joseph Prezioso Jr
|
7cf49dbe3b
|
Refactored code to correct errors from previous commit
|
2016-03-15 20:46:30 -04:00 |
|
Joseph Prezioso Jr
|
5fdd3e0872
|
Updated North, South, East, and West Spawns and Centers
|
2016-03-15 20:12:09 -04:00 |
|
Ben
|
0d237370e1
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-15 23:33:09 +00:00 |
|
Ben
|
7589c63904
|
analytics progress
|
2016-03-15 23:32:56 +00:00 |
|
Ben
|
8897f2e86e
|
fixed NPE
|
2016-03-15 23:11:08 +00:00 |
|
Ben
|
4638ba909d
|
siege weapon finalizations & analytics (wip)
|
2016-03-15 22:52:13 +00:00 |
|
Shaun Bennett
|
4e85a315f9
|
Objectives!
|
2016-03-15 11:50:35 -05:00 |
|
Shaun Bennett
|
e53b8616d1
|
A ton of tutorial work
|
2016-03-15 10:29:43 -05:00 |
|
Ben
|
d7de4381a3
|
add 200ms damage delay to cannon damages. and add temporary damage holograms
|
2016-03-15 00:49:37 +00:00 |
|
Ben
|
13bbcc51dc
|
remove cannon pickup feature
|
2016-03-15 00:23:59 +00:00 |
|
Ben
|
3ae89e12a8
|
improve cannon UI
|
2016-03-15 00:21:37 +00:00 |
|
Ben
|
c556d7b3c3
|
fix ConcurrentModificationException
|
2016-03-15 00:21:15 +00:00 |
|
Ben
|
864b12adbf
|
make cannons explode chest items
|
2016-03-15 00:20:40 +00:00 |
|
Ben
|
e08ba29ac1
|
Final fixing of cannon saving/loading
|
2016-03-14 22:48:31 +00:00 |
|
Ben
|
422df69335
|
incognito async stuff and updated alpha holograms
|
2016-03-11 21:50:48 +00:00 |
|
Ben
|
bfdb7add2e
|
run siege weapon queries async
|
2016-03-11 21:04:22 +00:00 |
|
Ben
|
1008c58e91
|
removed catapult code as it's very out of date at this point (and it's not being used hehe)
|
2016-03-11 19:33:02 +00:00 |
|
Ben
|
eb0da6552c
|
add C.cBlue to name of Outposts & Cannons.
|
2016-03-11 19:31:24 +00:00 |
|
Ben
|
523c194c56
|
Fix data values not being correct in shop page.
|
2016-03-11 19:31:05 +00:00 |
|
Ben
|
86c50cc3cd
|
updates
|
2016-03-11 19:03:32 +00:00 |
|
Shaun Bennett
|
1228ca227e
|
Add support for 1.9 resource packs, Text Tutorials
|
2016-03-11 11:50:08 -06:00 |
|
Ben
|
2aa68d3e16
|
final stuff and map
|
2016-03-11 04:14:16 +00:00 |
|
Ben
|
0e276474c5
|
fixerroooniissssss
|
2016-03-11 02:20:18 +00:00 |
|
Ben
|
57c65cf5ff
|
some changes and vanish fixes maybe?
|
2016-03-11 01:47:14 +00:00 |
|
Ben
|
8ce32fcdfa
|
little tweakers
|
2016-03-11 00:58:47 +00:00 |
|
Ben
|
bcfe4a42c0
|
changerooonis
|
2016-03-11 00:41:28 +00:00 |
|
Ben
|
33d978c6d6
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-10 22:12:41 +00:00 |
|
Ben
|
20ade492a8
|
tnt generator changes
|
2016-03-10 22:09:45 +00:00 |
|
Shaun Bennett
|
76782fd420
|
Fix issues
|
2016-03-10 15:07:22 -06:00 |
|
Ben
|
c2f6217d9f
|
allowed sr. mods to use /we (TEMP)
|
2016-03-10 17:38:16 +00:00 |
|
Ben
|
0fd0a7fb44
|
mak esupply drop beacons more specific
|
2016-03-10 17:38:03 +00:00 |
|
Ben
|
2d2e88e069
|
some fixes and updates
|
2016-03-10 02:47:48 +00:00 |
|
Ben
|
9b40496a1e
|
siege weapon picking up
|
2016-03-09 23:56:25 +00:00 |
|
Ben
|
1532abcc62
|
disable nether and legendary fixes
|
2016-03-09 21:12:02 +00:00 |
|
Ben
|
70aa5d63fd
|
touched up on some messages
|
2016-03-09 13:10:39 +00:00 |
|
Ben
|
51e5552e2d
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-09 11:56:25 +00:00 |
|
Ben
|
cf6645cec7
|
Legendaries and other preparation for beta
|
2016-03-09 11:55:40 +00:00 |
|
phobia
|
e3fb40805c
|
all siege items shouldn't be able to be placed or used while on PvP timer.
Fixes to Jagged prefix
|
2016-03-09 22:46:45 +11:00 |
|
Ben
|
5b3da3d06f
|
Consistency. (Changed Vanish to Incognito)
|
2016-03-09 01:53:01 +00:00 |
|
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
|
441cf702c7
|
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
|
2016-02-19 07:22:09 +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 |
|
NewGarbo
|
9dc34b5a60
|
better damage calculation and fixed messages for siege weapon damaging
|
2016-02-05 19:12:12 +00:00 |
|
phobia
|
b0888208d1
|
More alphs bug fixes
|
2016-02-05 23:55:38 +11:00 |
|
NewGarbo
|
e448046e4f
|
made inv get cleared on fire
|
2016-02-05 10:40:53 +00:00 |
|
NewGarbo
|
bef898afc1
|
final fixes (? (still broken))
|
2016-02-05 01:01:10 +00:00 |
|
phobia
|
6291decf87
|
Fixes to flame and broadsword
|
2016-02-05 11:42:39 +11:00 |
|
NewGarbo
|
1b92871b93
|
remove annoying debug messages
|
2016-02-04 23:50:44 +00:00 |
|
NewGarbo
|
62d45d5419
|
fix flip starngesness
|
2016-02-04 23:49:02 +00:00 |
|
NewGarbo
|
f5d826a2cb
|
two parentheses. all it took to fix it. GRRR
|
2016-02-04 23:42:27 +00:00 |
|
NewGarbo
|
8c1ae12d19
|
beta stuff
|
2016-02-04 23:29:48 +00:00 |
|
phobia
|
73d4ff2639
|
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
|
2016-02-05 10:12:31 +11:00 |
|
phobia
|
6fd9cffb01
|
Clans alpha bug fixes
|
2016-02-05 10:12:18 +11:00 |
|
NewGarbo
|
16012285e0
|
rotation fix
|
2016-02-04 23:11:51 +00:00 |
|
NewGarbo
|
6c7d08a8f9
|
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
|
2016-02-04 22:55:53 +00:00 |
|
NewGarbo
|
e61b36f55c
|
Fixed /c stuck timer taking 7 seconds instead of 2 minutes
|
2016-02-04 22:55:37 +00:00 |
|
NewGarbo
|
03da4485b3
|
pushing to switch to clans/alpha
|
2016-02-04 22:54:43 +00:00 |
|