Skip to content

Commit

Permalink
Add VR Splash logo (icosa-foundation#266)
Browse files Browse the repository at this point in the history
* Add VR splash screen

* Update reference image logo
  • Loading branch information
mikeskydev committed Jul 27, 2022
1 parent 72758cb commit 85dc000
Show file tree
Hide file tree
Showing 7 changed files with 166 additions and 5 deletions.
Binary file added Assets/Resources/DefaultImages/OpenBrushLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Assets/Resources/DefaultImages/TiltBrushLogo.png
Binary file not shown.
2 changes: 1 addition & 1 deletion Assets/Scenes/Main.unity
Original file line number Diff line number Diff line change
Expand Up @@ -9935,7 +9935,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_ErrorImage: {fileID: 2800000, guid: 0c91e975bed1cd948a150b672f3fec48, type: 3}
m_DefaultImages:
- DefaultImages/TiltBrushLogo.png
- DefaultImages/OpenBrushLogo.png
--- !u!114 &652605561
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
Binary file added Assets/Textures/Trademarked/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
158 changes: 158 additions & 0 deletions Assets/Textures/Trademarked/logo.png.meta

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

11 changes: 7 additions & 4 deletions ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ PlayerSettings:
m_ShowUnitySplashScreen: 0
m_ShowUnitySplashLogo: 1
m_SplashScreenOverlayOpacity: 1
m_SplashScreenAnimation: 1
m_SplashScreenAnimation: 0
m_SplashScreenLogoStyle: 1
m_SplashScreenDrawMode: 0
m_SplashScreenBackgroundAnimationZoom: 1
Expand All @@ -39,8 +39,11 @@ PlayerSettings:
y: 0
width: 1
height: 1
m_SplashScreenLogos: []
m_VirtualRealitySplashScreen: {fileID: 0}
m_SplashScreenLogos:
- logo: {fileID: 21300000, guid: ce97f02a0d95f3d47b1a02dea91d564e, type: 3}
duration: 2
m_VirtualRealitySplashScreen: {fileID: 2800000, guid: ce97f02a0d95f3d47b1a02dea91d564e,
type: 3}
m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1024
defaultScreenHeight: 768
Expand Down Expand Up @@ -275,7 +278,7 @@ PlayerSettings:
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: 25dd4b19d68928e4d9acfcf0e26ac4b3, type: 3}
m_Icon: {fileID: 2800000, guid: 819e7471e6f639f4da51f3b379351b19, type: 3}
m_Width: 128
m_Height: 128
m_Kind: 0
Expand Down

0 comments on commit 85dc000

Please sign in to comment.