mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into windowdancefix

Browse source 
crop stomp doesnt work as well as a bunch of other stuff but hey at least its fully implemented? i think?
This commit is contained in:
Firerise9402 2023-11-18 15:19:10 -05:00
parent 11b34ec5ce
commit d2976d694b
5 changed files with 60 additions and 742 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

698
Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic_Outline.asset
View file

File diff suppressed because one or more lines are too long

4
Assets/Resources/Prefabs/GameView/GameTex.renderTexture
View file

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 1600
m_Height: 900
m_Width: 1320
m_Height: 743
m_AntiAliasing: 2
m_MipCount: -1
m_DepthStencilFormat: 92

4
Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture
View file

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 2400
m_Height: 1350
m_Width: 1980
m_Height: 1114
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 92

94
Assets/Scenes/Editor.unity
View file

@ -566,7 +566,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1852819573}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -1836,6 +1836,11 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 58525995}
m_CullTransparentMesh: 1
--- !u!224 &66970446 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8512930684284350359, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!1 &72277293
GameObject:
m_ObjectHideFlags: 0
@ -1876,11 +1881,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 225, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!224 &66970446 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8512930684284350359, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!1 &73172994
GameObject:
m_ObjectHideFlags: 0
@ -5010,7 +5010,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -400, y: 0}
m_AnchoredPosition: {x: -400.00006, y: 0}
m_SizeDelta: {x: -800.0001, y: 194}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &195260752
@ -11153,7 +11153,7 @@ RectTransform:
m_Children:
- {fileID: 475178373}
m_Father: {fileID: 546272877}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -12340,6 +12340,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1969940937}
- {fileID: 1588658939}
- {fileID: 500988013}
m_Father: {fileID: 1050802356}
m_RootOrder: 3
@ -13134,7 +13135,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -50.000015}
m_AnchoredPosition: {x: 0, y: -50}
m_SizeDelta: {x: -48, y: -148}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &572765323
@ -21433,7 +21434,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1589389271}
m_Direction: 2
m_Value: 1
m_Size: 1
m_Size: 0.984135
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -25049,11 +25050,6 @@ MonoBehaviour:
m_FlexibleWidth: 1
m_FlexibleHeight: -1
m_LayoutPriority: 1
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -408.97974, y: -17}
m_SizeDelta: {x: -817.96, y: -46.29}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &1112762038 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2077856143944097172, guid: 720073bc7682b1441bece7116681f72c, type: 3}
@ -26214,7 +26210,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 153.75513}
m_AnchoredPosition: {x: 0, y: 130.2135}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945
@ -31416,7 +31412,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -400, y: 0}
m_AnchoredPosition: {x: -400.00006, y: 0}
m_SizeDelta: {x: -800.0001, y: 194}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1426168094
@ -33756,7 +33752,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -42.49511}
m_AnchoredPosition: {x: 0, y: -42.495117}
m_SizeDelta: {x: 1440.022, y: -84.99}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &1527251881
@ -35436,8 +35432,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1304677024}
m_Children: []
m_Father: {fileID: 546272877}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -35486,7 +35481,7 @@ MonoBehaviour:
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1292844878}
m_TargetGraphic: {fileID: 1588658941}
m_HandleRect: {fileID: 1292844877}
m_Direction: 2
m_Value: 0
@ -35708,8 +35703,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1220118245}
m_HandleRect: {fileID: 1220118244}
m_Direction: 2
m_Value: 1.0000007
m_Size: 0.87568516
m_Value: 1.0000002
m_Size: 0.6812245
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -36058,6 +36053,22 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1637160319}
m_CullTransparentMesh: 1
--- !u!1 &1638236449 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2464883521749415129, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1638236456 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 647613278910435637, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1638236449}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1639210682
GameObject:
m_ObjectHideFlags: 0
@ -36229,22 +36240,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1643615740}
m_CullTransparentMesh: 1
--- !u!1 &1638236449 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2464883521749415129, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1638236456 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 647613278910435637, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1638236449}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1647324172
GameObject:
m_ObjectHideFlags: 0
@ -39497,6 +39492,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 259713290}
- {fileID: 1527251880}
- {fileID: 19519745}
m_Father: {fileID: 547319783}
m_RootOrder: 0
@ -44486,6 +44482,16 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2098678239}
m_CullTransparentMesh: 1
--- !u!1 &2105509200 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7051539713125569525, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!224 &2105509201 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8925473620302868482, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2106389009
PrefabInstance:
m_ObjectHideFlags: 0
@ -44674,16 +44680,6 @@ MonoBehaviour:
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &2105509200 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7051539713125569525, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!224 &2105509201 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8925473620302868482, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2125404435
GameObject:
m_ObjectHideFlags: 0

2
ProjectSettings/ProjectSettings.asset
View file

@ -87,7 +87,7 @@ PlayerSettings:
usePlayerLog: 1
bakeCollisionMeshes: 0
forceSingleInstance: 1
useFlipModelSwapchain: 1
useFlipModelSwapchain: 0
resizableWindow: 1
useMacAppStoreValidation: 0
macAppStoreCategory: public.app-category.games