NewGarbo
|
9b88683fdc
|
fix cannon tnt exploding prematurely, added cooldown rather than using Recharge.
|
2016-01-25 17:00:38 +00:00 |
|
NewGarbo
|
33845cbc72
|
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
|
2016-01-25 08:48:13 +00:00 |
|
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
|
5b32911a42
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
|
2016-01-25 08:46:26 +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 |
|
Shaun Bennett
|
951c27123a
|
Remove /disguise for YOUTUBE_SMALL in arcade
|
2016-01-18 22:10:01 -05:00 |
|
Shaun Bennett
|
044d2bac83
|
Fix some Invisibility preference bugs
|
2016-01-17 22:55:04 -05:00 |
|
Shaun Bennett
|
2b6074a210
|
Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command'
|
2016-01-17 22:46:56 -05:00 |
|
Sarah
|
5ed9295944
|
updating Hub command as well
|
2016-01-17 18:10:16 +01:00 |
|
Sarah
|
52bda30f85
|
Mysts OCD again......
|
2016-01-17 03:03:00 +01:00 |
|
Sarah
|
4a5d6b5f2a
|
Mysticates OCD....
|
2016-01-17 02:48:15 +01: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 |
|
Sarah
|
410bc1c74b
|
not being able to disguise as banned/muted players
|
2016-01-15 19:12:50 +01: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 |
|