Commit Graph

5592 Commits

Author SHA1 Message Date
Cheese
1ada06af91 rewrote lots! 2015-12-07 17:36:45 +11:00
Shaun Bennett
7b5db2d4fb Hub Music, HubMusic Preference 2015-12-07 00:58:44 -05:00
Cheese
5486d8acf6 more prep 2015-12-07 13:42:59 +11:00
Cheese
97fe633e4c Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 13:25:48 +11:00
Cheese
54ec0e39bb more polisshhhh on snowfight
enabled xmas chests
2015-12-07 13:25:32 +11:00
Shaun Bennett
488895ea53 Note block player 2015-12-06 21:12:10 -05:00
Cheese
cbafb2ba91 fixes 2015-12-07 13:04:45 +11:00
Cheese
0c397d6a81 simplified kits and intro 2015-12-07 13:02:26 +11:00
Cheese
b2a595b01b snwo fight changes 2015-12-07 12:02:53 +11:00
Cheese
6f16eeead7 missin files 2015-12-07 08:48:55 +11:00
NewGarbo
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
NewGarbo
a9c7f088f3 made use ability teleport player back to where they should be 2015-12-06 19:10:18 +00:00
Cheese
fa6418769b YT name change 2015-12-06 21:26:02 +11:00
Cheese
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
Cheese
35c362b8bf small youtuber perms 2015-12-06 18:08:36 +11:00
Shaun Bennett
b7b5235f59 Fix error 2015-12-06 00:57:43 -05:00
Cheese
d095e14b4c Merge branch 'monster-league' 2015-12-06 16:33:21 +11:00
Cheese
9880e9a3c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-06 16:32:59 +11:00
Cheese
040e94f1fb bouncy 2015-12-06 16:32:45 +11:00
Shaun Bennett
618105b4c8 Add minimum rank to Announcement Command 2015-12-06 00:15:49 -05:00
Shaun Bennett
8d831d5228 Fix END_PORTAL bug causing gui's to break 2015-12-06 00:06:31 -05:00
Cheese
9c7eea86b4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-06 14:56:18 +11:00
Shaun Bennett
32a6d572ee Disable gadgets in arcade for player count > 40 2015-12-05 22:56:15 -05:00
Cheese
5aabd00972 set hub to christmas
removed snowball pickup
disabled arrows sticking into players from ALL projectiles
2015-12-06 14:55:28 +11:00
Shaun Bennett
11e1e53a36 Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-12-05 21:36:19 -05:00
Shaun Bennett
d5a9a92913 Forgot to push these changes last update! 2015-12-05 21:36:07 -05:00
libraryaddict
b98944b0a0 Handle attach entity 2015-12-06 14:38:00 +13:00
libraryaddict
d5606f55ea Modified CustomTagFix to support player name titles 2015-12-06 10:18:35 +13:00
Thanos paravantis
b64f561659 Merge branch 'MortensRawBugFixes' into thanos-mineware
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
2015-12-05 22:54:50 +02:00
Thanos paravantis
0c85e5d199 Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes 2015-12-05 22:53:51 +02:00
Thanos paravantis
a943808250 Remove old unused build race challenge. 2015-12-05 22:52:52 +02:00
Morten
e8f7b140df Added Achievements and fixed bugs. 2015-12-05 21:47:13 +01:00
Keir
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
Thanos paravantis
91e0547612 Merge branch 'master' into thanos-mineware
Conflicts:
	.gitignore
2015-12-04 22:04:46 +02:00
Thanos paravantis
e27ce2587d Finalizing Fishing Day Challenge. 2015-12-04 22:01:47 +02:00
NewGarbo
5d59b1a015 fixed tnt blowing up in claims when offline 2015-12-04 18:32:46 +00:00
NewGarbo
bca65116ab fixed task not getting cleanup up after /skiptutorial 2015-12-04 18:23:23 +00:00
Shaun Bennett
f57f4ed0aa Merge remote-tracking branch 'origin/clans-beta' into clans-beta 2015-12-04 12:10:10 -05:00
NewGarbo
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
Shaun Bennett
bb382a969c Fix heavy attribute, disable claim visualizer 2015-12-04 08:02:38 -05:00
NewGarbo
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
Shaun Bennett
2435ebba13 Disable subtasks for now 2015-12-04 05:16:14 -05:00
Shaun Bennett
5c575b41fc Clans alpha 0.17 2015-12-04 05:15:28 -05:00
Cheese
e01d30b920 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-04 13:19:07 +11:00
Cheese
ef2511434d tuber arnk 2015-12-04 13:18:23 +11:00
Christopher Jozsa
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
Virizion
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
Christopher Jozsa
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
NewGarbo
39daf969fd clan claim visualizer 2015-12-03 22:29:36 +00:00
NewGarbo
584a02ae3e fixed infinite claims 2015-12-03 10:30:06 +00:00