8c4615203c
sale message
2015-12-07 20:07:20 +11:00
ed3bea8e85
DONE!
2015-12-07 18:36:05 +11:00
5c632a1e3a
sharper target
2015-12-07 18:20:12 +11:00
1a0d90a495
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 18:06:43 +11:00
fea637db80
fixed some freeze
2015-12-07 18:06:26 +11:00
ecde1dd314
Merge remote-tracking branch 'origin/master'
2015-12-07 02:06:09 -05:00
44a5bcb793
remove titan chest message, update pumkin message, holiday MB/DMT words
2015-12-07 02:06:00 -05:00
d75d7a2c8f
snowfight finish
2015-12-07 17:56:35 +11:00
1e441ac017
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 17:37:04 +11:00
1ada06af91
rewrote lots!
2015-12-07 17:36:45 +11:00
7b5db2d4fb
Hub Music, HubMusic Preference
2015-12-07 00:58:44 -05:00
5486d8acf6
more prep
2015-12-07 13:42:59 +11:00
97fe633e4c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 13:25:48 +11:00
54ec0e39bb
more polisshhhh on snowfight
...
enabled xmas chests
2015-12-07 13:25:32 +11:00
488895ea53
Note block player
2015-12-06 21:12:10 -05:00
cbafb2ba91
fixes
2015-12-07 13:04:45 +11:00
0c397d6a81
simplified kits and intro
2015-12-07 13:02:26 +11:00
b2a595b01b
snwo fight changes
2015-12-07 12:02:53 +11:00
6f16eeead7
missin files
2015-12-07 08:48:55 +11: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
fa6418769b
YT name change
2015-12-06 21:26:02 +11:00
ccb6456110
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
2015-12-06 18:09:24 +11:00
35c362b8bf
small youtuber perms
2015-12-06 18:08:36 +11:00
b7b5235f59
Fix error
2015-12-06 00:57:43 -05:00
d095e14b4c
Merge branch 'monster-league'
2015-12-06 16:33:21 +11:00
9880e9a3c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-06 16:32:59 +11:00
040e94f1fb
bouncy
2015-12-06 16:32:45 +11:00
618105b4c8
Add minimum rank to Announcement Command
2015-12-06 00:15:49 -05:00
8d831d5228
Fix END_PORTAL bug causing gui's to break
2015-12-06 00:06:31 -05:00
9c7eea86b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-06 14:56:18 +11:00
32a6d572ee
Disable gadgets in arcade for player count > 40
2015-12-05 22:56:15 -05:00
5aabd00972
set hub to christmas
...
removed snowball pickup
disabled arrows sticking into players from ALL projectiles
2015-12-06 14:55:28 +11: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
b98944b0a0
Handle attach entity
2015-12-06 14:38:00 +13:00
d5606f55ea
Modified CustomTagFix to support player name titles
2015-12-06 10:18:35 +13:00
9bd7869e22
Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.
2015-12-05 01:08:21 +00: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
e01d30b920
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-04 13:19:07 +11:00
ef2511434d
tuber arnk
2015-12-04 13:18:23 +11:00
fc68ce9b78
Merge pull request #87 in MIN/mineplex from virizion_utils to master
...
* commit '9951701ded301c47bcc203c12001ef866204b78c':
Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it.
2015-12-03 19:05:15 -06:00
9951701ded
Added a FixSpawnFacing flag to Game which controls whether or not GameTeam will modify the yaw of a spawn when returning it.
2015-12-03 19:51:11 -05:00
8717f962e6
Merge pull request #83 in MIN/mineplex from mrsomeone12_SmallFixes to master
...
* commit 'c98b427fdebb0d8abcce3a17731c0f9b35eece01':
Added missing MountData and SingleEntityMountData files.
Mount bug fix.
Added method to edit NoAI field on entities.
Implemented new mount data system replacing instead of entities as data.
We only need to add the "Go Back" page once...
TitanMount fixes
2015-12-03 17:15:21 -06: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
fc0cae8e0f
Merge pull request #85 in MIN/mineplex from virizion_utils to master
...
* commit 'bf92af647abceb78596f9fd1922d3522e61ff053':
Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames).
2015-12-02 18:53:30 -06: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
bf92af647a
Fixed the skull bug where it gave you the wrong skull type. Now gets the meta of the block as well. Also can return multiple items if the block is made up of multiple items (flower pots, ender portal frames).
2015-12-02 00:00:32 -05: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
633697dc7a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 23:49:32 -06:00
03a1f19df9
Fixed memory leaks in Disguise and Recall.
...
Removed debug messages in ItemMapManager
2015-11-30 23:49:16 -06:00
51023a7630
cosmetic cooldown fix
2015-12-01 15:38:54 +11:00
208eaf3a01
cosmetics recharge slowdown
2015-12-01 11:38:52 +11:00
c98b427fde
Added missing MountData and SingleEntityMountData files.
...
For some reason, git decided that it was a good idea to remove these two
files from the index...
2015-12-01 00:46:20 +01:00
1a1fa684e4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-01 10:44:39 +11:00
7217cd0f33
remove conditions upon death
2015-12-01 10:44:13 +11:00
9d380a0b31
Merge remote-tracking branch 'remotes/origin/master' into virizion_utils
2015-11-30 17:47:08 -05:00
666b9963e4
Added an utility method in UtilBlock to get an ItemStack from a block and also handles correcting Material types and Data Values.
2015-11-30 17:42:48 -05:00
18504e48f7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-11-30 21:00:42 +00:00
1a851679c4
made it so players cannot see chat whilst in tutorial
2015-11-30 20:40:30 +00:00
482ec8a120
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-11-30 14:26:37 -06:00
513810caaa
Fixed memory leak in MarkedForDeath
2015-11-30 14:26:25 -06: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
Cheese
Shaun Bennett
NewGarbo
libraryaddict
Keir
Virizion
Jonathan Williams
xGamingDudex