Skip to content

Update 12 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Brynzananas wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Update 12 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f6780e
Update 12
Brynzananas Jan 14, 2025
41f5183
Merge branch 'main' into pr/5
Brynzananas Jan 14, 2025
af5a257
Update 11.1
Brynzananas Jan 18, 2025
35c1d00
Merge branch 'pr/5' of https://github.com/Brynzananas/BadAssEmotes in…
Brynzananas Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BadAssEmotesUnity/Assembly-CSharp-Editor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<UnityVersion>2021.3.33f1</UnityVersion>
</PropertyGroup>
<ItemGroup>
<Analyzer Include="C:\Users\1\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.0.4\Analyzers\Microsoft.Unity.Analyzers.dll" />
<Analyzer Include="C:\Users\1\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.0.5\Analyzers\Microsoft.Unity.Analyzers.dll" />
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\ToonShader\Editor\ToonCrystalEditor.cs" />
Expand Down
2 changes: 1 addition & 1 deletion BadAssEmotesUnity/Assembly-CSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<UnityVersion>2021.3.33f1</UnityVersion>
</PropertyGroup>
<ItemGroup>
<Analyzer Include="C:\Users\1\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.0.4\Analyzers\Microsoft.Unity.Analyzers.dll" />
<Analyzer Include="C:\Users\1\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.0.5\Analyzers\Microsoft.Unity.Analyzers.dll" />
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\SineVFX\Volumetric3DLasers\Scripts\LaserLineV3D.cs" />
Expand Down
7 changes: 7 additions & 0 deletions BadAssEmotesUnity/Assets/BadAssEmotes/BadAssEmotes.7z.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions BadAssEmotesUnity/Assets/BadAssEmotes/ChugJug.anim.meta
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions BadAssEmotesUnity/Assets/BadAssEmotes/DesertRivers.anim.meta
View file
Open in desktop

This file was deleted.

