Skip to content

Commit

Permalink
Merge branch 'main' of github.com:HeavenlyAwe/fgj22 into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Andeye committed Jan 30, 2022
2 parents d58a0b5 + 99f03ff commit b37f2d0
Show file tree
Hide file tree
Showing 7 changed files with 226 additions and 6 deletions.
8 changes: 8 additions & 0 deletions Assets/Graphics/logos.meta

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

Binary file added Assets/Graphics/logos/EElogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
96 changes: 96 additions & 0 deletions Assets/Graphics/logos/EElogo.png.meta

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

Binary file added Assets/Graphics/logos/EElogo_square.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
96 changes: 96 additions & 0 deletions Assets/Graphics/logos/EElogo_square.png.meta

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

14 changes: 13 additions & 1 deletion Assets/Scenes/RaceScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -3588,8 +3588,8 @@ Transform:
- {fileID: 24115757}
- {fileID: 1816665355}
- {fileID: 2080031051}
- {fileID: 148469970}
- {fileID: 288767219}
- {fileID: 148469970}
m_Father: {fileID: 0}
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -8749,6 +8749,18 @@ PrefabInstance:
propertyPath: m_Name
value: Follower (7)
objectReference: {fileID: 0}
- target: {fileID: 3127341931425816765, guid: 892c5a8fe0ff06643af04e7e8a5a934b, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3483481384968863557, guid: 892c5a8fe0ff06643af04e7e8a5a934b, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5623092081544484268, guid: 892c5a8fe0ff06643af04e7e8a5a934b, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 892c5a8fe0ff06643af04e7e8a5a934b, type: 3}
--- !u!1001 &1182185418
Expand Down
18 changes: 13 additions & 5 deletions ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: DefaultCompany
productName: beard-horn
productName: elemental-exemplar
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
Expand All @@ -40,7 +40,7 @@ PlayerSettings:
width: 1
height: 1
m_SplashScreenLogos: []
m_VirtualRealitySplashScreen: {fileID: 0}
m_VirtualRealitySplashScreen: {fileID: 2800000, guid: 78b4689ce489efd4baeeeb41d231ed23, type: 3}
m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1024
defaultScreenHeight: 768
Expand Down Expand Up @@ -135,7 +135,8 @@ PlayerSettings:
16:9: 1
Others: 1
bundleVersion: 0.1
preloadedAssets: []
preloadedAssets:
- {fileID: 0}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
Expand Down Expand Up @@ -266,7 +267,14 @@ PlayerSettings:
AndroidMinifyDebug: 0
AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150
m_BuildTargetIcons: []
m_BuildTargetIcons:
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: ee57299ba63ab9f409e503d2caf7404b, type: 3}
m_Width: 128
m_Height: 128
m_Kind: 0
m_BuildTargetPlatformIcons: []
m_BuildTargetBatching:
- m_BuildTarget: Standalone
Expand Down Expand Up @@ -619,7 +627,7 @@ PlayerSettings:
metroCertificateNotAfter: 0000000000000000
metroApplicationDescription: Template_3D
wsaImages: {}
metroTileShortName: beard-horn
metroTileShortName: elemental-exemplar
metroTileShowName: 0
metroMediumTileShowName: 0
metroLargeTileShowName: 0
Expand Down

0 comments on commit b37f2d0

Please sign in to comment.