- Added option to scale the size of the UI (available under the View menu)
- Vertical scrolling has been added to left and right animation panels, so all the controls are accessible when using a lower resolution monitors
- The toggles for designating allowed races for actors now enforces the requirement that actor can either be a 'Human' (also includes all alien humanoids), or one or more types of animal
This commit is contained in:
AbstractConcept 2022-12-18 00:08:37 -06:00
parent 757cdd7f39
commit 279823a390
95 changed files with 2815 additions and 734 deletions

Binary file not shown.

View file

@ -112,10 +112,10 @@ MonoBehaviour:
y: 30
width: 1920
height: 947
m_MinSize: {x: 679, y: 492}
m_MaxSize: {x: 14002, y: 14042}
m_MinSize: {x: 678, y: 342}
m_MaxSize: {x: 12003, y: 8042}
vertical: 0
controlID: 23
controlID: 51636
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@ -137,10 +137,10 @@ MonoBehaviour:
y: 0
width: 1414
height: 947
m_MinSize: {x: 403, y: 492}
m_MaxSize: {x: 10001, y: 14042}
m_MinSize: {x: 402, y: 342}
m_MaxSize: {x: 8002, y: 8042}
vertical: 1
controlID: 70
controlID: 51588
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@ -162,10 +162,10 @@ MonoBehaviour:
y: 0
width: 1414
height: 671
m_MinSize: {x: 403, y: 221}
m_MaxSize: {x: 8003, y: 4021}
m_MinSize: {x: 402, y: 221}
m_MaxSize: {x: 8002, y: 4021}
vertical: 0
controlID: 71
controlID: 51566
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@ -231,7 +231,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ProjectBrowser
m_Name: ConsoleWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
@ -240,15 +240,15 @@ MonoBehaviour:
y: 671
width: 1414
height: 276
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 17}
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 17}
- {fileID: 18}
- {fileID: 19}
m_Selected: 0
m_LastSelected: 1
m_Selected: 1
m_LastSelected: 0
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@ -324,10 +324,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -537.5
m_HBaseRangeMax: 537.5
m_VBaseRangeMin: -314.5
m_VBaseRangeMax: 314.5
m_HBaseRangeMin: -960
m_HBaseRangeMax: 960
m_VBaseRangeMin: -453.5
m_VBaseRangeMax: 453.5
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@ -345,23 +345,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
width: 1075
height: 629
width: 1920
height: 907
m_Scale: {x: 1, y: 1}
m_Translation: {x: 537.5, y: 314.5}
m_Translation: {x: 960, y: 453.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -537.5
y: -314.5
width: 1075
height: 629
x: -960
y: -453.5
width: 1920
height: 907
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 1075, y: 650}
m_LastWindowPixelSize: {x: 1920, y: 928}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@ -398,7 +398,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: c6f2ffffdaf2ffffdcf2ffffe4f4fffff8f4ffff9ef5ffff62fbfffff66200007e63000040680000466d0000766d0000246e0000cc710000
m_ExpandedIDs: b262fbffc662fbffc862fbfffa62fbff0e63fbffb463fbffc879fbffdc79fbff8c7afbff189cffffb0c9ffffa0f6ffffdcf7ffff62fbffffa03a0000b43a0000c03b0000e23c00008a3d0000b03d0000c23e0000d0420000ae440000624600005e470000e6470000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -458,9 +458,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 515.9874, y: 315.84717, z: -105.8125}
m_Target: {x: 503.66406, y: 306.76, z: -208.375}
speed: 2
m_Value: {x: 515.9874, y: 315.84717, z: -105.8125}
m_Value: {x: 503.66406, y: 306.76, z: -208.375}
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: 347.46002
m_Target: 340.93237
speed: 2
m_Value: 347.46002
m_Value: 340.93237
m_Ortho:
m_Target: 1
speed: 2
@ -1104,20 +1104,20 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets
- Assets/Resources/Prefabs
m_ViewMode: 1
m_StartGridSize: 67
m_LastFolders:
- Assets
- Assets/Resources/Prefabs
m_LastFoldersGridSize: 67
m_LastProjectPath: C:\UnityDev\rimworld-animation-studio\Source
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 79}
m_SelectedIDs: 3a4e0000
m_LastClickedID: 20026
m_ExpandedIDs: 000000003a4e00003c4e00003e4e0000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e000000ca9a3b
scrollPos: {x: 0, y: 41}
m_SelectedIDs: 7c4e0000
m_LastClickedID: 20092
m_ExpandedIDs: 00000000704e0000724e0000744e0000764e0000784e00007a4e00007c4e00007e4e0000844e0000864e000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1145,7 +1145,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 000000003a4e00003c4e00003e4e0000404e0000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e0000
m_ExpandedIDs: 00000000704e0000724e0000744e0000764e0000784e00007a4e00007c4e00007e4e0000844e0000864e000000ca9a3b
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: 492}
m_MaxSize: {x: 14001, y: 14042}
m_MinSize: {x: 678, y: 492}
m_MaxSize: {x: 14002, y: 14042}
vertical: 0
controlID: 134
controlID: 51280
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@ -141,7 +141,7 @@ MonoBehaviour:
m_MinSize: {x: 402, y: 492}
m_MaxSize: {x: 10001, y: 14042}
vertical: 1
controlID: 90
controlID: 51281
--- !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: 65
controlID: 51282
--- !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: c879fbffdc79fbff8c7afbff189cffffb0c9ffffa0f6ffffdcf7ffff62fbffffa03a0000b43a0000c03b0000e23c00008a3d0000b03d0000c23e0000d0420000ae440000624600005e470000e6470000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -313,9 +313,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 515.9874, y: 315.84717, z: -105.8125}
m_Target: {x: 503.66406, y: 306.76, z: -208.375}
speed: 2
m_Value: {x: 515.9874, y: 315.84717, z: -105.8125}
m_Value: {x: 503.66406, y: 306.76, z: -208.375}
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: 347.46002
m_Target: 340.93237
speed: 2
m_Value: 347.46002
m_Value: 340.93237
m_Ortho:
m_Target: 1
speed: 2
@ -993,14 +993,14 @@ MonoBehaviour:
m_LastFolders:
- Assets/Resources/Prefabs
m_LastFoldersGridSize: 67
m_LastProjectPath: C:\UnityDev\rimworld-animation-studio
m_LastProjectPath: C:\UnityDev\rimworld-animation-studio\Source
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 143}
m_SelectedIDs: 4e4e0000
m_LastClickedID: 20046
m_ExpandedIDs: 00000000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e0000524e0000544e0000564e0000584e000000ca9a3b
scrollPos: {x: 0, y: 41}
m_SelectedIDs: 7c4e0000
m_LastClickedID: 20092
m_ExpandedIDs: 00000000704e0000724e0000744e0000764e0000784e00007a4e00007c4e00007e4e0000844e0000864e000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -1028,7 +1028,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000424e0000444e0000464e0000484e00004a4e00004c4e00004e4e0000504e0000524e0000544e0000564e0000584e0000
m_ExpandedIDs: 00000000704e0000724e0000744e0000764e0000784e00007a4e00007c4e00007e4e0000844e0000864e000000ca9a3b
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
@ -1160,8 +1160,8 @@ MonoBehaviour:
y: 0
width: 506
height: 947
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 16}

