maint: add some changes from private repo
All checks were successful
test / Test on Linux (push) Successful in 10s
All checks were successful
test / Test on Linux (push) Successful in 10s
This commit is contained in:
parent
a938208450
commit
9a7bbbff0d
Binary file not shown.
@ -476,7 +476,8 @@ spawnplayer( var_0 )
|
|||||||
self.waitingtospawnamortize = 0;
|
self.waitingtospawnamortize = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// // Returning false we use default character model and prevent a 5 second respawn delay. (Github issue #109)
|
// It's possible when changing teams that we don't have our own customization loaded, wait until that's done
|
||||||
|
// Setting self.waitingtospawnamortize to false so we can use the default character model and prevent a 5 second respawn delay. (Github issue #109)
|
||||||
if ( !self hasloadedcustomizationplayerview( self ) )
|
if ( !self hasloadedcustomizationplayerview( self ) )
|
||||||
self.waitingtospawnamortize = 0;
|
self.waitingtospawnamortize = 0;
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ package.loaded["LUI.mp_hud.OptionsMenu"].options_def = function()
|
|||||||
button_action_func = LUI.mp_hud.OptionsMenu.endGameButtonAction
|
button_action_func = LUI.mp_hud.OptionsMenu.endGameButtonAction
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
LUI.MenuBuilder.BuildAddChild(self, {
|
LUI.MenuBuilder.BuildAddChild(self, {
|
||||||
type = "UIGenericButton",
|
type = "UIGenericButton",
|
||||||
id = "btn_MPPause_5",
|
id = "btn_MPPause_5",
|
||||||
@ -109,6 +109,6 @@ package.loaded["LUI.mp_hud.OptionsMenu"].options_def = function()
|
|||||||
button_action_func = MBh.PopupMenu( "quit_popmenu", false, false )
|
button_action_func = MBh.PopupMenu( "quit_popmenu", false, false )
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
return self
|
return self
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user