From e308bb2e17864ec4af6dc4cd78bf743952966395 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 5 Sep 2023 15:55:21 +1000 Subject: [PATCH] move stuff 4mcD --- ...star_fraenkel_zermelo.meta => sr_sfz.meta} | 0 .../00000-265549821.png | 0 .../00000-265549821.png.meta | 0 .../LightingData.asset | Bin .../LightingData.asset.meta | 2 +- .../ReflectionProbe-0.exr | 0 .../ReflectionProbe-0.exr.meta | 2 +- .../SpaSkybox.mat | 0 .../SpaSkybox.mat.meta | 0 .../spa-grid.blend | 0 .../spa-grid.blend.meta | 0 .../spa-grid.blend1 | 0 .../spa-grid.blend1.meta | 0 .../spa.blend | 0 .../spa.blend.meta | 0 .../spa.blend1 | 0 .../spa.blend1.meta | 0 .../sr_sfz.unity} | 0 .../sr_sfz.unity.meta} | 0 .../sr_star_fraenkel_zermelo.Lighting | 0 .../sr_star_fraenkel_zermelo.Lighting.meta | 0 ...Circuit,_July_2,_2018_SkySat_(cropped).jpg | 3 + ...it,_July_2,_2018_SkySat_(cropped).jpg.meta | 140 ++++++++++++++++++ .../sr_silverstorage/silverstorage.blend | 4 +- .../sr_silverstorage/silverstorage.blend1 | 4 +- .../sr_star_fraenkel_zermelo.meta | 8 - ProjectSettings/EditorBuildSettings.asset | 2 +- ProjectSettings/ProjectSettings.asset | 3 +- nginx/srv/index.html | 4 +- 29 files changed, 154 insertions(+), 18 deletions(-) rename Assets/Scenes/{sr_star_fraenkel_zermelo.meta => sr_sfz.meta} (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo => sr_sfz}/00000-265549821.png (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo => sr_sfz}/00000-265549821.png.meta (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo => sr_sfz}/LightingData.asset (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo => sr_sfz}/LightingData.asset.meta (79%) rename Assets/Scenes/{sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo => sr_sfz}/ReflectionProbe-0.exr (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo => sr_sfz}/ReflectionProbe-0.exr.meta (98%) rename Assets/Scenes/{sr_star_fraenkel_zermelo => sr_sfz}/SpaSkybox.mat (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo => sr_sfz}/SpaSkybox.mat.meta (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo => sr_sfz}/spa-grid.blend (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo => sr_sfz}/spa-grid.blend.meta (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo => sr_sfz}/spa-grid.blend1 (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo => sr_sfz}/spa-grid.blend1.meta (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo => sr_sfz}/spa.blend (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo => sr_sfz}/spa.blend.meta (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo => sr_sfz}/spa.blend1 (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo => sr_sfz}/spa.blend1.meta (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.unity => sr_sfz/sr_sfz.unity} (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.unity.meta => sr_sfz/sr_sfz.unity.meta} (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo => sr_sfz}/sr_star_fraenkel_zermelo.Lighting (100%) rename Assets/Scenes/{sr_star_fraenkel_zermelo => sr_sfz}/sr_star_fraenkel_zermelo.Lighting.meta (100%) create mode 100644 Assets/Scenes/sr_silverstorage/Silverstone_Circuit,_July_2,_2018_SkySat_(cropped).jpg create mode 100644 Assets/Scenes/sr_silverstorage/Silverstone_Circuit,_July_2,_2018_SkySat_(cropped).jpg.meta delete mode 100644 Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.meta diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo.meta b/Assets/Scenes/sr_sfz.meta similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo.meta rename to Assets/Scenes/sr_sfz.meta diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/00000-265549821.png b/Assets/Scenes/sr_sfz/00000-265549821.png similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/00000-265549821.png rename to Assets/Scenes/sr_sfz/00000-265549821.png diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/00000-265549821.png.meta b/Assets/Scenes/sr_sfz/00000-265549821.png.meta similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/00000-265549821.png.meta rename to Assets/Scenes/sr_sfz/00000-265549821.png.meta diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo/LightingData.asset b/Assets/Scenes/sr_sfz/LightingData.asset similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo/LightingData.asset rename to Assets/Scenes/sr_sfz/LightingData.asset diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo/LightingData.asset.meta b/Assets/Scenes/sr_sfz/LightingData.asset.meta similarity index 79% rename from Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo/LightingData.asset.meta rename to Assets/Scenes/sr_sfz/LightingData.asset.meta index 6e292b1..e71076d 100644 --- a/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo/LightingData.asset.meta +++ b/Assets/Scenes/sr_sfz/LightingData.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: deb903a369ca5a8cba042dbda593bdaf +guid: 0a517604f1ef27f92b90ad34f06964e9 NativeFormatImporter: externalObjects: {} mainObjectFileID: 112000000 diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo/ReflectionProbe-0.exr b/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo/ReflectionProbe-0.exr rename to Assets/Scenes/sr_sfz/ReflectionProbe-0.exr diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo/ReflectionProbe-0.exr.meta b/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr.meta similarity index 98% rename from Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo/ReflectionProbe-0.exr.meta rename to Assets/Scenes/sr_sfz/ReflectionProbe-0.exr.meta index 6aa856b..8a9780c 100644 --- a/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo/ReflectionProbe-0.exr.meta +++ b/Assets/Scenes/sr_sfz/ReflectionProbe-0.exr.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 29763cbfcb0cefbf7b19c64538d2174f +guid: 6043e793c59b5e737977e0dc46841aa1 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/SpaSkybox.mat b/Assets/Scenes/sr_sfz/SpaSkybox.mat similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/SpaSkybox.mat rename to Assets/Scenes/sr_sfz/SpaSkybox.mat diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/SpaSkybox.mat.meta b/Assets/Scenes/sr_sfz/SpaSkybox.mat.meta similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/SpaSkybox.mat.meta rename to Assets/Scenes/sr_sfz/SpaSkybox.mat.meta diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/spa-grid.blend b/Assets/Scenes/sr_sfz/spa-grid.blend similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/spa-grid.blend rename to Assets/Scenes/sr_sfz/spa-grid.blend diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/spa-grid.blend.meta b/Assets/Scenes/sr_sfz/spa-grid.blend.meta similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/spa-grid.blend.meta rename to Assets/Scenes/sr_sfz/spa-grid.blend.meta diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/spa-grid.blend1 b/Assets/Scenes/sr_sfz/spa-grid.blend1 similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/spa-grid.blend1 rename to Assets/Scenes/sr_sfz/spa-grid.blend1 diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/spa-grid.blend1.meta b/Assets/Scenes/sr_sfz/spa-grid.blend1.meta similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/spa-grid.blend1.meta rename to Assets/Scenes/sr_sfz/spa-grid.blend1.meta diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/spa.blend b/Assets/Scenes/sr_sfz/spa.blend similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/spa.blend rename to Assets/Scenes/sr_sfz/spa.blend diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/spa.blend.meta b/Assets/Scenes/sr_sfz/spa.blend.meta similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/spa.blend.meta rename to Assets/Scenes/sr_sfz/spa.blend.meta diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/spa.blend1 b/Assets/Scenes/sr_sfz/spa.blend1 similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/spa.blend1 rename to Assets/Scenes/sr_sfz/spa.blend1 diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/spa.blend1.meta b/Assets/Scenes/sr_sfz/spa.blend1.meta similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/spa.blend1.meta rename to Assets/Scenes/sr_sfz/spa.blend1.meta diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.unity b/Assets/Scenes/sr_sfz/sr_sfz.unity similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.unity rename to Assets/Scenes/sr_sfz/sr_sfz.unity diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.unity.meta b/Assets/Scenes/sr_sfz/sr_sfz.unity.meta similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.unity.meta rename to Assets/Scenes/sr_sfz/sr_sfz.unity.meta diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.Lighting b/Assets/Scenes/sr_sfz/sr_star_fraenkel_zermelo.Lighting similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.Lighting rename to Assets/Scenes/sr_sfz/sr_star_fraenkel_zermelo.Lighting diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.Lighting.meta b/Assets/Scenes/sr_sfz/sr_star_fraenkel_zermelo.Lighting.meta similarity index 100% rename from Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.Lighting.meta rename to Assets/Scenes/sr_sfz/sr_star_fraenkel_zermelo.Lighting.meta diff --git a/Assets/Scenes/sr_silverstorage/Silverstone_Circuit,_July_2,_2018_SkySat_(cropped).jpg b/Assets/Scenes/sr_silverstorage/Silverstone_Circuit,_July_2,_2018_SkySat_(cropped).jpg new file mode 100644 index 0000000..5e6176c --- /dev/null +++ b/Assets/Scenes/sr_silverstorage/Silverstone_Circuit,_July_2,_2018_SkySat_(cropped).jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a8a7684a58240c832f403ca635a286646a197a66ad2c115a85caaf3a236b879 +size 795963 diff --git a/Assets/Scenes/sr_silverstorage/Silverstone_Circuit,_July_2,_2018_SkySat_(cropped).jpg.meta b/Assets/Scenes/sr_silverstorage/Silverstone_Circuit,_July_2,_2018_SkySat_(cropped).jpg.meta new file mode 100644 index 0000000..983dd82 --- /dev/null +++ b/Assets/Scenes/sr_silverstorage/Silverstone_Circuit,_July_2,_2018_SkySat_(cropped).jpg.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: a677e1a12cebdffd7a7e14e244926919 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_silverstorage/silverstorage.blend b/Assets/Scenes/sr_silverstorage/silverstorage.blend index 7bc57eb..0791481 100644 --- a/Assets/Scenes/sr_silverstorage/silverstorage.blend +++ b/Assets/Scenes/sr_silverstorage/silverstorage.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1448a3496608ac466fc4ac4acc539088b6c8ba3b40000a860d25183afd73ec6 -size 22143988 +oid sha256:627a165f104d81f3b379a1d447c11b2b58bb1f439146a1b458f03b595cbf6e9d +size 22158308 diff --git a/Assets/Scenes/sr_silverstorage/silverstorage.blend1 b/Assets/Scenes/sr_silverstorage/silverstorage.blend1 index a95d2a4..09d6712 100644 --- a/Assets/Scenes/sr_silverstorage/silverstorage.blend1 +++ b/Assets/Scenes/sr_silverstorage/silverstorage.blend1 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a92c7cd61ed40ede9a2f2393627bac9b61b9cf66b24bf3e46dd666b0d2f91690 -size 22139596 +oid sha256:df904432ca693f2ad3763a3d4ddaa4032c789fa37708d39370651134e8fce223 +size 22158308 diff --git a/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.meta b/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.meta deleted file mode 100644 index ba51c8a..0000000 --- a/Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8b4d95193dd13d8978b456582bb9064a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 79bbf01..57dc84e 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -12,7 +12,7 @@ EditorBuildSettings: path: Assets/Scenes/sr_silverstorage/sr_silverstorage.unity guid: 5ee7c8e44f8a4f39f9ff8615ec98dd7f - enabled: 1 - path: Assets/Scenes/sr_star_fraenkel_zermelo/sr_star_fraenkel_zermelo.unity + path: Assets/Scenes/sr_sfz/sr_sfz.unity guid: 7623657cc93a9912eb98bdb1bae4d70d m_configObjects: com.unity.input.settings: {fileID: 11400000, guid: 020903acd8b50dd45a683fb9312ba7af, type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 77e4ef3..dcbe2de 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,8 @@ PlayerSettings: vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 bundleVersion: 0.1 - preloadedAssets: [] + preloadedAssets: + - {fileID: 11400000, guid: 020903acd8b50dd45a683fb9312ba7af, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/nginx/srv/index.html b/nginx/srv/index.html index d1eea74..23e7939 100644 --- a/nginx/srv/index.html +++ b/nginx/srv/index.html @@ -29,8 +29,8 @@

Builds

-

Windows

- +

Windows

+

MacOS

Go!