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
1f7e1fb6cf
fix dupe bug and safelog
2016-01-23 13:40:49 +00:00
24011c4af4
cannons work
2016-01-23 12:46:52 +00:00
a747426fa0
Fixed mobs.
2016-01-23 05:00:14 -05:00
a359c4f8b6
Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder
2016-01-23 03:42:50 -05:00
1e732b08e7
TICK TICK TICK TICK.
2016-01-23 03:42:36 -05:00
790e2e8f73
Merge branch 'virizion_speed_builder' of ssh://184.154.0.242:7999/min/Mineplex into virizion_speed_builder
2016-01-23 19:32:37 +11:00
c1ff7f4fc2
all players equal, no one loses
2016-01-23 19:32:23 +11:00
a75770b0a6
Change build to load from top instead of bottom.
2016-01-23 03:15:41 -05:00
650d586e0f
Add perfect build count to stats
2016-01-23 02:49:08 -05:00
f82a408f30
Build time modifiers
2016-01-23 02:43:41 -05:00
5dc773032b
Add joining players to guardians team instead of spectator.
2016-01-23 02:10:11 -05:00
245cc1ed93
Limit Perfectionist achievement to 1.
2016-01-22 22:18:29 -05:00
311d42db30
Use Garbo's description changes
2016-01-22 19:48:06 -05:00
231b8cb19a
Merge pull request #133 in MIN/mineplex from bugfix/foo to develop
...
* commit '376f719c261bd2152a6646a152472a2485e1b689':
fixes important bug, fixed a scary typo!
Lots of typo fixes and such
i before e!
fixed cosmetic menu item dropping bug
more grammatical errors hast been fixed
Grammatical errors hath been fixed!
2016-01-22 18:38:26 -06:00
b2e4dff9e5
Add time to perfect build message
2016-01-22 19:18:23 -05:00
02b45bd302
Forgot to register stat tracker
2016-01-22 19:14:25 -05:00
ddc86f0897
Add Speediest Builderizer achievement
2016-01-22 19:13:23 -05:00
d0e5be9c93
Guardian is impressed (untested!)
2016-01-22 18:35:18 -05:00
bf6f1a1701
sapling stuff messed up oops
2016-01-22 15:28:12 +00:00
090b6e496a
sapling stuff messed up oops
2016-01-22 15:27:44 +00:00
c524247777
supplies command for sieges
2016-01-22 15:27:10 +00:00
6638562866
npe fix
2016-01-22 15:21:20 +00:00
f25c7b0277
don't need that + npe fix
2016-01-22 15:19:32 +00:00
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
c4bbeb2535
more control over saplings
2016-01-22 14:55:50 +00:00
a377a09925
fixed wind blade dupe bug
2016-01-22 11:22:20 +00:00
cc48d98208
pushing to beta to change to alpha
2016-01-22 11:06:19 +00:00
3f715ab4dd
Enable inventory click.
2016-01-22 02:23:58 -05:00
4bbd956e14
Don't use the same build twice (untested!)
2016-01-22 01:37:47 -05:00
49e439af55
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-22 01:28:09 -05:00
6bb60ddebd
Ignore empty builds (untested!)
2016-01-22 01:27:29 -05:00
c66f37817e
Fixed invis bug.
2016-01-22 01:22:31 -05:00
5c83f5c1e5
Renamed to Speed Builders from Speed Builder.
2016-01-22 00:20:58 -05:00
0da921f3d2
Removed debug thing.
2016-01-21 23:52:59 -05:00
a38319147a
Stopped physics which fixed the torch bug.
2016-01-21 23:49:49 -05:00
582fa4c915
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-21 22:42:33 -05:00
c38596a09f
Name the guardian, 10 seconds to view builds
2016-01-21 22:42:25 -05:00
24e97176cc
Call clear build area method on eliminate.
2016-01-21 22:05:30 -05:00
d37b8b40fc
Disable item merge to (hopefully) fix phantom rails.
2016-01-21 20:41:28 -05:00
50c9b33701
Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder
2016-01-21 20:13:53 -05:00
636da8f4fa
Mob destroying. Removed a debug change that only selected builds with mobs in them.
2016-01-21 20:13:32 -05:00
5675aed698
velocity the drops to the player
2016-01-22 11:56:52 +11:00
69825893c9
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-01-21 19:11:36 -05:00
6ab6307f74
Pushing all my stuff for Shaunpai.
2016-01-21 19:08:38 -05:00
877ec4710e
Removing duplicate NCP hooks
2016-01-21 17:22:10 -05:00
3803a3d82e
Add player heads back to friends lsit
2016-01-21 17:19:51 -05:00
0fd5540de6
Merge pull request #132 in MIN/mineplex from bugfix/give-item-offline to develop
...
* commit '404e049c31df6d4278ee3ed46e7f0b8e2f92ee16':
Give item fix for offline players
2016-01-21 15:44:34 -06:00
a41816ca22
Include version.properties in Mineplex.Core
2016-01-21 16:37:35 -05:00
a0f39bf36e
Merge remote-tracking branch 'origin/develop' into develop
2016-01-21 16:31:52 -05:00
64ec092d09
Rename coin command to shard command
2016-01-21 09:10:39 -05:00
1e72ebcbe6
Merge branch 'master' into rankdescriptions
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-01-21 12:54:12 +00:00
447583624e
Fix ascii.png duplication.
2016-01-21 17:47:21 +11:00
5af8d747b3
Merge remote-tracking branch 'origin/develop' into develop
2016-01-20 15:07:48 -05:00
269cd710fc
Fix wrong group id for spigot excludes
2016-01-20 15:07:39 -05:00
c0d4fa1bea
Merge pull request #125 in MIN/mineplex from bugfix/mb-wins to develop
...
* commit '4924d652f555392c9e36feb05a64cccd61b6c594':
Store winner UUID instead of Player object to avoid leaking excess data
Fixed who the winner is in MB Games.
2016-01-20 12:33:56 -06:00
4924d652f5
Store winner UUID instead of Player object to avoid leaking excess data
2016-01-20 13:33:40 -05:00
7715df8e6a
Merge pull request #130 in MIN/mineplex from md_5/servermonitor/leak to develop
...
* commit '55c54eeff4dc72619fc9be1bb724b9dd37804919':
Fix ServerMonitor not actually removing ServerGroup instances.
2016-01-20 12:24:33 -06:00
359655f417
Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop
...
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
Fix some misc suspicious calls to Collection methods.
2016-01-20 12:23:55 -06:00
c7bb380a56
Merge pull request #128 in MIN/mineplex from md_5/mineplexer/leak to develop
...
* commit '6cf08193dfbedb08352fd3a450022afac0ecd331':
Fix small memory leak in Mineplexer.
2016-01-20 12:23:13 -06:00
0a5791a92f
Go back to compile scope, need to talk to md_5 about this
2016-01-20 13:13:20 -05:00
037a2f8353
Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command
2016-01-20 13:04:31 -05:00
8977735baf
Include a version.properties in maven build
2016-01-20 11:57:21 -05:00
8017da9413
Delete JedisTest
2016-01-20 10:25:31 -05:00
ea315a1447
Merge remote-tracking branch 'remotes/origin/md_5/maven' into develop
...
# Conflicts:
# Plugins/Libraries/craftbukkit.jar
2016-01-20 10:19:09 -05:00
77d9f7cf32
Merge branch 'master' into develop
2016-01-20 10:12:20 -05:00
376f719c26
fixes important bug, fixed a scary typo!
2016-01-19 18:52:54 -08:00
bb4091c7a6
Use Maven for Compilation
2016-01-20 11:20:58 +11:00
573d0dd67d
Stats added for all other games
2016-01-19 23:10:45 +00:00
951c27123a
Remove /disguise for YOUTUBE_SMALL in arcade
2016-01-18 22:10:01 -05:00
c52bc8024c
Halloween, added kit to stats
2016-01-18 11:41:30 +00:00
740eeae9bd
Halloween, added stats
2016-01-18 11:40:46 +00:00
3fc25359be
Gravity, added stats
2016-01-18 11:38:43 +00:00
b22f452b1f
Gladiators, added stats
2016-01-18 11:36:16 +00:00
297e9baf41
Evolution, added stats
2016-01-18 11:34:43 +00:00
f3d27c9d93
Draw my thing, added stats
2016-01-18 11:32:40 +00:00
3d88f5aaae
Dragons, added stats
2016-01-18 11:11:32 +00:00
ba50b5fdb1
Dragon Riders, added default registery
2016-01-18 11:09:19 +00:00
c3d9be2123
Dragon Escape Teams, added stats
2016-01-18 11:05:09 +00:00
85f4ee50f0
Dragon Escape, added stats + implemented kit display for stats
2016-01-18 11:04:12 +00:00
66f484760e
Death Tag, added stats
2016-01-18 10:53:56 +00:00
96d16932dd
Christmas Chaos, added stats
2016-01-18 10:50:04 +00:00
dc44207d7a
Champ TDM, added stats
2016-01-18 10:48:10 +00:00
4e09aa4c34
Champ Dominate,added stats
2016-01-18 10:45:48 +00:00
f79acaaa2a
Champ CTF,added stats
2016-01-18 10:43:46 +00:00
508c4e99d2
Castle Siege,added stats
2016-01-18 10:41:10 +00:00
b0eb5a6d4e
Cards Against Humanity, skipped/left blank
2016-01-18 10:34:43 +00:00
56b3e482f2
Master Builders, added stats
2016-01-18 10:32:38 +00:00
044d2bac83
Fix some Invisibility preference bugs
2016-01-17 22:55:04 -05:00
2b6074a210
Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command'
2016-01-17 22:46:56 -05:00
5ed9295944
updating Hub command as well
2016-01-17 18:10:16 +01:00
4927bb8c0b
Fix some misc suspicious calls to Collection methods.
2016-01-17 20:20:48 +11:00
55c54eeff4
Fix ServerMonitor not actually removing ServerGroup instances.
2016-01-17 20:11:25 +11:00
52bda30f85
Mysts OCD again......
2016-01-17 03:03:00 +01:00
4a5d6b5f2a
Mysticates OCD....
2016-01-17 02:48:15 +01:00
6cf08193df
Fix small memory leak in Mineplexer.
...
* Leak was on line 74 (toString omitted when removing from String collection).
* Impact was actually pretty much nil - collection is rebuilt every minute.
* Side effect of optimization by using UUID itself which has a good hashCode and fast equals implementation.
2016-01-16 20:36:49 +11:00
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
254a2e45e4
comments + cannons state enum rename
2016-01-16 08:22:35 +00:00
e71a2d2e48
quick npe fix
2016-01-16 08:20:11 +00:00
1042edb134
CANNONZ!
2016-01-16 08:18:06 +00:00
410bc1c74b
not being able to disguise as banned/muted players
2016-01-15 19:12:50 +01:00
c16a719be1
Bridges, added stats
2016-01-15 13:37:55 +00:00
9cd7240b61
BouncyBalls, giving errors when Loading, skipping chat stats
2016-01-15 13:28:42 +00:00
ec75169b70
BossBattles, giving errors when Loading, removed chat stats.
2016-01-15 13:07:21 +00:00
3315a510dc
Barbarians stats added + Block break stat tracker added
2016-01-15 13:01:26 +00:00
6a3e9ac19f
BaconBrawl stats added
2016-01-15 12:10:53 +00:00
1faeb43b73
fixed iron block sometimes sticking around after placing cannon
2016-01-15 07:17:51 +00:00
a554f1b7c6
needed to update some code with the cannon item location changing. also removed unused imports.
2016-01-15 07:00:39 +00:00
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
e0b7be0813
made /meow give you 64 cannons and 64 outposts
2016-01-15 06:58:20 +00:00
70444ff508
cannon + siege work with outposts, also moved outposts to the clans.siege package
2016-01-15 06:53:58 +00:00
404e049c31
Give item fix for offline players
2016-01-14 08:06:27 -05:00
cf7f5af9ca
Fixed who the winner is in MB Games.
2016-01-14 07:41:36 -05:00
2e433d8b06
Made sure that the active morph gets disabled on clear
2016-01-14 07:17:40 -05:00
595ab0d763
siege work
2016-01-14 09:46:12 +00:00
d33d682ebb
Implementing stats for every game, got all stat names ready
2016-01-13 18:40:29 +00:00
ee6425bbaf
Removed extra blank lines.
2016-01-12 23:31:35 -05:00
dfd5a63b78
More changes and fixes.
2016-01-12 23:29:08 -05:00
63897b9b54
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2016-01-12 20:05:34 -08:00
528a7435e7
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2016-01-12 20:25:08 -05:00
b27d5849d8
General fixes.
2016-01-12 20:23:25 -05:00
fb53e443e7
cleanup and cannons stuff
2016-01-12 20:27:24 +00:00
f3003e795e
Implemented Outpost MK III
2016-01-12 18:59:01 +00:00
6cde84ec5f
fixed outpost block placing/breaking boundary checking
2016-01-12 18:57:25 +00:00
025f82e5ed
made the forcefield bump much weaker
2016-01-12 16:31:21 +00:00
f1314d5c26
JSON now handled by JsonMessage Builder
2016-01-12 13:25:47 +00:00
62f16ada81
that's not the correct bounds!
2016-01-12 07:57:35 +00:00
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
b1c6af4d1a
Update CB
2016-01-12 20:18:03 +13:00
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
a6be919e4a
agh lost some code ;-;
2016-01-12 07:10:22 +00:00
ed8d9459b2
goes with the commit below VVVV
2016-01-12 07:02:19 +00:00
d3452772ed
outposts work (grr git is weird trying to switch over to clans/beta)
2016-01-12 07:02:03 +00:00
c873b6b886
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-12 06:58:53 +00:00
c3e11e87ea
Fix small issues with burning and ignition
2016-01-12 19:10:32 +13:00
11da5a3fe1
Fix fire combusting and cancelled damage events
2016-01-12 18:56:48 +13:00
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
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
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
88c53bf464
Added default ChatStat for all games to prevent my server from dying when testing
2016-01-11 19:35:00 +00:00
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
02ff8bdbdb
Custom stats working, escaping bug fix and List reset bug
2016-01-11 12:59:57 +00:00
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
b9d44d9a24
not updating properly, fixed
2016-01-11 12:14:29 +00:00
78eaee98df
Typo mistake
2016-01-11 12:09:08 +00:00
ec6e916c7b
more stable, progress for making 'easier-to-use'
2016-01-11 12:06:30 +00:00
3773ab3f0b
fixed safelog npcs sticking around some time
2016-01-11 10:14:32 +00:00
60a78e396f
remove legendary announcement in chat/middle text
2016-01-11 09:16:11 +00:00
6c055c31a0
Fix flashing through doors, Update to 0.18c
2016-01-10 20:39:56 -05:00
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
d4ccb82791
didn't push this earlier
2016-01-10 23:03:16 +00:00
6673081fb3
fixed LeechingAttribute from throwing an error when setting health above 20
2016-01-10 22:31:51 +00:00
04c7f2c1f1
made pressure plates, buttons, and levers from working with block toss
2016-01-10 22:20:50 +00:00
bccee71ff7
made signs placed by muted players get cleared on being placed
2016-01-10 21:16:49 +00:00
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
9c3a62a308
made it so punished players can't place signs
2016-01-10 21:03:34 +00:00
68808efb49
made players not be able to chat while chat is silenced
2016-01-10 20:57:12 +00:00
fa3de2a479
made clans ban messages not public
2016-01-10 20:55:29 +00:00
51872faa04
fix mutes not working
2016-01-10 20:53:55 +00:00
fa7eef5045
Muted players can't write on signs.
2016-01-10 13:13:38 -05:00
5caeb8bee0
even nicer visual
2016-01-10 17:34:15 +00:00
c814132b24
ratio's and nicer visuals
2016-01-10 17:33:18 +00:00
83375a6883
stats not updating
2016-01-10 16:01:40 +00:00
1bce624ab3
Finally got rid of MalformedJSON
2016-01-10 15:13:11 +00:00
ed43956945
Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
2016-01-10 16:37:51 +02:00
46695f8449
Fix hub fly for YOUTUBE_SMALL
2016-01-09 18:44:32 -05:00
83e5c7399e
Fix YOUTUBE_SMALL preferences
2016-01-09 18:41:19 -05:00
8193b5121b
Dont allow /disguise for YOUTUBE_SMALL
2016-01-09 18:39:47 -05:00
cd3037e7e5
Fix treasure purchases
2016-01-09 18:37:24 -05:00
942460b471
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2016-01-09 13:05:44 -08:00
263e1326cd
JSON progress
2016-01-09 20:22:29 +00:00
fa509f0043
fixed giant's broadsword giving HUGE regen. PLEASE PUSH ASAP
2016-01-09 19:58:31 +00:00
ce1bac8037
Remove unused imports.
2016-01-09 17:03:14 +02:00
62e1fb3688
Prevent players from stacking others with a menu inventory opened.
2016-01-09 17:01:57 +02:00
0f587ba5d9
fixing "Kicked for flying again" again...
2016-01-09 12:07:57 +01:00
ba3e7cb197
Merge branch 'master' into bugfix/thanos
2016-01-09 12:23:54 +02:00
2df626b35e
Fix CustomDataManager crash
2016-01-08 18:06:33 -05:00
511b39caa7
Merge branch 'master' into develop
2016-01-08 17:05:54 -05:00
ee73b374a6
Forgot to uncomment in ClansLoginManager
2016-01-08 06:36:59 -05:00
a75e2c15b8
Merge remote-tracking branch 'origin/develop' into develop
2016-01-08 06:35:37 -05:00
15109707f3
Merge pull request #119 in MIN/mineplex from clans/alpha to develop
...
* commit '025615d080b8b925f319a2f7707d2c3fa4755a88':
Clans Alpha 0.18b fixes
2016-01-08 05:34:35 -06:00
025615d080
Clans Alpha 0.18b fixes
2016-01-08 11:24:36 +00:00
5482d1dc40
Fixing "kicked for Flying"
2016-01-08 12:17:28 +01:00
0a56a838d2
Fix ClansLoginManager, Remove pointless code in CoreClientManager
2016-01-08 05:45:49 -05:00
6096fcad42
Fix hotbar issues
2016-01-08 04:06:11 -05:00
504d9d508c
Slightly reduce Squid's Ink Blast damage in SSM
2016-01-08 03:15:30 -05:00
1d2f61db8c
Disable purchasing Christmas Treasure
2016-01-08 03:15:05 -05:00
d361ce948e
Merge branch 'develop' into william-gladiators
...
# Conflicts:
# Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
2016-01-08 02:21:32 -05:00
db7d814e02
Disable hub music
2016-01-08 01:42:05 -05:00
19bb44cb9a
Disable HolidayManager and HolidayGiftManager
2016-01-08 01:41:02 -05:00
9c3b07123f
Revert to normal HubType
2016-01-08 01:39:54 -05:00
003af1b87c
Disable Holiday Words in DMT and Build
2016-01-08 01:38:49 -05:00
b6b455c1c0
Merge pull request #117 in MIN/mineplex from clans/alpha to develop
...
* commit '15d2118bc1701b79576f6d73dc1d4aeca500f11e': (23 commits)
Added C.Mod rank, and started on rank info.
changed outpost forcefields to be a bit larger to surround the outpost more.
made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.
added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost)
fixed outpost being built instantly on output block place.
holograms above outpost block should be centered in the block and made them despawn on outpost death
legendary pickkup message fix (FINALLY FIXED NOW )
quick modification to outposts, and fixed the legendary announcements being weird
updated clans version
quikc change
outpost changes, and some other things
lots of work on outposts, fixed gold dupe glitch, fixed clans ban gui title being "Customize New Gear".
fixes (?)
lots of changes that i can't remember at this point
Lots of changes, specifics: Fixed clans having more than max energy. Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory. /c <clan> now works with clans with 18+ players.
player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.
a couple more prettificatons to pvp timer messages.
one more quick message change/fix
qa changes to pvp safety
...
2016-01-08 00:35:15 -06:00
15d2118bc1
Added C.Mod rank, and started on rank info.
2016-01-07 23:32:51 +00:00
e1e8c2bb97
changed outpost forcefields to be a bit larger to surround the outpost more.
2016-01-07 21:02:55 +00:00
43f075014a
made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.
2016-01-07 20:05:33 +00:00
fff6d8e03f
added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
2016-01-07 19:36:52 +00:00
90a06d97b5
fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost)
2016-01-07 14:04:26 +00:00
d4fdda8ef2
fixed outpost being built instantly on output block place.
...
cleaned up a bit
2016-01-07 14:03:15 +00:00
5c810a46c9
holograms above outpost block should be centered in the block and made them despawn on outpost death
2016-01-07 13:26:18 +00:00
e9789b2ee8
legendary pickkup message fix (FINALLY FIXED NOW )
2016-01-07 10:31:23 +00:00
d88b14d9d6
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-07 09:35:07 +00:00
b685a207bc
quick modification to outposts, and fixed the legendary announcements being weird
2016-01-07 09:34:16 +00:00
ef929b39b3
updated clans version
2016-01-06 22:38:45 +00:00
76c0230805
quikc change
2016-01-06 22:35:09 +00:00
52c4a55180
outpost changes, and some other things
2016-01-06 22:32:36 +00:00
de6f6cf5f0
Add a IsLive check in Spleef
2016-01-07 08:49:26 +13:00
c920d4efa1
Modify MapText to actually work, modify UtilText to save the images of characters
2016-01-07 04:48:44 +13:00
101caf12ff
Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.
2016-01-05 20:48:28 +02:00
db2cddc443
Fixing Join/Quit messages
2016-01-05 19:10:40 +01:00
a73309fc11
Merge remote-tracking branch 'origin/develop' into develop
2016-01-04 18:14:10 -05:00
f749300d48
Fix team stats not displaying properly
2016-01-04 18:13:54 -05:00
10eb65a8d6
Merge pull request #114 in MIN/mineplex from bugfix/disguise-command to develop
...
* commit 'dd6d7b1b96947a400911bc5fa310039ab147c159':
updating denial message
Love you Sarah <3
Fixing Disguise File
update /Disguise for Hub as well
updating /disguise
2016-01-04 15:58:43 -06:00
652084d071
Merge pull request #115 in MIN/mineplex from bugfix/thanos to develop
...
* commit '3770211e66b41e16440609a0a79b3999b9b6cca7':
Turf Wars: Include Teddy's border fix.
Turf Wars: Undo bracket formatting.
Turf Wars: Apply knockback on all players when there are only two in the match.
Turf Wars: Add comment on block physics event.
Turf Wars: Fix sneaking near turf edge and wool placement near ladders.
2016-01-04 15:56:32 -06:00
962efe4a61
Fix not being able to join games through portals
2016-01-04 16:41:07 -05:00
ed81411373
Fix carl bonus messages
2016-01-04 15:58:27 -05:00
3770211e66
Turf Wars: Include Teddy's border fix.
2016-01-04 22:58:11 +02:00
982e684a45
Turf Wars: Undo bracket formatting.
2016-01-04 21:42:58 +02:00
c50fb52a88
Disable New Years Countdown
2016-01-04 14:21:21 -05:00
c739ecc26d
Fix forcefield for YOUTUBE_SMALL
2016-01-04 14:20:39 -05:00
47c78bcba1
Turf Wars: Apply knockback on all players when there are only two in the match.
2016-01-04 17:19:40 +02:00
f6ce98f65b
Turf Wars: Add comment on block physics event.
2016-01-02 23:33:08 +02:00
03c6395a30
Turf Wars: Fix sneaking near turf edge and wool placement near ladders.
2016-01-02 23:30:27 +02:00
dd6d7b1b96
updating denial message
2016-01-02 16:45:15 +01:00
b47665e115
lots of work on outposts,
...
fixed gold dupe glitch,
fixed clans ban gui title being "Customize New Gear".
2016-01-02 14:02:50 +00:00
7e1b0b9110
Love you Sarah <3
2016-01-02 03:19:39 +01:00
a06a0060aa
Fixing Disguise File
2016-01-02 01:53:19 +01:00
a30c2b0d75
update /Disguise for Hub as well
2016-01-02 00:53:56 +01:00
2e017fa5ca
Fix redis command
2015-12-31 16:11:51 -06:00
8232d11cd1
Remove in game notifications, change sale message
2015-12-31 15:07:26 -06:00
74eb04e5b4
Merge pull request #112 in MIN/mineplex from feature/new-year to develop
...
* commit '6b3a5416643389a7bcac8df93f40f492452971e5':
Accurate timings
Small edits
Flame
Made it activate in all lobbies via command.
Added a new years countdown to the hub.
2015-12-31 14:51:49 -06:00
6b3a541664
Accurate timings
2015-12-31 18:53:57 +00:00
456b0dbeb7
Merge pull request #110 in MIN/mineplex from feature/MasterBuilder-Unban to develop
...
* commit 'f83016e0074ce810f727276a0feb127ecd69098f':
Also really quickly fixed the Invisibility in lobby bug (hopefully)
Removed a weird query :/
Finished up the Unban feature...
Added a feature to unban clients across the network But there still a bug when you type a username of a none registered member. Will fix ASAP - likely after Mineware
2015-12-31 11:27:08 -06:00
8ef1a524c1
updating /disguise
2015-12-31 12:01:24 +01:00
efbd1c52d2
Merge remote-tracking branch 'origin/master' into feature/typewars-antimacrorekter
2015-12-31 03:01:23 -05:00
5ff9d1985b
Monitoring for josh + the mods
2015-12-31 03:00:40 -05:00
637baed830
Small edits
2015-12-31 01:24:58 +00:00
874695cdf6
Flame
2015-12-31 00:50:53 +00:00
a64dc6a8d4
Made it activate in all lobbies via command.
2015-12-31 00:46:31 +00:00
1b40cece80
Added a new years countdown to the hub.
2015-12-30 20:04:01 +00:00
f1c7424939
Fixing hotbar
2015-12-29 15:19:09 +00:00
55cdf4148a
Merge branch 'develop'
2015-12-29 03:21:03 -06:00
16ee74885e
Add maintenance line
2015-12-29 02:52:53 -06:00
7ad12d0a6b
Show Host Rank in private servers
2015-12-29 00:50:20 -06:00
7104f1363a
Give YT rank access to extra preferences
2015-12-29 00:34:18 -06:00
fe337986bf
Merge remote-tracking branch 'origin/develop' into bugfix/foo
2015-12-28 16:16:10 -08:00
8a8d5b088b
Switch to 7x7 builds.
2015-12-28 16:48:03 -05:00
3d9a252868
Added auto pickup and fixed some stuff.
2015-12-27 15:26:43 -05:00
162b3eb33f
Stopped a bunch of block events.
2015-12-27 14:34:24 -05:00
845014b677
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-25 15:49:41 -05:00
NewGarbo
Virizion
Cheese
Shaun Bennett
Teddy
md_5
fooify
Sarah
Mysticate
libraryaddict
Thanos paravantis
William Burns