Merge branch 'main' of https://git.crystalyx.net/GameJams/Snaparazzi

Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_6_0.bundle.meta

@@ -4,110 +4,74 @@ labels:
 - gvh
 - gvh_version-11.6.0
 - gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppApp-11_6_0.bundle
+timeCreated: 1480838400
 PluginImporter:
-  externalObjects: {}
+  serializedVersion: 1
-  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
-  defineConstraints: []
   isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
   platformData:
-  - first:
+    Android:
-      : Linux
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      : LinuxUniversal
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      : OSXIntel
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      : OSXIntel64
-    second:
-      enabled: 1
-      settings:
-        CPU: x86_64
-  - first:
-      : Web
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      : WebStreamed
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Android: Android
-    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-  - first:
+    Any:
-      Any: 
-    second:
       enabled: 0
       settings: {}
-  - first:
+    Editor:
-      Editor: Editor
-    second:
       enabled: 1
       settings:
         CPU: AnyCPU
         DefaultValueInitialized: true
         OS: AnyOS
-  - first:
+    Linux:
-      Standalone: Linux64
-    second:
       enabled: 0
       settings:
         CPU: None
-  - first:
+    Linux64:
-      Standalone: OSXUniversal
+      enabled: 0
-    second:
+      settings:
+        CPU: None
+    LinuxUniversal:
+      enabled: 0
+      settings:
+        CPU: None
+    OSXIntel:
+      enabled: 0
+      settings:
+        CPU: None
+    OSXIntel64:
+      enabled: 1
+      settings:
+        CPU: x86_64
+    OSXUniversal:
       enabled: 1
       settings:
         CPU: AnyCPU
-  - first:
+    Web:
-      Standalone: Win
+      enabled: 0
-    second:
+      settings: {}
+    WebStreamed:
+      enabled: 0
+      settings: {}
+    Win:
       enabled: 0
       settings:
         CPU: None
-  - first:
+    Win64:
-      Standalone: Win64
-    second:
       enabled: 0
       settings:
         CPU: None
-  - first:
+    WindowsStoreApps:
-      Windows Store Apps: WindowsStoreApps
-    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-  - first:
+    iOS:
-      iPhone: iOS
-    second:
       enabled: 0
       settings:
         CompileFlags:
         FrameworkDependencies:
-  - first:
+    tvOS:
-      tvOS: tvOS
-    second:
       enabled: 0
       settings:
         CompileFlags:

Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_6_0.dll.meta

@@ -4,110 +4,74 @@ labels:
 - gvh
 - gvh_version-11.6.0
 - gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppApp-11_6_0.dll
+timeCreated: 1480838400
 PluginImporter:
-  externalObjects: {}
+  serializedVersion: 1
-  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
-  defineConstraints: []
   isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
   platformData:
-  - first:
+    Android:
-      : Linux
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      : LinuxUniversal
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      : OSXIntel
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      : OSXIntel64
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      : Web
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      : WebStreamed
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Android: Android
-    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-  - first:
+    Any:
-      Any: 
-    second:
       enabled: 0
       settings: {}
-  - first:
+    Editor:
-      Editor: Editor
-    second:
       enabled: 1
       settings:
         CPU: AnyCPU
         DefaultValueInitialized: true
         OS: AnyOS
-  - first:
+    Linux:
-      Standalone: Linux64
-    second:
       enabled: 0
       settings:
         CPU: None
-  - first:
+    Linux64:
-      Standalone: OSXUniversal
-    second:
       enabled: 0
       settings:
         CPU: None
-  - first:
+    LinuxUniversal:
-      Standalone: Win
-    second:
       enabled: 0
       settings:
         CPU: None
-  - first:
+    OSXIntel:
-      Standalone: Win64
+      enabled: 0
-    second:
+      settings:
+        CPU: None
+    OSXIntel64:
+      enabled: 0
+      settings:
+        CPU: None
+    OSXUniversal:
+      enabled: 0
+      settings:
+        CPU: None
+    Web:
+      enabled: 0
+      settings: {}
+    WebStreamed:
+      enabled: 0
+      settings: {}
+    Win:
+      enabled: 0
+      settings:
+        CPU: None
+    Win64:
       enabled: 1
       settings:
         CPU: x86_64
-  - first:
+    WindowsStoreApps:
-      Windows Store Apps: WindowsStoreApps
-    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-  - first:
+    iOS:
-      iPhone: iOS
-    second:
       enabled: 0
       settings:
         CompileFlags:
         FrameworkDependencies:
-  - first:
+    tvOS:
-      tvOS: tvOS
-    second:
       enabled: 0
       settings:
         CompileFlags:

Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_6_0.so.meta

@@ -4,110 +4,74 @@ labels:
 - gvh
 - gvh_version-11.6.0
 - gvhp_exportpath-Firebase/Plugins/x86_64/FirebaseCppApp-11_6_0.so
+timeCreated: 1480838400
 PluginImporter:
