Feature/change to 2019.3 (#27)

chris-janidlo · Oct 20, 2020 · 1caa071 · 1caa071
1 parent b5bc8c4
commit 1caa071
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 47 deletions.
diff --git a/.github/workflows/activate-unity.yml b/.github/workflows/activate-unity.yml
diff --git a/Assets/Fonts/Berkelium1541.asset b/Assets/Fonts/Berkelium1541.asset
@@ -20,7 +20,6 @@ Texture2D:
   m_MipCount: 1
   m_IsReadable: 1
   m_IgnoreMasterTextureLimit: 0
-  m_IsPreProcessed: 0
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: 0
   m_AlphaIsTransparency: 0

diff --git a/Assets/Fonts/Berkelium64.asset b/Assets/Fonts/Berkelium64.asset
@@ -20,7 +20,6 @@ Texture2D:
   m_MipCount: 1
   m_IsReadable: 1
   m_IgnoreMasterTextureLimit: 0
-  m_IsPreProcessed: 0
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: 0
   m_AlphaIsTransparency: 0

diff --git a/Assets/Fonts/ChiKareGo2.asset b/Assets/Fonts/ChiKareGo2.asset
@@ -4348,7 +4348,6 @@ Texture2D:
   m_MipCount: 1
   m_IsReadable: 1
   m_IgnoreMasterTextureLimit: 0
-  m_IsPreProcessed: 0
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: 0
   m_AlphaIsTransparency: 0

diff --git a/Assets/Fonts/PrintChar21.asset b/Assets/Fonts/PrintChar21.asset
@@ -2401,7 +2401,6 @@ Texture2D:
   m_MipCount: 1
   m_IsReadable: 1
   m_IgnoreMasterTextureLimit: 0
-  m_IsPreProcessed: 0
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: 0
   m_AlphaIsTransparency: 0

diff --git a/Assets/Prefabs/Applications/Terminal App.prefab b/Assets/Prefabs/Applications/Terminal App.prefab
@@ -494,8 +494,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Padding: {x: 0, y: 0, z: 0, w: 0}
-  m_Softness: {x: 0, y: 0}
 --- !u!1 &7188818339320948814
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Prefabs/Desktop/Application Scroll View.prefab b/Assets/Prefabs/Desktop/Application Scroll View.prefab
@@ -223,8 +223,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Padding: {x: 0, y: 0, z: 0, w: 0}
-  m_Softness: {x: 0, y: 0}
 --- !u!1 &6118608543058869020
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Prefabs/Desktop/Base Window.prefab b/Assets/Prefabs/Desktop/Base Window.prefab
@@ -404,8 +404,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Padding: {x: 0, y: 0, z: 0, w: 0}
-  m_Softness: {x: 0, y: 0}
 --- !u!1 &1707194482673688324
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Scenes/Main OS.unity b/Assets/Scenes/Main OS.unity
@@ -11140,8 +11140,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Padding: {x: 0, y: 0, z: 0, w: 0}
-  m_Softness: {x: 0, y: 0}
 --- !u!222 &6264544967014608214
 CanvasRenderer:
   m_ObjectHideFlags: 0

diff --git a/Assets/ScriptableObjects/PDFs/Spellbook.asset b/Assets/ScriptableObjects/PDFs/Spellbook.asset
@@ -53,12 +53,41 @@ MonoBehaviour:
 
     3.
     Run command ''incant <target name> borealeo''. The hex is now cast.'
-  - "to make someone stub one of their toes:\n\nif the moon is Gibbous (waxing or
-    waning, no difference):\n- 'set aura nox'\n- 'incant subgicatrix <target name>'\n\nif
-    the moon is Crescent:\n- 'set target <target name>'\n- 'incant subgicatrix'\n\nif
-    the moon is Full:\n- 'set aura lux'\n- 'incant subgicatrix <target name backward>'\n
-    - make sure to reverse the name!\n\nif the moon is in any other phase:\n- 'incant
-    <target name> subgicatrix'"
+  - 'to make someone stub one of their toes:
+
+
+    if the moon is Gibbous (waxing
+    or waning, no difference):
+
+    - ''set aura nox''
+
+    - ''incant subgicatrix
+    <target name>''
+
+
+    if the moon is Crescent:
+
+    - ''set target <target name>''
+
+    -
+    ''incant subgicatrix''
+
+
+    if the moon is Full:
+
+    - ''set aura lux''
+
+    -
+    ''incant subgicatrix <target name backward>''
+
+    - make sure to reverse the
+    name!
+
+
+    if the moon is in any other phase:
+
+    - ''incant <target name>
+    subgicatrix'''
   - "A Curse for moderate Ill Fortune, with a common Duration of one Week.\n\n* Commune
     with the aggrieved Ancestors of the Accursed, using the command 'seance <target
     name>'.\n   * Take note of their most Frequent Chant.\n* Break a Mirror.\n* Run

diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
@@ -319,7 +319,6 @@ Texture2D:
   m_MipCount: 1
   m_IsReadable: 1
   m_IgnoreMasterTextureLimit: 0
-  m_IsPreProcessed: 0
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: 0
   m_AlphaIsTransparency: 0

diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset
@@ -7800,7 +7800,6 @@ Texture2D:
   m_MipCount: 1
   m_IsReadable: 0
   m_IgnoreMasterTextureLimit: 0
-  m_IsPreProcessed: 0
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: -92
   m_AlphaIsTransparency: 0

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -70,5 +70,11 @@
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
+  },
+  "lock": {
+    "com.crass.spellbook-unity": {
+      "revision": "HEAD",
+      "hash": "aa3948ad01df8ee8ed83712d5f5d9c1cf04663cc"
+    }
   }
 }
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -111,13 +111,10 @@ PlayerSettings:
   switchNVNShaderPoolsGranularity: 33554432
   switchNVNDefaultPoolsGranularity: 16777216
   switchNVNOtherPoolsGranularity: 16777216
-  switchNVNMaxPublicTextureIDCount: 0
-  switchNVNMaxPublicSamplerIDCount: 0
   stadiaPresentMode: 0
   stadiaTargetFramerate: 0
   vulkanNumSwapchainBuffers: 3
   vulkanEnableSetSRGBWrite: 0
-  vulkanEnableLateAcquireNextImage: 0
   m_SupportedAspectRatios:
     4:3: 1
     5:4: 1
@@ -481,7 +478,6 @@ PlayerSettings:
   ps4ShareFilePath: 
   ps4ShareOverlayImagePath: 
   ps4PrivacyGuardImagePath: 
-  ps4ExtraSceSysFile: 
   ps4NPtitleDatPath: 
   ps4RemotePlayKeyAssignment: -1
   ps4RemotePlayKeyMappingDir: 
@@ -524,8 +520,6 @@ PlayerSettings:
   ps4disableAutoHideSplash: 0
   ps4videoRecordingFeaturesUsed: 0
   ps4contentSearchFeaturesUsed: 0
-  ps4CompatibilityPS5: 0
-  ps4GPU800MHz: 1
   ps4attribEyeToEyeDistanceSettingVR: 0
   ps4IncludedModules: []
   ps4attribVROutputEnabled: 0

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.4.12f1
-m_EditorVersionWithRevision: 2019.4.12f1 (225e826a680e)
+m_EditorVersion: 2019.3.15f1
+m_EditorVersionWithRevision: 2019.3.15f1 (59ff3e03856d)