03da4485b3
pushing to switch to clans/alpha
2016-02-04 22:54:43 +00:00
bc19cf01f7
hopefully that fixes the location offset =/
2016-02-04 22:48:11 +00:00
fa460dbd45
catapult rotatyyyy
2016-02-04 21:50:47 +00:00
50c2da2a95
forgot to include this; version getter thingy in Clans
2016-02-04 16:10:14 +00:00
5a8fae4974
stop catapult projectile from getting stuck on bounding box
2016-02-04 16:09:32 +00:00
ecdd21a800
version or plugin command now shows version of clans
2016-02-04 16:09:13 +00:00
b13494f399
more modifications to siege weapons.
2016-02-04 16:00:41 +00:00
c17849b751
fixed some autoboxing stuff
2016-02-03 17:30:07 +00:00
4e2da061bb
added protection around siege weapon
2016-02-03 17:07:06 +00:00
4488b73e93
change catapult bounding box to 3
2016-02-03 17:02:31 +00:00
0cb557d922
moved some stuff around and slight changes
2016-02-03 17:02:06 +00:00
38cae1e3a2
catapult implemented using new siege weapon system, cannons polished up. not tested completely. don't expect this code to work fully haaha
2016-02-03 15:28:53 +00:00
6bba486385
Added message if cannon is not loaded correctly
2016-02-03 11:20:11 +00:00
d4388870c1
fixed inventory opening on mount
2016-02-03 11:19:33 +00:00
8004d0dc3c
fixed npes
2016-02-03 11:06:58 +00:00
95741e3029
fixed siege weapon base
2016-02-03 10:53:53 +00:00
5fd089c768
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-02-03 17:43:43 +11:00
f011fdad5f
Fixes to TntProtection
2016-02-03 15:10:56 +11:00
0e0582a1a7
Added safe zone protection for flame
2016-02-03 10:39:21 +11:00
9086188280
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/ClansManager.java
2016-02-02 22:02:06 +00:00
6fea76a8e4
finalized alpha patches
2016-02-02 21:38:38 +00:00
23883148dd
alpha fixes
2016-02-02 20:55:23 +00:00
cfbfb1fa3b
raised war points for invasion to 25
2016-02-02 20:42:20 +00:00
9fa5927240
siege weapon base progress
2016-02-02 19:41:25 +00:00
59e564cdc6
Fixes to war point evasion
2016-02-02 23:18:05 +11:00
f1c49fa5ee
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-02-02 22:13:38 +11:00
8a0f585432
Added fix to WarPoint evasion bug + 1 dmg bug
2016-02-02 22:11:52 +11:00
84b887fe89
that's not needed
2016-02-01 19:53:59 +00:00
b4ed912f7d
siege weapon modular system beginnings
2016-02-01 19:52:53 +00:00
45aacd626e
this isn't used anymore
2016-01-31 19:20:15 +00:00
cc857da88e
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
2016-01-31 16:27:14 +00:00
9c83c64d01
Fixed issues with Broadsword
...
Added max building height of 100
2016-01-30 21:34:06 +11:00
4612550ba5
Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha
2016-01-30 19:24:42 +11:00
aa0cfc7710
Fixes to TnTGeneration
...
Fixes to Broadsword giving Generation and slowness 42 instead of 4
2016-01-30 19:23:59 +11:00
c23855bd65
Merge with develop
2016-01-30 02:44:24 -05:00
fe01c9b8d5
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-01-29 20:57:10 +00:00
d10266c4d1
sapling fix
2016-01-29 20:56:38 +00:00
7d28bc69c9
collision boxes on siege weapons and other stuff
2016-01-29 20:55:56 +00:00
76dba421b4
sapling fix [THIS NEEDS TO GET PUT ONTO CLANS/ALPHA]
2016-01-29 20:54:31 +00:00
1c3c800a66
Update fixes - @Teddy!
2016-01-29 14:05:09 -05:00
50fc1f5a10
merge with develop
2016-01-29 03:44:04 -05:00
7860ca24c8
disallow all staff from using /we
2016-01-28 23:33:06 +00:00
f86262dc0e
catapult and cannon progress
2016-01-28 23:32:23 +00:00
37fb656279
dispenser
2016-01-28 13:31:45 +00:00
f645c4d6f8
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-28 13:30:50 +00:00
88c1391ba2
disallow sapling in dispensers (grrr working in two different branches is really strange)
2016-01-28 13:30:16 +00:00
8cb5591218
merge conflicts
2016-01-28 13:28:39 +00:00
a0cc0b7ec9
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/Gameplay.java
2016-01-28 13:28:00 +00:00
b5f04011e5
fixed chatslow not working + filter not working for players not in clan
2016-01-28 13:24:30 +00:00
ceeeb3bc45
no tnt from dispensers
2016-01-28 10:58:46 +00:00
682a243c31
fixed catapult state being mapped to incorrect blocks
2016-01-28 09:18:58 +00:00
3d4cd9ee27
Fix tutorial command, add tutorial info to scoreboard, message manager, transitioning to a visual manager
2016-01-26 17:47:01 -06:00
7f7e73a101
more catapults!
2016-01-26 21:10:58 +00:00
3d7a371d1d
catapults
2016-01-26 20:18:53 +00:00
155d8bff1b
Fix cannon angles
2016-01-26 13:36:30 -06:00
63f9622876
cannon correctly loadded title + fixed rotation being all wrong
2016-01-26 17:51:29 +00:00
7c85fe62ca
charred blocks updates
2016-01-26 17:36:12 +00:00
2445e73623
better cannon crater particles
2016-01-26 13:06:47 +00:00
3b18b93286
fixed top right slot in cannon not counting as an empty slot.
2016-01-26 09:26:51 +00:00
467af4b835
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
2016-01-26 09:24:53 +00:00
e68dea65e1
stop dispensers being used for flint-andsteal, bonemeal etc etc
2016-01-25 17:46:39 +00:00
18e892c4ec
finally fixed that windblade dupe
2016-01-25 17:41:07 +00:00
71bb1ed3d6
this is just really slowing down startup time by A LOT
2016-01-25 17:22:56 +00:00
9d77632fcc
allow clans moderators to use /cb
2016-01-25 17:18:00 +00:00
2bf2050844
increased sapling cooldown to 20 minutes from one second.
2016-01-25 17:13:53 +00:00
7f1c74ced5
bumped version up to 0.19
2016-01-25 17:11:08 +00:00
2b70daf8df
allowed clans mods to use /cban
2016-01-25 17:02:49 +00:00
5a5dc9925e
set spawning rate of charred blocks a 10% lower
2016-01-25 17:02:26 +00:00
208df93739
fixed fire particles not showing up in craters
2016-01-25 17:02:02 +00:00
ce36cf79bf
added a tnt limit, set to 1 as it makes gameplay better
2016-01-25 17:01:46 +00:00
9b88683fdc
fix cannon tnt exploding prematurely, added cooldown rather than using Recharge.
2016-01-25 17:00:38 +00:00
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
d82a7b353f
allow C.Mods to join all server regardless of home servers
2016-01-25 08:42:38 +00:00
54fa1449f6
cannon crater changes
2016-01-25 08:40:59 +00:00
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
0252436990
cannons updates
2016-01-24 20:56:47 +00:00
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
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
9884742552
Fix OrderedObjectives, Starting CombatTutorial work
2016-01-19 16:34:51 -05:00
80d55b2c9c
It works!
2016-01-19 13:34:17 -05:00
0f83263871
Merge remote-tracking branch 'remotes/origin/clans/beta' into clans/tutorial
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2016-01-19 11:01:11 -05:00
947ce254da
Tutorial Gui, Fixes
2016-01-19 10:59:56 -05:00
976779b9f2
Tutorial Work
2016-01-17 22:45:38 -05:00
4927bb8c0b
Fix some misc suspicious calls to Collection methods.
2016-01-17 20:20:48 +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
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
595ab0d763
siege work
2016-01-14 09:46:12 +00: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
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
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
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
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
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
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
fa509f0043
fixed giant's broadsword giving HUGE regen. PLEASE PUSH ASAP
2016-01-09 19:58:31 +00: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
025615d080
Clans Alpha 0.18b fixes
2016-01-08 11:24:36 +00:00
0a56a838d2
Fix ClansLoginManager, Remove pointless code in CoreClientManager
2016-01-08 05:45:49 -05:00
15d2118bc1
Added C.Mod rank, and started on rank info.
2016-01-07 23:32:51 +00:00
b606c8da22
More tutorial
2016-01-07 18:08:54 -05: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
05ef4d30c7
Store a set of active members for objective goals
2016-01-04 15:56:33 -05:00
ce8586e5c5
More work and refactoring on the tutorial
2016-01-04 14:18:58 -05: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
d08cfa0c4c
Holiday Gifts
2015-12-25 01:51:36 -06:00
aa50c4762f
fixes (?)
2015-12-23 18:55:44 +00:00
1d4a5e5804
Clean up imports, set resource pack on clans.
2015-12-24 07:47:05 +13:00
000b1f85b7
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop
2015-12-24 07:41:55 +13:00
67bdc6832f
Tentative beginnings for clans resource packs
2015-12-24 07:40:49 +13:00
369687b5dd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
...
Conflicts:
Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
2015-12-23 18:31:51 +00:00
ff24ebc9f4
lots of changes that i can't remember at this point
2015-12-23 18:22:20 +00:00
0da28faab8
Work on new tutorial
2015-12-21 03:49:27 -05:00
1840572c49
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.
2015-12-18 11:13:38 +00:00
f80648bfbc
Update DBPool to load from file
2015-12-18 00:32:07 -05:00
4bf7e15055
player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.
2015-12-18 01:05:02 +00:00
b4c3ce9fba
a couple more prettificatons to pvp timer messages.
2015-12-16 23:19:04 +00:00
eb9ba92fb1
one more quick message change/fix
2015-12-16 22:53:24 +00:00
2ee1ccbcf9
qa changes to pvp safety
2015-12-16 22:48:55 +00:00
d619a9644b
few changes to pvp timer, and fixed bugs etc
2015-12-16 18:25:30 +00:00
7ac1fd86b4
made pvp timer players immune to skills
2015-12-15 21:12:49 +00:00
baef84f4d9
fixed pvp timer subtitles bugged out
2015-12-15 20:09:54 +00:00
6a346790f7
disable tutorial
2015-12-15 12:00:56 +00:00
1da04b84b5
test push (change version to 0.17d)
2015-12-15 11:57:33 +00:00
9137fcfe40
loads of changes (pvp timer, unsafe stuff)
2015-12-14 12:39:00 +00:00
6c2b40d63a
Cannon work
2015-12-13 15:40:32 -05:00
667f076202
fixed unsafe timer
2015-12-09 10:46:05 +00:00
425463d339
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-06 19:11:13 +00:00
a9c7f088f3
made use ability teleport player back to where they should be
2015-12-06 19:10:18 +00:00
11e1e53a36
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-05 21:36:19 -05:00
d5a9a92913
Forgot to push these changes last update!
2015-12-05 21:36:07 -05:00
5d59b1a015
fixed tnt blowing up in claims when offline
2015-12-04 18:32:46 +00:00
bca65116ab
fixed task not getting cleanup up after /skiptutorial
2015-12-04 18:23:23 +00:00
f57f4ed0aa
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-04 12:10:10 -05:00
e158704534
fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
2015-12-04 15:58:51 +00:00
bb382a969c
Fix heavy attribute, disable claim visualizer
2015-12-04 08:02:38 -05:00
3b125dc8a5
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java
2015-12-04 11:12:19 +00:00
2435ebba13
Disable subtasks for now
2015-12-04 05:16:14 -05:00
5c575b41fc
Clans alpha 0.17
2015-12-04 05:15:28 -05:00
39daf969fd
clan claim visualizer
2015-12-03 22:29:36 +00:00
584a02ae3e
fixed infinite claims
2015-12-03 10:30:06 +00:00
e9fd661311
disabled koth
2015-12-02 18:25:53 +00:00
8fea5afdce
fixed message on tick (might be cause of laggg)
2015-12-02 06:56:58 +00:00
92c1abf221
a few last touches
2015-12-02 06:04:53 +00:00
8db5ffe5c7
forcejoin command for ADMIN+ and fixed auto tree replanting.
2015-12-02 05:54:00 +00:00
3a4e453ac3
made it so that you can only use /reset in safe zones
2015-12-02 05:18:04 +00:00
d6ca52e4a4
modifications
2015-12-02 05:11:09 +00:00
b8e2086928
changes to tutorial
2015-12-02 00:19:48 +00:00
ba27d94158
fixed skiptutorial message not displaying
2015-12-01 23:23:11 +00:00
cffb6bd62f
bunch o' changes
2015-12-01 23:01:41 +00:00
a7d6026c07
made skip tutorial messages be seen whilst in tutorial
2015-12-01 22:33:47 +00:00
69cb395f5a
made entire clan know about disband
2015-12-01 22:30:05 +00:00
35ae89ab1f
fixed players from being able to eat their carrot in the making money task
2015-12-01 19:37:53 +00:00
ea099d7a82
fixed some annoying bugs and fixed certain messages not showing in tutorial
2015-12-01 18:41:33 +00:00
fbf9c8eb0c
made certain messages visible in tutorial that are actually required to be seen
2015-12-01 13:37:34 +00:00
f536bf23e5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-01 12:06:25 +00:00
d32e6fdb96
Got rid of deployed tasks. using different system now. (untested)
2015-12-01 11:28:14 +00:00
03a1f19df9
Fixed memory leaks in Disguise and Recall.
...
Removed debug messages in ItemMapManager
2015-11-30 23:49:16 -06:00
1a851679c4
made it so players cannot see chat whilst in tutorial
2015-11-30 20:40:30 +00:00
6eb44ed87b
whoops.. this isn't php hehe
2015-11-30 19:11:18 +00:00
813e7ee789
made it so that no messages are shown when in tutorial
2015-11-30 19:08:16 +00:00
0862cfce72
fixed doors getting placed in spawn and shops
2015-11-30 07:26:02 +00:00
261d6dd030
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-30 07:08:34 +00:00
f528531b82
removed some testing stuff
2015-11-30 07:06:36 +00:00
34c4bade06
Merge remote-tracking branch 'origin/master'
2015-11-29 19:30:51 -05:00
02bc7ffab6
map changes
2015-11-30 11:17:23 +11:00
981eead816
Merge remote-tracking branch 'origin/master'
2015-11-29 19:05:56 -05:00
0f79b5814f
more color f ixes
2015-11-30 10:52:44 +11:00
25bb913c4f
Merge remote-tracking branch 'origin/master'
2015-11-29 18:41:35 -05:00
2ac21b1434
better colors
2015-11-30 10:40:57 +11:00
4a9d53de50
Merge remote-tracking branch 'origin/master'
2015-11-29 18:33:43 -05:00
18b603ec2f
map color changes
2015-11-30 10:33:08 +11:00
f7f7d5fdef
Merge remote-tracking branch 'origin/master'
2015-11-29 18:26:40 -05:00
e27808a011
map!
2015-11-30 10:26:07 +11:00
125d9988c2
Merge remote-tracking branch 'origin/master'
2015-11-29 18:21:02 -05:00
cd6ecc1e67
pt!
2015-11-30 10:20:27 +11:00
06706da4cf
Merge remote-tracking branch 'origin/master'
2015-11-29 18:16:13 -05:00
a886088f48
more changes
2015-11-30 10:15:50 +11:00
2b22639d8a
Merge remote-tracking branch 'origin/master'
2015-11-29 18:03:46 -05:00
af77a2ddeb
fix
2015-11-30 10:03:27 +11:00
1c71efbff7
Merge remote-tracking branch 'origin/master'
2015-11-29 17:59:39 -05:00
58d7e8562b
update clans version for next release
2015-11-29 17:58:29 -05:00
af61b62a47
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 09:58:06 +11:00
7e3cab9c87
map test
2015-11-30 09:57:47 +11:00
8026ad891d
fixed king of the hill
2015-11-29 21:09:18 +00:00
be727e6e26
fixed deployed tasks not being deregistered as Listeners after being adding to Cull
2015-11-29 19:46:08 +00:00
7bdf5451d4
Upped map scan performance.
2015-11-29 02:49:12 -06:00
1d1a1d96f8
Fixed onAbilityUsed bug with _player (presumably because it was added to cull and _player was set to null right before SkillTriggerEvent happened.)
2015-11-29 02:39:37 -06:00
5b04a3223d
Fixed bug with Posion effect NPE (Something in champs is adding a null source).
...
Fixed bug with Tutorial cleanup.
2015-11-29 02:29:47 -06:00
782026556e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-29 02:24:32 -06:00
e9da258333
Lowered scan rate significantly for ItemMapManager.
2015-11-29 02:24:17 -06:00
f82396d485
Clans changes/fixes
2015-11-29 02:41:53 -05:00
0d5fa70632
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-28 23:05:32 -06:00
5acf6b19a4
Fixed bed checking interval.
...
Added timing logging to map rendering.
2015-11-28 23:05:22 -06:00
b88a842f1c
stuff
2015-11-29 03:22:52 +00:00
c870d99e0e
teleport stuff
2015-11-29 02:55:45 +00:00
a9afe1f068
added self clan create/delete messages
2015-11-29 02:54:40 +00:00
84303234fd
fixed task 2
2015-11-29 02:48:03 +00:00
392ab601c2
tutorial tasks reset
2015-11-29 02:43:12 +00:00
d7658f3838
fixed stuck manager taking 0 seconds
2015-11-29 02:39:09 +00:00
dc5aec33b4
tutorial ending message
2015-11-29 02:37:20 +00:00
8dca384d35
force join command
2015-11-29 02:31:14 +00:00
9ff9724fc8
tutorial revamp 2.0
2015-11-29 02:10:39 +00:00
ace4548b1e
don't cull an entity if a player is nearby
2015-11-28 20:14:48 +00:00
afbccba36f
added force join command for ADMIN+
2015-11-28 19:56:47 +00:00
75ef42d8c9
fixed the clan claim box check
2015-11-28 19:37:03 +00:00
NewGarbo
phobia
Shaun Bennett
md_5
libraryaddict
Shaun Bennett
Jonathan Williams
Cheese