NewGarbo
|
fde5a5af28
|
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
|
2016-01-25 08:47:08 +00:00 |
|
NewGarbo
|
0b7cec60ae
|
put cmod above support so that support can't bypass clans home block
|
2016-01-25 08:44:17 +00:00 |
|
NewGarbo
|
d82a7b353f
|
allow C.Mods to join all server regardless of home servers
|
2016-01-25 08:42:38 +00:00 |
|
NewGarbo
|
54fa1449f6
|
cannon crater changes
|
2016-01-25 08:40:59 +00:00 |
|
NewGarbo
|
c43c09fd3c
|
the cannons shouldn't explode instantly! also added fire effects to craters + clan tips when hopping on a cannon
|
2016-01-24 21:45:46 +00:00 |
|
NewGarbo
|
0252436990
|
cannons updates
|
2016-01-24 20:56:47 +00:00 |
|
NewGarbo
|
a41521d6a9
|
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/gameplay/safelog/SafeLog.java
|
2016-01-23 13:42:25 +00:00 |
|
NewGarbo
|
1f7e1fb6cf
|
fix dupe bug and safelog
|
2016-01-23 13:40:49 +00:00 |
|
NewGarbo
|
24011c4af4
|
cannons work
|
2016-01-23 12:46:52 +00:00 |
|
NewGarbo
|
bf6f1a1701
|
sapling stuff messed up oops
|
2016-01-22 15:28:12 +00:00 |
|
NewGarbo
|
090b6e496a
|
sapling stuff messed up oops
|
2016-01-22 15:27:44 +00:00 |
|
NewGarbo
|
c524247777
|
supplies command for sieges
|
2016-01-22 15:27:10 +00:00 |
|
NewGarbo
|
6638562866
|
npe fix
|
2016-01-22 15:21:20 +00:00 |
|
NewGarbo
|
f25c7b0277
|
don't need that + npe fix
|
2016-01-22 15:19:32 +00:00 |
|
NewGarbo
|
b869d4a7a8
|
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
|
2016-01-22 15:16:20 +00:00 |
|
NewGarbo
|
c4bbeb2535
|
more control over saplings
|
2016-01-22 14:55:50 +00:00 |
|
NewGarbo
|
a377a09925
|
fixed wind blade dupe bug
|
2016-01-22 11:22:20 +00:00 |
|
NewGarbo
|
cc48d98208
|
pushing to beta to change to alpha
|
2016-01-22 11:06:19 +00:00 |
|
NewGarbo
|
40c52ac557
|
made it so that cannons don't rely on outposts. this should help with testing them without needing an outpost
|
2016-01-16 08:25:30 +00:00 |
|
NewGarbo
|
254a2e45e4
|
comments + cannons state enum rename
|
2016-01-16 08:22:35 +00:00 |
|
NewGarbo
|
e71a2d2e48
|
quick npe fix
|
2016-01-16 08:20:11 +00:00 |
|
NewGarbo
|
1042edb134
|
CANNONZ!
|
2016-01-16 08:18:06 +00:00 |
|
NewGarbo
|
1faeb43b73
|
fixed iron block sometimes sticking around after placing cannon
|
2016-01-15 07:17:51 +00:00 |
|
NewGarbo
|
a554f1b7c6
|
needed to update some code with the cannon item location changing. also removed unused imports.
|
2016-01-15 07:00:39 +00:00 |
|
NewGarbo
|
f78c469875
|
moved cannon item to Cannon.java to be consistent with the outpost item being in Outpost.java
|
2016-01-15 06:59:18 +00:00 |
|
NewGarbo
|
e0b7be0813
|
made /meow give you 64 cannons and 64 outposts
|
2016-01-15 06:58:20 +00:00 |
|
NewGarbo
|
70444ff508
|
cannon + siege work with outposts, also moved outposts to the clans.siege package
|
2016-01-15 06:53:58 +00:00 |
|
NewGarbo
|
595ab0d763
|
siege work
|
2016-01-14 09:46:12 +00:00 |
|
NewGarbo
|
fb53e443e7
|
cleanup and cannons stuff
|
2016-01-12 20:27:24 +00:00 |
|
NewGarbo
|
f3003e795e
|
Implemented Outpost MK III
|
2016-01-12 18:59:01 +00:00 |
|
NewGarbo
|
6cde84ec5f
|
fixed outpost block placing/breaking boundary checking
|
2016-01-12 18:57:25 +00:00 |
|
NewGarbo
|
025f82e5ed
|
made the forcefield bump much weaker
|
2016-01-12 16:31:21 +00:00 |
|
NewGarbo
|
62f16ada81
|
that's not the correct bounds!
|
2016-01-12 07:57:35 +00:00 |
|
NewGarbo
|
5b4b5fb2b5
|
fixed outpost forcefield knocking you away even if the building is complete, also made the particles show the actual boundaries
|
2016-01-12 07:44:20 +00:00 |
|
NewGarbo
|
7d858c72f3
|
Merge branch 'clans/beta' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
|
2016-01-12 07:12:18 +00:00 |
|
NewGarbo
|
a6be919e4a
|
agh lost some code ;-;
|
2016-01-12 07:10:22 +00:00 |
|
NewGarbo
|
ed8d9459b2
|
goes with the commit below VVVV
|
2016-01-12 07:02:19 +00:00 |
|
NewGarbo
|
d3452772ed
|
outposts work (grr git is weird trying to switch over to clans/beta)
|
2016-01-12 07:02:03 +00:00 |
|
NewGarbo
|
c873b6b886
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
|
2016-01-12 06:58:53 +00:00 |
|
NewGarbo
|
d656c7a212
|
fixed clans banned players counting as being online after joining and their territory then being blown up
|
2016-01-11 18:02:03 +00:00 |
|
NewGarbo
|
3773ab3f0b
|
fixed safelog npcs sticking around some time
|
2016-01-11 10:14:32 +00:00 |
|
NewGarbo
|
60a78e396f
|
remove legendary announcement in chat/middle text
|
2016-01-11 09:16:11 +00:00 |
|
NewGarbo
|
d5b5ac7bb0
|
changed regen level on giants broadsword from 4 to 3 and made slowness last longer so that screen doesn't glitch out
|
2016-01-10 23:06:39 +00:00 |
|
NewGarbo
|
d4ccb82791
|
didn't push this earlier
|
2016-01-10 23:03:16 +00:00 |
|
NewGarbo
|
6673081fb3
|
fixed LeechingAttribute from throwing an error when setting health above 20
|
2016-01-10 22:31:51 +00:00 |
|
NewGarbo
|
04c7f2c1f1
|
made pressure plates, buttons, and levers from working with block toss
|
2016-01-10 22:20:50 +00:00 |
|
NewGarbo
|
bccee71ff7
|
made signs placed by muted players get cleared on being placed
|
2016-01-10 21:16:49 +00:00 |
|
NewGarbo
|
734351011a
|
made all old clans ban clients get unloaded. there seems to have been problems with certain clients not unloading.
|
2016-01-10 21:15:50 +00:00 |
|
NewGarbo
|
9c3a62a308
|
made it so punished players can't place signs
|
2016-01-10 21:03:34 +00:00 |
|
NewGarbo
|
68808efb49
|
made players not be able to chat while chat is silenced
|
2016-01-10 20:57:12 +00:00 |