-  externalObjects: {}
+  serializedVersion: 1
-  serializedVersion: 2
   iconMap: {}
   executionOrder: {}
-  defineConstraints: []
   isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
   platformData:
-  - first:
+    Android:
-      : Linux
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      : LinuxUniversal
-    second:
-      enabled: 1
-      settings:
-        CPU: AnyCPU
-  - first:
-      : OSXIntel
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      : OSXIntel64
-    second:
-      enabled: 0
-      settings:
-        CPU: None
-  - first:
-      : Web
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      : WebStreamed
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Android: Android
-    second:
       enabled: 0
       settings:
         CPU: AnyCPU
-  - first:
+    Any:
-      Any: 
-    second:
       enabled: 0
       settings: {}
-  - first:
+    Editor:
-      Editor: Editor
-    second:
       enabled: 1
       settings:
         CPU: AnyCPU
         DefaultValueInitialized: true
         OS: AnyOS
-  - first:
+    Linux:
-      Standalone: Linux64
+      enabled: 0
-    second:
+      settings:
+        CPU: None
+    Linux64:
+      enabled: 1
+      settings:
+        CPU: x86_64
+    LinuxUniversal:
       enabled: 1
       settings:
         CPU: AnyCPU
-  - first:
+    OSXIntel:
-      Standalone: OSXUniversal
-    second:
       enabled: 0
       settings:
         CPU: None
-  - first:
+    OSXIntel64:
-      Standalone: Win
-    second:
       enabled: 0
       settings:
         CPU: None
-  - first:
+    OSXUniversal:
-      Standalone: Win64
-    second:
       enabled: 0
       settings:
         CPU: None
-  - first:
+    Web:
-      Windows Store Apps: WindowsStoreApps
+      enabled: 0
-    second:
+      settings: {}
+    WebStreamed:
+      enabled: 0
+      settings: {}
+    Win:
+      enabled: 0
+      settings:
+        CPU: None
+    Win64:
+      enabled: 0
+      settings:
+        CPU: None
+    WindowsStoreApps:
       enabled: 0
       settings:
         CPU: AnyCPU
-  - first:
+    iOS:
-      iPhone: iOS
-    second:
       enabled: 0
       settings:
         CompileFlags:
         FrameworkDependencies:
-  - first:
+    tvOS:
-      tvOS: tvOS
-    second:
       enabled: 0
       settings:
         CompileFlags:

ProjectSettings/EditorBuildSettings.asset

@@ -5,10 +5,7 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 0
-    path: Assets/Scenes/ComputerView.unity
-    guid: 9fc0d4010bbf28b4594072e72b8655ab
   - enabled: 1
-    path: Assets/Scenes/CameraView.unity
+    path: Assets/Scenes/PhoneView.unity
-    guid: 394c0d472cf2dd10397e650973500b34
+    guid: a409508fe0f675b4a8e1a675d96ede3b
   m_configObjects: {}

ProjectSettings/GvhProjectSettings.xml

@@ -3,4 +3,6 @@
   <projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
   <projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
   <projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />
+  <projectSetting name="GooglePlayServices.PromptBeforeAutoResolution" value="False" />
+  <projectSetting name="GooglePlayServices.UseJetifier" value="True" />
 </projectSettings>

ProjectSettings/ProjectSettings.asset

@@ -284,10 +284,83 @@ PlayerSettings:
   AndroidMinifyDebug: 0
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 150
-  m_BuildTargetIcons: []
+  m_BuildTargetIcons:
+  - m_BuildTarget: 
+    m_Icons:
+    - serializedVersion: 2
+      m_Icon: {fileID: 2800000, guid: 93cf115964d3bfa45ba83a1f465565f0, type: 3}
+      m_Width: 128
+      m_Height: 128
+      m_Kind: 0
   m_BuildTargetPlatformIcons:
   - m_BuildTarget: Android
     m_Icons:
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures:
+      - {fileID: 0}
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures:
+      - {fileID: 0}
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures:
+      - {fileID: 0}
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures:
+      - {fileID: 0}
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures:
+      - {fileID: 0}
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures:
+      - {fileID: 0}
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 1
+      m_SubKind: 
     - m_Textures: []
       m_Width: 432
       m_Height: 432
@@ -318,66 +391,6 @@ PlayerSettings:
       m_Height: 81
       m_Kind: 2
       m_SubKind: 
-    - m_Textures: []
-      m_Width: 192
-      m_Height: 192
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 144
-      m_Height: 144
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 96
-      m_Height: 96
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 72
-      m_Height: 72
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 48
-      m_Height: 48
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 36
-      m_Height: 36
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 192
-      m_Height: 192
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 144
-      m_Height: 144
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 96
-      m_Height: 96
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 72
-      m_Height: 72
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 48
-      m_Height: 48
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 36
-      m_Height: 36
-      m_Kind: 0
-      m_SubKind: 
   - m_BuildTarget: iPhone
     m_Icons:
     - m_Textures: []