From ab81d4a1d5247cc6a0386eeaa1568d9f33a4c4b9 Mon Sep 17 00:00:00 2001 From: Joshua Reason Date: Sat, 1 Feb 2020 10:35:22 +1100 Subject: [PATCH] Actually moved folders this time --- Assets/Scenes.meta | 8 + Assets/Scenes/SampleScene.unity | 259 ++++++++++++++++++ Assets/Scenes/SampleScene.unity.meta | 7 + {GGJ2020/Logs => Logs}/Packages-Update.log | 0 {GGJ2020/Packages => Packages}/manifest.json | 0 .../AudioManager.asset | 0 .../ClusterInputManager.asset | 0 .../DynamicsManager.asset | 0 .../EditorBuildSettings.asset | 0 .../EditorSettings.asset | 0 .../GraphicsSettings.asset | 0 .../InputManager.asset | 0 .../NavMeshAreas.asset | 0 .../Physics2DSettings.asset | 0 .../PresetManager.asset | 0 .../ProjectSettings.asset | 0 .../ProjectVersion.txt | 0 .../QualitySettings.asset | 0 .../TagManager.asset | 0 .../TimeManager.asset | 0 .../UnityConnectSettings.asset | 0 .../VFXManager.asset | 0 22 files changed, 274 insertions(+) create mode 100644 Assets/Scenes.meta create mode 100644 Assets/Scenes/SampleScene.unity create mode 100644 Assets/Scenes/SampleScene.unity.meta rename {GGJ2020/Logs => Logs}/Packages-Update.log (100%) rename {GGJ2020/Packages => Packages}/manifest.json (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/AudioManager.asset (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/ClusterInputManager.asset (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/DynamicsManager.asset (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/EditorBuildSettings.asset (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/EditorSettings.asset (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/GraphicsSettings.asset (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/InputManager.asset (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/NavMeshAreas.asset (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/Physics2DSettings.asset (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/PresetManager.asset (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/ProjectSettings.asset (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/ProjectVersion.txt (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/QualitySettings.asset (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/TagManager.asset (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/TimeManager.asset (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/UnityConnectSettings.asset (100%) rename {GGJ2020/ProjectSettings => ProjectSettings}/VFXManager.asset (100%) diff --git a/Assets/Scenes.meta b/Assets/Scenes.meta new file mode 100644 index 0000000..cd10b69 --- /dev/null +++ b/Assets/Scenes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05a69edb64a15cf4bbaa7407f6318121 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity new file mode 100644 index 0000000..7cdec2a --- /dev/null +++ b/Assets/Scenes/SampleScene.unity @@ -0,0 +1,259 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 705507994} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 10 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &705507993 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 705507995} + - component: {fileID: 705507994} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &705507994 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 705507993} + m_Enabled: 1 + serializedVersion: 8 + m_Type: 1 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 1 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &705507995 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 705507993} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &963194225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 963194228} + - component: {fileID: 963194227} + - component: {fileID: 963194226} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &963194226 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 +--- !u!20 &963194227 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &963194228 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/SampleScene.unity.meta b/Assets/Scenes/SampleScene.unity.meta new file mode 100644 index 0000000..952bd1e --- /dev/null +++ b/Assets/Scenes/SampleScene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9fc0d4010bbf28b4594072e72b8655ab +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/GGJ2020/Logs/Packages-Update.log b/Logs/Packages-Update.log similarity index 100% rename from GGJ2020/Logs/Packages-Update.log rename to Logs/Packages-Update.log diff --git a/GGJ2020/Packages/manifest.json b/Packages/manifest.json similarity index 100% rename from GGJ2020/Packages/manifest.json rename to Packages/manifest.json diff --git a/GGJ2020/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset similarity index 100% rename from GGJ2020/ProjectSettings/AudioManager.asset rename to ProjectSettings/AudioManager.asset diff --git a/GGJ2020/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset similarity index 100% rename from GGJ2020/ProjectSettings/ClusterInputManager.asset rename to ProjectSettings/ClusterInputManager.asset diff --git a/GGJ2020/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset similarity index 100% rename from GGJ2020/ProjectSettings/DynamicsManager.asset rename to ProjectSettings/DynamicsManager.asset diff --git a/GGJ2020/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset similarity index 100% rename from GGJ2020/ProjectSettings/EditorBuildSettings.asset rename to ProjectSettings/EditorBuildSettings.asset diff --git a/GGJ2020/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset similarity index 100% rename from GGJ2020/ProjectSettings/EditorSettings.asset rename to ProjectSettings/EditorSettings.asset diff --git a/GGJ2020/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset similarity index 100% rename from GGJ2020/ProjectSettings/GraphicsSettings.asset rename to ProjectSettings/GraphicsSettings.asset diff --git a/GGJ2020/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset similarity index 100% rename from GGJ2020/ProjectSettings/InputManager.asset rename to ProjectSettings/InputManager.asset diff --git a/GGJ2020/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset similarity index 100% rename from GGJ2020/ProjectSettings/NavMeshAreas.asset rename to ProjectSettings/NavMeshAreas.asset diff --git a/GGJ2020/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset similarity index 100% rename from GGJ2020/ProjectSettings/Physics2DSettings.asset rename to ProjectSettings/Physics2DSettings.asset diff --git a/GGJ2020/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset similarity index 100% rename from GGJ2020/ProjectSettings/PresetManager.asset rename to ProjectSettings/PresetManager.asset diff --git a/GGJ2020/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset similarity index 100% rename from GGJ2020/ProjectSettings/ProjectSettings.asset rename to ProjectSettings/ProjectSettings.asset diff --git a/GGJ2020/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt similarity index 100% rename from GGJ2020/ProjectSettings/ProjectVersion.txt rename to ProjectSettings/ProjectVersion.txt diff --git a/GGJ2020/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset similarity index 100% rename from GGJ2020/ProjectSettings/QualitySettings.asset rename to ProjectSettings/QualitySettings.asset diff --git a/GGJ2020/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset similarity index 100% rename from GGJ2020/ProjectSettings/TagManager.asset rename to ProjectSettings/TagManager.asset diff --git a/GGJ2020/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset similarity index 100% rename from GGJ2020/ProjectSettings/TimeManager.asset rename to ProjectSettings/TimeManager.asset diff --git a/GGJ2020/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset similarity index 100% rename from GGJ2020/ProjectSettings/UnityConnectSettings.asset rename to ProjectSettings/UnityConnectSettings.asset diff --git a/GGJ2020/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset similarity index 100% rename from GGJ2020/ProjectSettings/VFXManager.asset rename to ProjectSettings/VFXManager.asset