Binary file added BadAssEmotesUnity/Assets/BadAssEmotes/badassemotes11-1.7z
View file
Open in desktop
Binary file not shown.
Binary file added BadAssEmotesUnity/Assets/BadAssEmotes/badassemotes11.7z
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions BadAssEmotesUnity/Assets/BadAssEmotes/badassemotes11.7z.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions BadAssEmotesUnity/Assets/BadAssEmotes/badassemotes_brynzapack.7z.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified BadAssEmotesUnity/Library/ArtifactDB
View file
Open in desktop
Binary file not shown.
Binary file modified BadAssEmotesUnity/Library/SceneVisibilityState.asset
View file
Open in desktop
Binary file not shown.
Binary file modified BadAssEmotesUnity/Library/ShaderCache.db
View file
Open in desktop
Binary file not shown.
Binary file modified BadAssEmotesUnity/Library/ShaderCache/EditorEncounteredVariants
View file
Open in desktop
Binary file not shown.
Binary file modified BadAssEmotesUnity/Library/SourceAssetDB
View file
Open in desktop
Binary file not shown.
72 changes: 36 additions & 36 deletions BadAssEmotesUnity/UserSettings/Layouts/default-2021.dwlt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ MonoBehaviour:
width: 1920
height: 997
m_ShowMode: 4
m_Title: Hierarchy
m_Title: Scene
m_RootView: {fileID: 6}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
Expand Down Expand Up @@ -48,7 +48,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 87
controlID: 116
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
Expand Down Expand Up @@ -224,7 +224,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
controlID: 88
controlID: 117
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
Expand All @@ -249,7 +249,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 89
controlID: 118
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
Expand Down Expand Up @@ -468,23 +468,23 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/BadAssEmotes
- Assets/Prefabs
m_Globs: []
m_OriginalText:
m_FilterByTypeIntersection: 0
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/BadAssEmotes
- Assets/Prefabs
m_LastFoldersGridSize: -1
m_LastProjectPath: D:\Ror2Mods\BadAssEmotes\BadAssEmotesUnity
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 1a820000
m_LastClickedID: 33306
m_ExpandedIDs: 00000000ca7d0000cc7d0000ce7d0000d07d0000d27d0000d47d000000ca9a3bffffff7f
scrollPos: {x: 0, y: 180}
m_SelectedIDs: 3a820000
m_LastClickedID: 33338
m_ExpandedIDs: 00000000ce7d0000d07d0000d27d0000d47d0000d67d0000d87d000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -512,7 +512,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000ca7d0000cc7d0000ce7d0000d07d0000d27d0000d47d0000
m_ExpandedIDs: 00000000ce7d0000d07d0000d27d0000d47d0000d67d0000d87d0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -644,9 +644,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 8893ffff
m_LastClickedID: -27768
m_ExpandedIDs: 8893ffff84b8fffff4850000f6850000f8850000fa850000fc850000fe8500000a8600000e860000168600001a8600002086000022860000288600002c8600003086000032860000388600003e86000040860000448600004a8600005086000052860000568600005c8600005e86000064860000688600006e860000788600007c8600007e860000868600008a8600009086000094860000968600009a8600009e860000a0860000a2860000a6860000aa860000c0860000c8860000ca860000d0860000d4860000e2860000e4860000f0860000f2860000f486000006870000088700001e87000024870000288700002a8700002c8700003e870000408700004887000050870000568700005c8700005e8700006487000076870000788700007e87000080870000828700009287000094870000968700009c870000a6870000b4870000b6870000be870000ca870000ce870000d4870000da870000de870000e6870000e8870000ec870000f0870000fa870000fc870000fe870000028800000a8800000c88000012880000
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 38fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -738,7 +738,7 @@ MonoBehaviour:
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 1
id: unity-search-toolbar
index: 1
Expand All @@ -749,7 +749,7 @@ MonoBehaviour:
collapsed: 0
displayed: 1
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: unity-transform-toolbar
index: 0
Expand Down Expand Up @@ -782,7 +782,7 @@ MonoBehaviour:
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Light Settings
index: 0
Expand All @@ -793,7 +793,7 @@ MonoBehaviour:
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Camera
index: 1
Expand All @@ -804,7 +804,7 @@ MonoBehaviour:
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Cloth Constraints
index: 2
Expand All @@ -815,7 +815,7 @@ MonoBehaviour:
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Cloth Collisions
index: 3
Expand All @@ -826,7 +826,7 @@ MonoBehaviour:
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Navmesh Display
index: 5
Expand All @@ -837,7 +837,7 @@ MonoBehaviour:
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Agent Display
index: 7
Expand All @@ -848,7 +848,7 @@ MonoBehaviour:
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Obstacle Display
index: 9
Expand All @@ -859,7 +859,7 @@ MonoBehaviour:
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Occlusion Culling
index: 4
Expand All @@ -870,7 +870,7 @@ MonoBehaviour:
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Physics Debugger
index: 6
Expand All @@ -881,7 +881,7 @@ MonoBehaviour:
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Scene Visibility
index: 8
Expand All @@ -891,8 +891,8 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 0
snapOffset: {x: 0, y: 0}
snapOffsetDelta: {x: 0, y: 25}
snapOffset: {x: 0, y: 25}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: Scene View/Particles
index: 10
Expand Down Expand Up @@ -988,17 +988,17 @@ MonoBehaviour:
m_OverlaysVisible: 1
m_WindowGUID: 4e89c881bc0c300429361dbbf209f45c
m_Gizmos: 1
m_OverrideSceneCullingMask: 0
m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 0
m_SceneLighting: 1
m_2DMode: 0
m_isRotationLocked: 0
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: -2.8305788, y: -2.164264, z: 2.129409}
m_Target: {x: -0.3899989, y: 0.80997264, z: -2.8794622}
speed: 2
m_Value: {x: -2.8305788, y: -2.164264, z: 2.129409}
m_Value: {x: -0.3899989, y: 0.80997264, z: -2.8794622}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
Expand Down Expand Up @@ -1037,21 +1037,21 @@ MonoBehaviour:
m_Fade:
m_Target: 0
speed: 2
m_Value: 1
m_Value: 0
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
m_Pivot: {x: 0, y: 0, z: 0}
m_Size: {x: 1, y: 1}
m_ShowGrid: 1
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: 0.31103238, y: -0.4155352, z: 0.15371516, w: 0.840809}
m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
speed: 2
m_Value: {x: 0.31080166, y: -0.4167962, z: 0.15418163, w: 0.8401852}
m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
m_Size:
m_Target: 2.5158126
m_Target: 7.513434
speed: 2
m_Value: 2.634359
m_Value: 7.513434
m_Ortho:
m_Target: 0
speed: 2
Expand Down
Loading