Skip to content

Commit

Permalink
feat: added base classes for state timeline tracks.
Browse files Browse the repository at this point in the history
  • Loading branch information
christides11 committed Feb 19, 2022
1 parent 115ce7b commit 77924d8
Show file tree
Hide file tree
Showing 59 changed files with 4,486 additions and 208 deletions.
34 changes: 17 additions & 17 deletions Assembly-CSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,12 @@
<Reference Include="Unity.VisualStudio.Editor">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
</Reference>
<Reference Include="Juce.ImplementationSelector.Runtime">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Juce.ImplementationSelector.Runtime.dll</HintPath>
</Reference>
<Reference Include="Unity.Timeline">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
</Reference>
<Reference Include="Unity.TextMeshPro">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
</Reference>
Expand All @@ -647,14 +653,17 @@
<Reference Include="Unity.2D.Sprite.Editor">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll</HintPath>
</Reference>
<Reference Include="Malee.ReorderableList.Editor">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Malee.ReorderableList.Editor.dll</HintPath>
</Reference>
<Reference Include="Unity.RenderPipelines.Core.Runtime">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Runtime.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.UI">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
</Reference>
<Reference Include="Malee.ReorderableList.Editor">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Malee.ReorderableList.Editor.dll</HintPath>
<Reference Include="Juce.ImplementationSelector.Editor">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Juce.ImplementationSelector.Editor.dll</HintPath>
</Reference>
<Reference Include="Unity.Rider.Editor">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Unity.Rider.Editor.dll</HintPath>
Expand Down Expand Up @@ -695,32 +704,23 @@
<Reference Include="Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll</HintPath>
</Reference>
<Reference Include="Unity.Timeline.Editor">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
</Reference>
<Reference Include="XNodeEditor">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/XNodeEditor.dll</HintPath>
</Reference>
<Reference Include="Unity.Mathematics.Editor">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Unity.Mathematics.Editor.dll</HintPath>
</Reference>
<Reference Include="Juce.ImplementationSelector.Examples">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Juce.ImplementationSelector.Examples.dll</HintPath>
</Reference>
<Reference Include="Unity.ProGrids">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Unity.ProGrids.dll</HintPath>
</Reference>
<Reference Include="Unity.RenderPipelines.Core.Editor">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Unity.RenderPipelines.Core.Editor.dll</HintPath>
</Reference>
<Reference Include="Unity.Timeline">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
</Reference>
<Reference Include="Unity.Timeline.Editor">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
</Reference>
<Reference Include="Juce.ImplementationSelector.Runtime">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Juce.ImplementationSelector.Runtime.dll</HintPath>
</Reference>
<Reference Include="Juce.ImplementationSelector.Editor">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Juce.ImplementationSelector.Editor.dll</HintPath>
</Reference>
<Reference Include="Juce.ImplementationSelector.Examples">
<HintPath>C:/Projects/Unity/hack-and-slash-framework/Library/ScriptAssemblies/Juce.ImplementationSelector.Examples.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Assets/HnSF/Editor/State/StateTimelineEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public override void OnInspectorGUI()

st.totalFrames = (int)(st.duration / (1.0f / 60.0f));
GUILayout.Label($"Total Frames: {st.totalFrames}", EditorStyles.boldLabel);
//base.OnInspectorGUI();
base.OnInspectorGUI();
}
}
}
Loading

0 comments on commit 77924d8

Please sign in to comment.