diff --git a/build/gamesource/gui/menu/settings_game.html b/build/gamesource/gui/menu/settings_game.html index 6e5b858bc9c22c448703da3bb4a209fc8c4d2f53..d1c9d1ad8b86bee9684b3cc40d3cc897146e48a9 100644 --- a/build/gamesource/gui/menu/settings_game.html +++ b/build/gamesource/gui/menu/settings_game.html @@ -1,6 +1,7 @@ <html onkeyup="return_ingame"> <head> <link type="text/css" rel="stylesheet" href="settings_menu.css"/> + <link type="text/css" rel="stylesheet" href="settings_menu_800x600.css" max-width="800" /> </head> <body style="font-name: quick-junky-regular;color: #c6f0fd;"> <div id="background"> diff --git a/source/SkyXEngine.h b/source/SkyXEngine.h index fe3d7fce2648d6f1436ac6a388062103a80a8a42..c2ade228154333121e032e3897c7f91ff4f44111 100644 --- a/source/SkyXEngine.h +++ b/source/SkyXEngine.h @@ -292,7 +292,7 @@ QT стиль документирования (!) и QT_AUTOBRIEF - корот #ifndef __SKYXENGINE_H #define __SKYXENGINE_H -#define SKYXENGINE_VERSION "X.2.0-dev" +#define SKYXENGINE_VERSION "X.2.1-dev" #define SKYXENGINE_VERSION4EDITORS "SkyXEngine version " ## SKYXENGINE_VERSION diff --git a/source/game/Player.cpp b/source/game/Player.cpp index e6d6ba5eecf417738df213b4a194c45d16f2a2b4..592ca4daf62c10d851356d1710f803ee66bac6d2 100644 --- a/source/game/Player.cpp +++ b/source/game/Player.cpp @@ -181,7 +181,7 @@ void CPlayer::updateInput(float dt) mov = true; } - if(m_uMoveDir & PM_CROUCH || (m_fCurrentHeight < 1.0f && !m_pCharacter->canStandUp((m_fCapsHeight - m_fCapsRadius * 2.0f) * (1.0f - m_fCurrentHeight)))) + if(m_uMoveDir & PM_CROUCH || (m_fCurrentHeight < 0.99f && !m_pCharacter->canStandUp((m_fCapsHeight - m_fCapsRadius * 2.0f) * (1.0f - m_fCurrentHeight)))) { m_fCurrentHeight -= dt; float fMinHeight = (m_fCapsHeightCrouch - m_fCapsRadius * 2.0f) / (m_fCapsHeight - m_fCapsRadius * 2.0f);