Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
engine
Manage
Activity
Members
Labels
Plan
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sip
engine
Commits
5b1fa258
Commit
5b1fa258
authored
Jul 28, 2019
by
D-AIRY
Browse files
Options
Downloads
Patches
Plain Diff
Fixed game settings menu in 800x600; fixed player standing check
parent
beb5cc91
Branches
Branches containing commit
Tags
version_X.2.1-dev
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
build/gamesource/gui/menu/settings_game.html
+1
-0
1 addition, 0 deletions
build/gamesource/gui/menu/settings_game.html
source/SkyXEngine.h
+1
-1
1 addition, 1 deletion
source/SkyXEngine.h
source/game/Player.cpp
+1
-1
1 addition, 1 deletion
source/game/Player.cpp
with
3 additions
and
2 deletions
build/gamesource/gui/menu/settings_game.html
+
1
−
0
View file @
5b1fa258
<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"
>
...
...
This diff is collapsed.
Click to expand it.
source/SkyXEngine.h
+
1
−
1
View file @
5b1fa258
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
source/game/Player.cpp
+
1
−
1
View file @
5b1fa258
...
...
@@ -181,7 +181,7 @@ void CPlayer::updateInput(float dt)
mov
=
true
;
}
if
(
m_uMoveDir
&
PM_CROUCH
||
(
m_fCurrentHeight
<
1.0
f
&&
!
m_pCharacter
->
canStandUp
((
m_fCapsHeight
-
m_fCapsRadius
*
2.0f
)
*
(
1.0f
-
m_fCurrentHeight
))))
if
(
m_uMoveDir
&
PM_CROUCH
||
(
m_fCurrentHeight
<
0.99
f
&&
!
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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment