Add files via upload

This commit is contained in:
Olezen
2019-10-11 12:02:10 +02:00
committed by GitHub
parent 36a62fb2e2
commit 805c53b797
23 changed files with 201 additions and 11 deletions

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 6f1d7457460534f489c8262e748c0dfc
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -124,11 +124,11 @@ MonoBehaviour:
m_GameObject: {fileID: 5467285084242854813}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 442a452188e1eb6428ec1c8cabbb7757, type: 3}
m_Script: {fileID: 11500000, guid: 601d4686cc0b70d45a98271d52094850, type: 3}
m_Name:
m_EditorClassIdentifier:
colliderSize: {x: 1, y: 2, z: 1}
collisionType: 1
collisionType: 0
weight: 75
rigidbodyPushForce: 2
solidCollider: 0
@@ -214,7 +214,7 @@ MonoBehaviour:
m_GameObject: {fileID: 5467285085316221438}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cfa8e268ce5798342a4e67757abe08e7, type: 3}
m_Script: {fileID: 11500000, guid: 604093a680e6d5a488206647cc35be23, type: 3}
m_Name:
m_EditorClassIdentifier:
bodyTransform: {fileID: 5467285084242854812}

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a840589249729984398df665ca6e2508
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d28ade60e8ecfdf42970424f92cd001e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,13 @@
fileFormatVersion: 2
guid: dcb5a3ee06e4bc947a5486cd6b06e1ac
timeCreated: 1522007229
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,13 @@
fileFormatVersion: 2
guid: 390f54ee3fdd73a46916bef3d176880f
timeCreated: 1522007209
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3b1e33b474eb4614aa6a5972cd4febbc
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: ce6dfe3283d91574aa798e5855fc14dc
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 1a3ecfdc05e51544ead319fa03e199fe
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 01040416c3a2d664aacf1cdfc7a46675
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -16,9 +16,9 @@ namespace Fragsurf.Movement {
[Range (30f, 75f)] public float slopeLimit = 45f;
[Header ("Air movement")]
public bool clampAirSpeed = false;
public float airCap = 0.6f;
public float airAcceleration = 6f;
public bool clampAirSpeed = true;
public float airCap = 0.4f;
public float airAcceleration = 12f;
public float airFriction = 0.4f;
[Header ("Ground movement")]

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 3a624624f32edf641ba5049808071214
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -20,7 +20,7 @@ namespace Fragsurf.Movement {
[Header("Physics Settings")]
public Vector3 colliderSize = new Vector3 (1f, 2f, 1f);
public ColliderType collisionType;
[HideInInspector] public ColliderType collisionType { get { return ColliderType.Box; } } // Capsule doesn't work anymore; I'll have to figure out why some other time, sorry.
public float weight = 75f;
public float rigidbodyPushForce = 2f;
public bool solidCollider = false;

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 601d4686cc0b70d45a98271d52094850
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -73,7 +73,7 @@ namespace Fragsurf.Movement {
_surfer.moveData.velocity = Vector3.ClampMagnitude (_surfer.moveData.velocity, _config.maxVelocity);
speed = _surfer.moveData.velocity.magnitude;
_surfer.moveData.velocity.y = yVel;
float maxDistPerFrame = 0.05f;
Vector3 velocityThisFrame = _surfer.moveData.velocity * _deltaTime;
float velocityDist = velocityThisFrame.magnitude;
@@ -432,7 +432,7 @@ namespace Fragsurf.Movement {
if (movingUp && _surfer.moveType != MoveType.Noclip)
_surfer.moveData.surfaceFriction = _config.airFriction;
return false;
} else {
@@ -481,7 +481,7 @@ namespace Fragsurf.Movement {
private Trace TraceToFloor () {
var down = _surfer.moveData.origin;
down.y -= 0.1f;
down.y -= 0.15f;
return Tracer.TraceCollider (_surfer.collider, _surfer.moveData.origin, down, SurfPhysics.groundLayerMask);

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 9877690760780b441aeafc5ca145fd3d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -118,7 +118,7 @@ namespace Fragsurf.Movement {
Vector3 upOrigin = origin + Vector3.up * upDistance;
// Trace forwards (check for walls etc)
float forwardMagnitude = forwardVelocity.magnitude * Time.deltaTime;
float forwardMagnitude = stepOffset;
float forwardDistance = forwardMagnitude;
Trace forwardTrace = Tracer.TraceCollider (collider, upOrigin, upOrigin + forwardDirection * Mathf.Max (0.2f, forwardMagnitude), groundLayerMask);
if (forwardTrace.hitCollider != null)
@@ -149,6 +149,7 @@ namespace Fragsurf.Movement {
// Actually move
if (origin != endOrigin && forwardDistance > 0f) {
Debug.Log ("Moved up step!");
origin = endOrigin + forwardDirection * forwardDistance * Time.deltaTime;
return true;

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 82894b74fd05a584385e994a8297661f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 604093a680e6d5a488206647cc35be23
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 94e9fff1435e72045a8916637b54c2a8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 3d79906c8a32f894eac47445c9814b61
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: b42ff46330f0b0d4696f4b054b34550f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c652f03f4545c86499de323569052da5
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: