Bug fixes plus extra features

- Insert adds a new keyframe to the selected timeline
- New stages have frames cloned from the last frame of current stage
- Existing key are now replaced when another key is dropped on them
- Fixed bug where starting a new animation could result in errors
This commit is contained in:
AbstractConcept 2022-10-18 21:57:43 -05:00
parent ca22fa0c18
commit 2989d9a72c
137 changed files with 527 additions and 668 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 432 B

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 564 B

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

View file

@ -21,7 +21,7 @@ MonoBehaviour:
m_ShowMode: 4
m_Title:
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 371}
m_MinSize: {x: 875, y: 392}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1
--- !u!114 &2
@ -46,7 +46,7 @@ MonoBehaviour:
y: 0
width: 1920
height: 997
m_MinSize: {x: 875, y: 371}
m_MinSize: {x: 875, y: 392}
m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &3
MonoBehaviour:
@ -112,10 +112,10 @@ MonoBehaviour:
y: 30
width: 1920
height: 947
m_MinSize: {x: 677, y: 321}
m_MaxSize: {x: 12002, y: 8021}
m_MinSize: {x: 677, y: 342}
m_MaxSize: {x: 12002, y: 8042}
vertical: 0
controlID: 229
controlID: 18462
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@ -137,10 +137,10 @@ MonoBehaviour:
y: 0
width: 1414
height: 947
m_MinSize: {x: 402, y: 321}
m_MaxSize: {x: 8002, y: 8021}
m_MinSize: {x: 402, y: 342}
m_MaxSize: {x: 8002, y: 8042}
vertical: 1
controlID: 230
controlID: 18463
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@ -165,7 +165,7 @@ MonoBehaviour:
m_MinSize: {x: 402, y: 221}
m_MaxSize: {x: 8002, y: 4021}
vertical: 0
controlID: 231
controlID: 18464
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@ -398,7 +398,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 88e3ffff9ce3ffff3ee4ffff4cfbffff
m_ExpandedIDs: fadcfcff0eddfcffaeddfcffbee7fcffd2e7fcff72e8fcff187fffff2c7fffffcc7fffff56fbffff623e00003c420000ee5d0100f260010008620100266501002e66010038670100566c0100ac6c0100184003001243030062490300804d0300
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -458,9 +458,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 726.4762, y: 358.71252, z: -1336.75}
m_Target: {x: 222.32251, y: 535.4549, z: 52.272427}
speed: 2
m_Value: {x: 726.4762, y: 358.71252, z: -1336.75}
m_Value: {x: 230.78027, y: 531.8572, z: 52.9063}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@ -510,9 +510,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 360.78165
m_Target: 167.97263
speed: 2
m_Value: 360.78165
m_Value: 175.88757
m_Ortho:
m_Target: 1
speed: 2
@ -1115,9 +1115,9 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 41}
m_SelectedIDs: a64c0000
m_LastClickedID: 19622
m_ExpandedIDs: 00000000424c0000444c0000464c0000484c00004a4c00004c4c00004e4c0000
m_SelectedIDs: 4c4c0000
m_LastClickedID: 19532
m_ExpandedIDs: 00000000404c0000424c0000444c0000464c0000484c00004a4c00004c4c000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1145,7 +1145,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000424c0000444c0000464c0000484c00004a4c00004c4c00004e4c0000
m_ExpandedIDs: 00000000404c0000424c0000444c0000464c0000484c00004a4c00004c4c000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1170,10 +1170,10 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_SelectedInstanceIDs: ac6c0100
m_LastClickedInstanceID: 93356
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c430000004900007e980000024900008698000000000000
m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c430000004900007e9800000249000086980000000000007a140100
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1197,7 +1197,7 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_NewAssetIndexInList: -1
m_ScrollPosition: {x: 0, y: 0}
m_ScrollPosition: {x: 0, y: 5}
m_GridSize: 67
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 379

View file

