JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,534 Commits 1 Branch 0 Tags 481 MiB
d22a905206
Commit Graph

5534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Virizion
9144ab7b3f Fixed some demolition stuff. 2015-12-05 20:30:21 -05:00
Virizion
5b49c4adc3 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-05 19:58:55 -05:00
Virizion
d3ce0d6434 Some more stuff on the checklist. 2015-12-05 19:57:48 -05:00
libraryaddict
d5606f55ea Modified CustomTagFix to support player name titles 2015-12-06 10:18:35 +13:00
Virizion
62c49fa8e6 some more stuff on the checklist 2015-12-04 23:04:52 -05: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
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
Virizion
efbabb1519 Players now look at the middle of the middle block instead of the corner. 2015-12-03 21:27:10 -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
Virizion
465f8c28f6 Set FixSpawnFacing to false so that out looking at the middle feature would work. 2015-12-03 21:13:33 -05:00
Virizion
bb708911d6 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-03 21:10:31 -05: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
Virizion
c3a564faa7 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-03 19:31:24 -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
Virizion
ee51766e1f Removed teleports. Made the spawns face the middle but it doesn't work yet because of GameTeam changing the direction again. 2015-12-02 22:12:53 -05:00
Virizion
f0c28e6234 Updated references to the util method. 2015-12-02 20:20:14 -05:00
Virizion
cab5c2a76d Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-02 20:12:41 -05:00
Christopher Jozsa
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
Shaun Bennett
717508529c Merge pull request #86 in MIN/mineplex from clans-beta to master 
* commit 'e9fd661311910c81c287ca146d5f22ccbe80dfcc': (22 commits)
  disabled koth
  fixed message on tick (might be cause of laggg)
  a few last touches
  forcejoin command for ADMIN+ and fixed auto tree replanting.
  made it so that you can only use /reset in safe zones
  modifications
  changes to tutorial
  fixed skiptutorial message not displaying
  bunch o' changes
  made skip tutorial messages be seen whilst in tutorial
  made entire clan know about disband
  fixed players from being able to eat their carrot in the making money task
  fixed some annoying bugs and fixed certain messages not showing in tutorial
  made certain messages visible in tutorial that are actually required to be seen
  Got rid of deployed tasks. using different system now. (untested)
  made it so players cannot see chat whilst in tutorial
  whoops.. this isn't php hehe
  made it so that no messages are shown when in tutorial
  fixed doors getting placed in spawn and shops
  removed some testing stuff
  ...
 2015-12-02 18:52:16 -06:00
NewGarbo
e9fd661311 disabled koth 2015-12-02 18:25:53 +00:00
NewGarbo
8fea5afdce fixed message on tick (might be cause of laggg) 2015-12-02 06:56:58 +00:00
NewGarbo
92c1abf221 a few last touches 2015-12-02 06:04:53 +00:00
NewGarbo
8db5ffe5c7 forcejoin command for ADMIN+ and fixed auto tree replanting. 2015-12-02 05:54:00 +00:00
NewGarbo
3a4e453ac3 made it so that you can only use /reset in safe zones 2015-12-02 05:18:04 +00:00
NewGarbo
d6ca52e4a4 modifications 2015-12-02 05:11:09 +00:00
Virizion
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
Virizion
1810defd2d Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2015-12-01 20:39:54 -05:00
NewGarbo
b8e2086928 changes to tutorial 2015-12-02 00:19:48 +00:00
NewGarbo
ba27d94158 fixed skiptutorial message not displaying 2015-12-01 23:23:11 +00:00
NewGarbo
cffb6bd62f bunch o' changes 2015-12-01 23:01:41 +00:00
NewGarbo
a7d6026c07 made skip tutorial messages be seen whilst in tutorial 2015-12-01 22:33:47 +00:00