don't span goal anim when in multiplayer or live

robidasdavid · Sep 21, 2022 · c6cda5c · c6cda5c
1 parent d299e3d
commit c6cda5c
Show file tree

Hide file tree

Showing 10 changed files with 1,578 additions and 826 deletions.
diff --git a/Demo Viewer/Assembly-CSharp-Editor-firstpass.csproj b/Demo Viewer/Assembly-CSharp-Editor-firstpass.csproj
diff --git a/Demo Viewer/Assembly-CSharp-Editor.csproj b/Demo Viewer/Assembly-CSharp-Editor.csproj
diff --git a/Demo Viewer/Assembly-CSharp-firstpass.csproj b/Demo Viewer/Assembly-CSharp-firstpass.csproj
diff --git a/Demo Viewer/Assembly-CSharp.csproj b/Demo Viewer/Assembly-CSharp.csproj
diff --git a/Demo Viewer/Assets/ARENA.fbx.meta b/Demo Viewer/Assets/ARENA.fbx.meta
diff --git a/Demo Viewer/Assets/Scripts/DemoStart.cs b/Demo Viewer/Assets/Scripts/DemoStart.cs
@@ -233,7 +233,7 @@ private void Update()
 			Frame nearestFrame = playhead.GetNearestFrame();
 			Frame previousFrame = playhead.GetPreviousFrame();
 
-			if (viewingFrame != null && previousFrame != null)
+			if (viewingFrame != null && previousFrame != null && viewingFrame!=previousFrame)
 			{
 				// Arena-only stuff
 				if (viewingFrame.map_name == "mpl_arena_a")

diff --git a/Demo Viewer/Assets/Scripts/Playhead.cs b/Demo Viewer/Assets/Scripts/Playhead.cs
@@ -124,6 +124,11 @@ public Frame GetFrame()
 
 	public Frame GetNearestFrame()
 	{
+		if (LiveFrameProvider.isLive)
+		{
+			return LiveFrameProvider.frame;
+		}
+
 		return replay.GetFrame(Mathf.Clamp(currentFrameIndex, 0, replay.FrameCount - 1));
 	}
 

diff --git a/Demo Viewer/Demo Viewer.sln b/Demo Viewer/Demo Viewer.sln
diff --git a/Demo Viewer/ProjectSettings/ProjectSettings.asset b/Demo Viewer/ProjectSettings/ProjectSettings.asset
@@ -137,7 +137,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.11.1
+  bundleVersion: 1.11.2
   preloadedAssets:
   - {fileID: 0}
   - {fileID: 0}
@@ -146,6 +146,11 @@ PlayerSettings:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
   - {fileID: -4611831833606109332, guid: c3d75b5dcd7490f42bacf904ce37e92b, type: 2}
   - {fileID: -8922607054882705910, guid: 4e6c4da5f47e4e243afe1acf2795197d, type: 2}
   - {fileID: 0}
@@ -167,7 +172,7 @@ PlayerSettings:
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
     Android: com.EchoVRCommunity.ReplayViewer
-    Standalone: com.EchoVRCommunity.ReplayViewer
+    Standalone: com.EchoVR-Community.Replay-Viewer
   buildNumber:
     Standalone: 0
     iPhone: 0

diff --git a/Demo Viewer/ProjectSettings/RiderScriptEditorPersistedState.asset b/Demo Viewer/ProjectSettings/RiderScriptEditorPersistedState.asset
@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Script: {fileID: 0}
   m_Name: 
   m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState
-  lastWriteTicks: -8585391671010662687
+  lastWriteTicks: -8585378158911062036