Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC
# Conflicts: # Assets/TextMesh Pro/Fonts/TMP_Assets/CourierPrime-Regular SDF.asset # Assets/TextMesh Pro/Fonts/TMP_Assets/CutiveMono-Regular SDF.asset # Assets/TextMesh Pro/Fonts/TMP_Assets/Inconsolata-VariableFont_wdth,wght SDF.asset # Assets/TextMesh Pro/Fonts/TMP_Assets/OxygenMono-Regular SDF.asset # Assets/TextMesh Pro/Fonts/TMP_Assets/ShareTechMono-Regular SDF.asset # Assets/TextMesh Pro/Fonts/TMP_Assets/SpecialElite-Regular SDF.asset # Assets/_Content/Prefabs/OctoPlayerFP.prefab # Packages/OctoCore/Runtime/Scripts/Components/OctoPlayer.cs
This commit is contained in:
@@ -290,7 +290,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier: OctoCore.Runtime::OctoCore.OctoPlayerSpeedArea
|
||||
_settings:
|
||||
MinRadius: 1
|
||||
MaxRadius: 4
|
||||
MaxRadius: 5
|
||||
MinSpeedMultiplier: 0
|
||||
MaxSpeedMultiplier: 1
|
||||
SpeedCurve:
|
||||
@@ -480,6 +480,10 @@ PrefabInstance:
|
||||
propertyPath: _settings.AllowMove
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5295567073180248356, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3}
|
||||
propertyPath: _settings.WalkSpeed
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5295567073180248356, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3}
|
||||
propertyPath: _firstPerson.MaxPitch
|
||||
value: 0
|
||||
|
||||
Reference in New Issue
Block a user