NewGarbo
e71a2d2e48
quick npe fix
2016-01-16 08:20:11 +00:00
NewGarbo
1042edb134
CANNONZ!
2016-01-16 08:18:06 +00:00
William Burns
f22297418c
Clear full canvas at start fix
2016-01-15 19:08:25 +00:00
William Burns
733bfadf68
Added spray can tool
2016-01-15 18:52:26 +00:00
Sarah
410bc1c74b
not being able to disguise as banned/muted players
2016-01-15 19:12:50 +01:00
Teddy
c16a719be1
Bridges, added stats
2016-01-15 13:37:55 +00:00
Teddy
9cd7240b61
BouncyBalls, giving errors when Loading, skipping chat stats
2016-01-15 13:28:42 +00:00
Teddy
ec75169b70
BossBattles, giving errors when Loading, removed chat stats.
2016-01-15 13:07:21 +00:00
Teddy
3315a510dc
Barbarians stats added + Block break stat tracker added
2016-01-15 13:01:26 +00:00
Teddy
6a3e9ac19f
BaconBrawl stats added
2016-01-15 12:10:53 +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
Shaun Bennett
404e049c31
Give item fix for offline players
2016-01-14 08:06:27 -05:00
Mysticate
cf7f5af9ca
Fixed who the winner is in MB Games.
2016-01-14 07:41:36 -05:00
Mysticate
2e433d8b06
Made sure that the active morph gets disabled on clear
2016-01-14 07:17:40 -05:00
NewGarbo
595ab0d763
siege work
2016-01-14 09:46:12 +00:00
Teddy
d33d682ebb
Implementing stats for every game, got all stat names ready
2016-01-13 18:40:29 +00:00
Keir
19301271a4
Fix format character.
2016-01-13 11:51:49 +00:00
Keir
26246604a7
This should've gone with the previous commit :/
2016-01-13 11:48:18 +00:00
Keir
53133d51ee
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-01-13 11:47:13 +00:00
Virizion
ee6425bbaf
Removed extra blank lines.
2016-01-12 23:31:35 -05:00
Virizion
dfd5a63b78
More changes and fixes.
2016-01-12 23:29:08 -05:00
fooify
63897b9b54
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2016-01-12 20:05:34 -08:00
Virizion
528a7435e7
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2016-01-12 20:25:08 -05:00
Virizion
b27d5849d8
General fixes.
2016-01-12 20:23:25 -05: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
Teddy
f1314d5c26
JSON now handled by JsonMessage Builder
2016-01-12 13:25:47 +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
libraryaddict
b1c6af4d1a
Update CB
2016-01-12 20:18:03 +13: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
libraryaddict
c3e11e87ea
Fix small issues with burning and ignition
2016-01-12 19:10:32 +13:00
libraryaddict
11da5a3fe1
Fix fire combusting and cancelled damage events
2016-01-12 18:56:48 +13:00
Shaun Bennett
4e9a4c87d4
Merge pull request #123 in MIN/mineplex from bugfix/disguise-command to develop
...
* commit '0f587ba5d908afdccb877358d71e56a3edda49cd':
fixing "Kicked for flying again" again...
2016-01-11 17:20:51 -06:00
Shaun Bennett
3693a2b2c5
Merge pull request #122 in MIN/mineplex from bugfix/thanos to develop
...
* commit 'ed439569453dc248623834af6fb553341779e46c':
Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
Remove unused imports.
Prevent players from stacking others with a menu inventory opened.
Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.
2016-01-11 16:26:09 -06:00
Shaun Bennett
025b87c806
Merge pull request #121 in MIN/mineplex from feature/mutedsign to develop
...
* commit 'fa7eef504597011da14093fb76a8e088524eafd0':
Muted players can't write on signs.
2016-01-11 16:23:34 -06:00
Teddy
88c53bf464
Added default ChatStat for all games to prevent my server from dying when testing
2016-01-11 19:35:00 +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
Teddy
02ff8bdbdb
Custom stats working, escaping bug fix and List reset bug
2016-01-11 12:59:57 +00:00
Teddy
40d913beaf
Changed a List to reset each time its registered to prevent stats copying to the next game, automatic string escaping, party colour name changed to original colour
2016-01-11 12:35:44 +00:00
