updated unity version

This commit is contained in:
Chris Midkiff 2020-06-22 11:22:22 -04:00
parent 65dccd3054
commit a14df2691c
4 changed files with 53 additions and 29 deletions

21
Packages/manifest.json Normal file → Executable file
View File

@ -1,12 +1,21 @@
{ {
"dependencies": { "dependencies": {
"com.unity.ads": "2.0.8", "com.unity.2d.sprite": "1.0.0",
"com.unity.analytics": "3.2.3", "com.unity.2d.tilemap": "1.0.0",
"com.unity.collab-proxy": "1.2.15", "com.unity.ads": "3.4.5",
"com.unity.package-manager-ui": "2.0.8", "com.unity.analytics": "3.3.5",
"com.unity.purchasing": "2.0.3", "com.unity.collab-proxy": "1.2.16",
"com.unity.textmeshpro": "1.4.1", "com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.2.1",
"com.unity.multiplayer-hlapi": "1.0.6",
"com.unity.purchasing": "2.0.6",
"com.unity.test-framework": "1.1.14",
"com.unity.textmeshpro": "2.0.1",
"com.unity.timeline": "1.2.6",
"com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.4",
"com.unity.modules.ai": "1.0.0", "com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0", "com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.audio": "1.0.0", "com.unity.modules.audio": "1.0.0",

20
ProjectSettings/EditorSettings.asset Normal file → Executable file
View File

@ -3,19 +3,33 @@
--- !u!159 &1 --- !u!159 &1
EditorSettings: EditorSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 7 serializedVersion: 9
m_ExternalVersionControlSupport: Visible Meta Files m_ExternalVersionControlSupport: Visible Meta Files
m_SerializationMode: 2 m_SerializationMode: 2
m_LineEndingsForNewScripts: 2 m_LineEndingsForNewScripts: 2
m_DefaultBehaviorMode: 0 m_DefaultBehaviorMode: 0
m_PrefabRegularEnvironment: {fileID: 0}
m_PrefabUIEnvironment: {fileID: 0}
m_SpritePackerMode: 0 m_SpritePackerMode: 0
m_SpritePackerPaddingPower: 1 m_SpritePackerPaddingPower: 1
m_EtcTextureCompressorBehavior: 1 m_EtcTextureCompressorBehavior: 1
m_EtcTextureFastCompressor: 1 m_EtcTextureFastCompressor: 1
m_EtcTextureNormalCompressor: 2 m_EtcTextureNormalCompressor: 2
m_EtcTextureBestCompressor: 4 m_EtcTextureBestCompressor: 4
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmref
m_ProjectGenerationRootNamespace: m_ProjectGenerationRootNamespace:
m_UserGeneratedProjectSuffix:
m_CollabEditorSettings: m_CollabEditorSettings:
inProgressEnabled: 1 inProgressEnabled: 1
m_EnableTextureStreamingInEditMode: 1
m_EnableTextureStreamingInPlayMode: 1
m_AsyncShaderCompilation: 1
m_EnterPlayModeOptionsEnabled: 0
m_EnterPlayModeOptions: 3
m_ShowLightmapResolutionOverlay: 1
m_UseLegacyProbeSampleCount: 1
m_AssetPipelineMode: 1
m_CacheServerMode: 0
m_CacheServerEndpoint:
m_CacheServerNamespacePrefix: default
m_CacheServerEnableDownload: 1
m_CacheServerEnableUpload: 1

3
ProjectSettings/ProjectVersion.txt Normal file → Executable file
View File

@ -1 +1,2 @@
m_EditorVersion: 2018.4.22f1 m_EditorVersion: 2019.4.1f1
m_EditorVersionWithRevision: 2019.4.1f1 (e6c045e14e4e)

2
README.txt Normal file → Executable file
View File

@ -13,7 +13,7 @@ As you may or may not have noticed there are two different collision systems in
Instructions: Instructions:
You will need the following things: You will need the following things:
Two to three computers (if doing Oculus on of these must be Windows.) Two to three computers (if doing Oculus on of these must be Windows.)
The android development tools installed. The android development tools installed. <https://www.xda-developers.com/quickly-install-adb/>
A working python3 install with pip. A working python3 install with pip.
1. Run the trialGen util script to generate your trials 1. Run the trialGen util script to generate your trials