# Conflicts:
#	Assets/_Content/Models/Environments/BodiesInWater.meta
#	Assets/_Content/Models/Environments/BodiesInWater/Materials.meta
#	Assets/_Content/Models/Environments/BodiesInWater/Shaders.meta
#	Assets/_Content/Models/Environments/HouseOfLeaves/Materials/M_houseOfLeaves_sand.mat
#	Packages/OctoCore/Runtime/Scripts/Components/OctoPlayer.cs
This commit is contained in:
2026-05-21 11:03:11 +01:00
65 changed files with 8287 additions and 742 deletions
@@ -35,6 +35,12 @@ namespace OctoCore.Components
public PlayerModes Mode = PlayerModes.FirstPerson;
public Orientations Orientation = Orientations.Camera;
[Tooltip("Allow position movement.")]
public bool AllowMove = true;
[Tooltip("Allow looking around.")]
public bool AllowLook = true;
[Tooltip("Walk speed (km/h).")]
public float WalkSpeed = 10;
@@ -387,7 +393,7 @@ namespace OctoCore.Components
else
moveDelta.y = -0.1f;
if (_references.Controller)
if (_references.Controller && _references.Controller.enabled)
_references.Controller.Move(moveDelta);
else
transform.position += moveDelta;
@@ -401,8 +407,10 @@ namespace OctoCore.Components
{
Vector2 delta = (State.IsPaused || !State.IsFocussed) ? Vector2.zero : _lookInput;
float mouseX = delta.x * _firstPerson.SensitivityX;
float mouseY = delta.y * _firstPerson.SensitivityY * -1;
if (_settings.AllowLook)
{
float mouseX = delta.x * _firstPerson.SensitivityX;
float mouseY = delta.y * _firstPerson.SensitivityY * -1;
State.Yaw += mouseX;
State.Pitch = Mathf.Clamp(State.Pitch + mouseY, _firstPerson.MinPitch, _firstPerson.MaxPitch);