@ -21,10 +21,10 @@ MonoBehaviour:
y: 30
width: 1920
height: 947
m_MinSize: {x: 677, y: 321}
m_MaxSize: {x: 12002, y: 8021}
m_MinSize: {x: 677, y: 342}
m_MaxSize: {x: 12002, y: 8042}
vertical: 0
controlID: 43
controlID: 17531
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@ -138,10 +138,10 @@ MonoBehaviour:
y: 0
width: 1414
height: 947
m_MinSize: {x: 402, y: 321}
m_MaxSize: {x: 8002, y: 8021}
m_MinSize: {x: 402, y: 342}
m_MaxSize: {x: 8002, y: 8042}
vertical: 1
controlID: 44
controlID: 17532
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@ -166,7 +166,7 @@ MonoBehaviour:
m_MinSize: {x: 402, y: 221}
m_MaxSize: {x: 8002, y: 4021}
vertical: 0
controlID: 45
controlID: 17533
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
@ -186,8 +186,8 @@ MonoBehaviour:
y: 0
width: 337
height: 671
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 6}
m_Panes:
- {fileID: 6}
@ -224,7 +224,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 4cfbffff
m_ExpandedIDs: bee7fcffd2e7fcff72e8fcff187fffff2c7fffffcc7fffff56fbffff623e00003c420000ee5d0100f260010008620100266501002e66010038670100566c0100ac6c01001243030062490300
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -313,9 +313,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 726.4762, y: 358.71252, z: -1336.75}
m_Target: {x: 537.5618, y: 264.1134, z: 81.3081}
speed: 2
m_Value: {x: 726.4762, y: 358.71252, z: -1336.75}
m_Value: {x: 537.5618, y: 264.1134, z: 81.3081}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@ -365,9 +365,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 360.78165
m_Target: 531.07306
speed: 2
m_Value: 360.78165
m_Value: 531.07306
m_Ortho:
m_Target: 1
speed: 2
@ -998,9 +998,9 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 41}
m_SelectedIDs: a64c0000
m_LastClickedID: 19622
m_ExpandedIDs: 00000000424c0000444c0000464c0000484c00004a4c00004c4c00004e4c0000
m_SelectedIDs: 4c4c0000
m_LastClickedID: 19532
m_ExpandedIDs: 00000000404c0000424c0000444c0000464c0000484c00004a4c00004c4c000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1028,7 +1028,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000424c0000444c0000464c0000484c00004a4c00004c4c00004e4c0000
m_ExpandedIDs: 00000000404c0000424c0000444c0000464c0000484c00004a4c00004c4c000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1053,10 +1053,10 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_SelectedInstanceIDs: ac6c0100
m_LastClickedInstanceID: 93356
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c430000004900007e980000024900008698000000000000
m_ExpandedInstanceIDs: c6230000303a0000063a0000a83d00005c66000000870000f8860000004a00004a4600000c430000004900007e9800000249000086980000000000007a140100
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1080,7 +1080,7 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_NewAssetIndexInList: -1
m_ScrollPosition: {x: 0, y: 0}
m_ScrollPosition: {x: 0, y: 5}
m_GridSize: 67
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 379
@ -1203,5 +1203,5 @@ MonoBehaviour:
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_PreviewWindow: {fileID: 0}
m_LastInspectedObjectInstanceID: -1
m_LastInspectedObjectInstanceID: 214864
m_LastVerticalScrollValue: 0

Binary file not shown.

View file

@ -434,7 +434,7 @@ ScriptsOnlyBuild:
className: LayoutElement
- hash:
serializedVersion: 2
Hash: c06ff38c3845b69f6896174b5e32d893
Hash: 9907da2c637bf7bac057bc252a290438
assemblyName: Assembly-CSharp.dll
namespaceName: RimWorldAnimationStudio
className: Tooltip
@ -624,12 +624,6 @@ ScriptsOnlyBuild:
assemblyName: Unity.TextMeshPro.dll
namespaceName: TMPro
className: TextContainer
- hash:
serializedVersion: 2
Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f
assemblyName: Assembly-CSharp.dll
namespaceName: RimWorldAnimationStudio
className: KeybindConfig
- hash:
serializedVersion: 2
Hash: f84d945e5e1ca985698660fc26e9657f
@ -764,7 +758,7 @@ ScriptsOnlyBuild:
className: TimelineAsset
- hash:
serializedVersion: 2
Hash: f95ed8cfd6182d3eaa9c95ac414e8aa9
Hash: 5daa9734cff36c5842eb8ce89d4c9aa9
assemblyName: Assembly-CSharp.dll
namespaceName: RimWorldAnimationStudio
className: Workspace

Binary file not shown.

View file

@ -1 +1 @@
{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":726.4761962890625,"y":358.7125244140625,"z":-1336.75},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":360.7816467285156,"orthographic":true}
{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":222.322509765625,"y":535.4548950195313,"z":52.27242660522461},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":167.97262573242188,"orthographic":true}

View file

@ -1,4 +1,2 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler
Quitting shader compiler process

View file

@ -1,4 +1,2 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler
Quitting shader compiler process

View file

@ -1,4 +1,2 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.20f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler
Quitting shader compiler process

Some files were not shown because too many files have changed in this diff Show more