Browse Source

Minor things that have accumulated over time

readme
Nico de Poel 5 years ago
parent
commit
05a4de89a1
  1. 1
      .gitignore
  2. 5
      Assets/Scripts/Support/AliasModel.cs
  3. 6
      Assets/Styles/GLQuake/GLQuake.asset
  4. 9
      ProjectSettings/DynamicsManager.asset

1
.gitignore

@ -14,3 +14,4 @@ mods/
*.DotSettings
*.orig
Debug Portable/
Assets/StreamingAssets/

5
Assets/Scripts/Support/AliasModel.cs

@ -112,6 +112,9 @@ public class AliasModel
continue;
}
// TODO do we maybe need to distinguish between frames and poses here after all?
// In most cases frames and poses are correlated 1-to-1, but perhaps not always. This could cause subtle animation glitches.
if (frameName != animName)
{
// New animation sequence; convert the previous sequence into a blend shape animation
@ -284,7 +287,7 @@ public class AliasModel
mesh.SetUVs(0, uvs);
mesh.Optimize();
mesh.RecalculateBounds();
mesh.UploadMeshData(false);
mesh.UploadMeshData(false); // Meshes have to stay in RAM, otherwise they won't show up in standalone builds
return mesh;
}

6
Assets/Styles/GLQuake/GLQuake.asset

@ -16,9 +16,9 @@ MonoBehaviour:
worldMaterial: {fileID: 2100000, guid: fcbaf32c00bea2344bbb1419c61364b6, type: 2}
liquidMaterial: {fileID: 2100000, guid: cd59502a1689c0847a1963c60e347987, type: 2}
liquidProperties:
waterAlpha: 0.85
slimeAlpha: 0.9
lavaAlpha: 0.95
waterAlpha: 0.8
slimeAlpha: 0.85
lavaAlpha: 0.9
teleporterAlpha: 1
particles:
explosion: {fileID: 0}

9
ProjectSettings/DynamicsManager.asset

@ -3,10 +3,11 @@
--- !u!55 &1
PhysicsManager:
m_ObjectHideFlags: 0
serializedVersion: 11
m_Gravity: {x: 0, y: -9.81, z: 0}
serializedVersion: 13
m_Gravity: {x: 0, y: -800, z: 0}
m_DefaultMaterial: {fileID: 0}
m_BounceThreshold: 2
m_DefaultMaxDepenetrationVelocity: 10
m_SleepThreshold: 0.005
m_DefaultContactOffset: 0.01
m_DefaultSolverIterations: 6
@ -22,6 +23,7 @@ PhysicsManager:
m_AutoSyncTransforms: 0
m_ReuseCollisionCallbacks: 1
m_ClothInterCollisionSettingsToggle: 0
m_ClothGravity: {x: 0, y: -9.81, z: 0}
m_ContactPairsMode: 0
m_BroadphaseType: 0
m_WorldBounds:
@ -31,4 +33,5 @@ PhysicsManager:
m_FrictionType: 0
m_EnableEnhancedDeterminism: 0
m_EnableUnifiedHeightmaps: 1
m_DefaultMaxAngluarSpeed: 7
m_SolverType: 0
m_DefaultMaxAngularSpeed: 7
Loading…
Cancel
Save