Merge branch 'main' into feat/replace-4jlibs
This commit is contained in:
3
.github/workflows/nightly.yml
vendored
3
.github/workflows/nightly.yml
vendored
@@ -35,4 +35,5 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
tag_name: nightly
|
tag_name: nightly
|
||||||
name: Nightly Release
|
name: Nightly Release
|
||||||
files: LCEWindows64.zip
|
body: Compiled with MSVC v14.44.35207 in Release mode with Whole Program Optimization, as well as `/O2 /Ot /Oi /Ob3 /GF`. (So far the floating point model is `/fp:strict` to avoid undefined behavior before we refactor for performance). Requires at least Windows 7 and DirectX 11 compatible GPU to run.
|
||||||
|
files: LCEWindows64.zip
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ void Input::tick(LocalPlayer *player)
|
|||||||
// Delta should normally be 0 since applyFrameMouseLook() already consumed it
|
// Delta should normally be 0 since applyFrameMouseLook() already consumed it
|
||||||
if (rawDx != 0.0f || rawDy != 0.0f)
|
if (rawDx != 0.0f || rawDy != 0.0f)
|
||||||
{
|
{
|
||||||
float mouseSensitivity = 0.5f;
|
float mouseSensitivity = ((float)app.GetGameSettings(iPad, eGameSetting_Sensitivity_InGame)) / 100.0f;
|
||||||
float mdx = rawDx * mouseSensitivity;
|
float mdx = rawDx * mouseSensitivity;
|
||||||
float mdy = -rawDy * mouseSensitivity;
|
float mdy = -rawDy * mouseSensitivity;
|
||||||
if (app.GetGameSettings(iPad, eGameSetting_ControlInvertLook))
|
if (app.GetGameSettings(iPad, eGameSetting_ControlInvertLook))
|
||||||
|
|||||||
@@ -1191,7 +1191,7 @@ void Minecraft::applyFrameMouseLook()
|
|||||||
KMInput.ConsumeMouseDelta(rawDx, rawDy);
|
KMInput.ConsumeMouseDelta(rawDx, rawDy);
|
||||||
if (rawDx == 0.0f && rawDy == 0.0f) continue;
|
if (rawDx == 0.0f && rawDy == 0.0f) continue;
|
||||||
|
|
||||||
float mouseSensitivity = 0.5f;
|
float mouseSensitivity = ((float)app.GetGameSettings(iPad, eGameSetting_Sensitivity_InGame)) / 100.0f;
|
||||||
float mdx = rawDx * mouseSensitivity;
|
float mdx = rawDx * mouseSensitivity;
|
||||||
float mdy = -rawDy * mouseSensitivity;
|
float mdy = -rawDy * mouseSensitivity;
|
||||||
if (app.GetGameSettings(iPad, eGameSetting_ControlInvertLook))
|
if (app.GetGameSettings(iPad, eGameSetting_ControlInvertLook))
|
||||||
|
|||||||
@@ -1658,7 +1658,8 @@ HRESULT CConsoleMinecraftApp::NavigateToScene(int iPad,EUIScene eScene, void *in
|
|||||||
|
|
||||||
// If you're navigating to the multigamejoinload, and the player hasn't seen the updates message yet, display it now
|
// If you're navigating to the multigamejoinload, and the player hasn't seen the updates message yet, display it now
|
||||||
// display this message the first 3 times
|
// display this message the first 3 times
|
||||||
if((eScene==eUIScene_LoadOrJoinMenu) && (bSeenUpdateTextThisSession==false) && ( app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_DisplayUpdateMessage)!=0))
|
// todo: re-enable if we fix this menu, for now its just blank!
|
||||||
|
if(false && (eScene==eUIScene_LoadOrJoinMenu) && (bSeenUpdateTextThisSession==false) && ( app.GetGameSettings(ProfileManager.GetPrimaryPad(),eGameSetting_DisplayUpdateMessage)!=0))
|
||||||
{
|
{
|
||||||
eScene=eUIScene_NewUpdateMessage;
|
eScene=eUIScene_NewUpdateMessage;
|
||||||
bSeenUpdateTextThisSession=true;
|
bSeenUpdateTextThisSession=true;
|
||||||
|
|||||||
Reference in New Issue
Block a user