Binary file not shown.

View file

@ -47,6 +47,9 @@ ScriptsOnlyBuild:
- RimWorldAnimationStudio.StageCardManager
- RimWorldAnimationStudio.StageLoopsCard
- RimWorldAnimationStudio.Tooltip
- RimWorldAnimationStudio.UIAutoAdjust
- RimWorldAnimationStudio.UIScaler
- RimWorldAnimationStudio.VersionText
- TooltipMessage
Unity.2D.Animation.Editor.dll:
- UnityEditor.U2D.Animation.BoneGizmo
@ -164,95 +167,101 @@ ScriptsOnlyBuild:
- Class: 114
Script: {instanceID: 11876}
- Class: 114
Script: {instanceID: 12144}
Script: {instanceID: 11958}
- Class: 114
Script: {instanceID: 12180}
Script: {instanceID: 12146}
- Class: 114
Script: {instanceID: 12324}
Script: {instanceID: 12182}
- Class: 114
Script: {instanceID: 12348}
Script: {instanceID: 12326}
- Class: 114
Script: {instanceID: 12364}
Script: {instanceID: 12350}
- Class: 114
Script: {instanceID: 12434}
Script: {instanceID: 12366}
- Class: 114
Script: {instanceID: 12614}
Script: {instanceID: 12436}
- Class: 114
Script: {instanceID: 12638}
Script: {instanceID: 12616}
- Class: 114
Script: {instanceID: 12756}
Script: {instanceID: 12640}
- Class: 114
Script: {instanceID: 12880}
Script: {instanceID: 12758}
- Class: 114
Script: {instanceID: 12924}
Script: {instanceID: 12882}
- Class: 114
Script: {instanceID: 13174}
Script: {instanceID: 12926}
- Class: 114
Script: {instanceID: 13200}
Script: {instanceID: 13176}
- Class: 114
Script: {instanceID: 13240}
Script: {instanceID: 13202}
- Class: 114
Script: {instanceID: 13250}
Script: {instanceID: 13242}
- Class: 114
Script: {instanceID: 13260}
Script: {instanceID: 13252}
- Class: 114
Script: {instanceID: 13270}
Script: {instanceID: 13262}
- Class: 114
Script: {instanceID: 13372}
Script: {instanceID: 13272}
- Class: 114
Script: {instanceID: 13390}
Script: {instanceID: 13374}
- Class: 114
Script: {instanceID: 13392}
- Class: 114
Script: {instanceID: 13426}
Script: {instanceID: 13394}
- Class: 114
Script: {instanceID: 13466}
Script: {instanceID: 13428}
- Class: 114
Script: {instanceID: 13482}
Script: {instanceID: 13468}
- Class: 114
Script: {instanceID: 13498}
Script: {instanceID: 13484}
- Class: 114
Script: {instanceID: 13510}
Script: {instanceID: 13500}
- Class: 114
Script: {instanceID: 13514}
Script: {instanceID: 13512}
- Class: 114
Script: {instanceID: 13550}
Script: {instanceID: 13516}
- Class: 114
Script: {instanceID: 13682}
Script: {instanceID: 13552}
- Class: 114
Script: {instanceID: 13708}
Script: {instanceID: 13684}
- Class: 114
Script: {instanceID: 13840}
Script: {instanceID: 13710}
- Class: 114
Script: {instanceID: 13914}
Script: {instanceID: 13842}
- Class: 114
Script: {instanceID: 13918}
Script: {instanceID: 13916}
- Class: 114
Script: {instanceID: 14046}
Script: {instanceID: 13920}
- Class: 114
Script: {instanceID: 14110}
Script: {instanceID: 14048}
- Class: 114
Script: {instanceID: 14206}
Script: {instanceID: 14112}
- Class: 114
Script: {instanceID: 14356}
Script: {instanceID: 14208}
- Class: 114
Script: {instanceID: 14504}
Script: {instanceID: 14358}
- Class: 114
Script: {instanceID: 14530}
Script: {instanceID: 14506}
- Class: 114
Script: {instanceID: 14532}
- Class: 114
Script: {instanceID: 14564}
Script: {instanceID: 14534}
- Class: 114
Script: {instanceID: 14586}
Script: {instanceID: 14566}
- Class: 114
Script: {instanceID: 14588}
- Class: 114
Script: {instanceID: 14628}
Script: {instanceID: 14590}
- Class: 114
Script: {instanceID: 14634}
Script: {instanceID: 14630}
- Class: 114
Script: {instanceID: 14676}
Script: {instanceID: 14636}
- Class: 114
Script: {instanceID: 14678}
- Class: 114
Script: {instanceID: 174674}
- Class: 114
Script: {instanceID: 357434}
- Class: 115
Script: {instanceID: 0}
- Class: 128
@ -512,6 +521,12 @@ ScriptsOnlyBuild:
assemblyName: Unity.Timeline.dll
namespaceName: UnityEngine.Timeline
className: AnimationTrack
- hash:
serializedVersion: 2
Hash: 834776afbc7a5157f27e686a3c3d8361
assemblyName: Assembly-CSharp.dll
namespaceName: RimWorldAnimationStudio
className: UIScaler
- hash:
serializedVersion: 2
Hash: cf9f5cf2c3145a37ac07f00e50e460f9
@ -1052,6 +1067,18 @@ ScriptsOnlyBuild:
assemblyName: Assembly-CSharp.dll
namespaceName: RimWorldAnimationStudio
className: DropdownMenu
- hash:
serializedVersion: 2
Hash: 6e721463c327b3d7aa6f7ce246d2d8c9
assemblyName: Assembly-CSharp.dll
namespaceName: RimWorldAnimationStudio
className: UIAutoAdjust
- hash:
serializedVersion: 2
Hash: 71bb6a6b6c8f052f948db64c7dd3ca4f
assemblyName: Assembly-CSharp.dll
namespaceName: RimWorldAnimationStudio
className: VersionText
platform: 5
scenePathNames:
- Assets/Scenes/MainScene.unity

Binary file not shown.

View file

@ -1 +1 @@
{"m_ExpandedPrefabGameObjectFileIDs":[5792094729984410978,5792094730711952120],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":5792094730752706042,"m_LastClickedInstanceID":0}
{"m_ExpandedPrefabGameObjectFileIDs":[5792094729984410978,5792094730711952120],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}

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":515.9874267578125,"y":315.84716796875,"z":-105.8125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":347.46002197265627,"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":503.6640625,"y":306.760009765625,"z":-208.375},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":340.932373046875,"orthographic":true}

Binary file not shown.