Skip to content

Commit

Permalink
Updating packages & config for 2019.4 LTS
Browse files Browse the repository at this point in the history
  • Loading branch information
chrislarkee committed Sep 9, 2020
1 parent 665caf1 commit 6eaf81c
Show file tree
Hide file tree
Showing 42 changed files with 243 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#

#Asset store packages
/Assets/Demigiant/
/Assets/Plugins/Demigiant/
/Assets/Oculus/

/[Ll]ibrary/
Expand Down
Binary file modified Assets/Materials/01.mat
Binary file not shown.
Binary file modified Assets/Materials/02.mat
Binary file not shown.
Binary file modified Assets/Materials/03.mat
Binary file not shown.
Binary file modified Assets/Materials/04.mat
Binary file not shown.
Binary file modified Assets/Materials/05.mat
Binary file not shown.
Binary file modified Assets/Materials/06.mat
Binary file not shown.
Binary file added Assets/Materials/Floor.mat
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Materials/Floor.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/Oculus.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 15 additions & 20 deletions Assets/Plugins/Android/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:installLocation="auto">
<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" /><!-- Request the headset DoF mode -->
<application
android:allowBackup="false">
<activity
android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
android:configChanges="locale|fontScale|keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
android:launchMode="singleTask"
android:name="com.unity3d.player.UnityPlayerActivity"
android:excludeFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.INFO"/>
</intent-filter>
</activity>
<meta-data android:name="unityplayer.SkipPermissionsDialog" android:value="false" />
</application>
</manifest>
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
<application android:label="@string/app_name" android:icon="@mipmap/app_icon" android:allowBackup="false">
<activity android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" android:configChanges="locale|fontScale|keyboard|keyboardHidden|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode" android:launchMode="singleTask" android:name="com.unity3d.player.UnityPlayerActivity" android:excludeFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.INFO" />
</intent-filter>
<meta-data android:name="com.oculus.vr.focusaware" android:value="true" />
</activity>
<meta-data android:name="unityplayer.SkipPermissionsDialog" android:value="false" />
<meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only" />
</application>
<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="true" />
</manifest>
2 changes: 1 addition & 1 deletion Assets/Demigiant.meta → Assets/Plugins/Demigiant.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Resources/DOTweenSettings.asset
Binary file not shown.
Binary file added Assets/Resources/ONSPSettings.asset
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Resources/ONSPSettings.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Resources/OVRBuildConfig.asset
Binary file not shown.
Binary file added Assets/Resources/OVRPlatformToolSettings.asset
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Resources/OVRPlatformToolSettings.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Scenes/Brain_Choi v3.unity
Binary file not shown.
2 changes: 1 addition & 1 deletion Assets/Scripts/newLaser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void Update() {
void doTrigger() {
pointTriggerReady = false;
if (hit.transform != null){
Debug.Log("Clicked on " + hit.transform.name);
//Debug.Log("Clicked on " + hit.transform.name);
sound.clip = sounds[1];
sound.Play();
hit.transform.SendMessage("clickOn", controller, SendMessageOptions.DontRequireReceiver); //
Expand Down
Binary file not shown.
128 changes: 128 additions & 0 deletions Assets/Textures/TexturesCom_Metal_BronzeBare_1K_normal.tif.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/Scenes/Brain_Choi v3.meta → Assets/XR.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/XR/Loaders.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/XR/Loaders/Oculus Loader.asset
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/XR/Loaders/Oculus Loader.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/XR/Settings.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/XR/Settings/Oculus Settings.asset
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/XR/Settings/Oculus Settings.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/XR/XRGeneralSettings.asset
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/XR/XRGeneralSettings.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
{
"dependencies": {
"com.unity.package-manager-ui": "2.0.7",
"com.unity.xr.oculus.android": "1.38.1",
"com.unity.xr.oculus.standalone": "1.38.1",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.vscode": "1.2.1",
"com.unity.multiplayer-hlapi": "1.0.6",
"com.unity.test-framework": "1.1.14",
"com.unity.timeline": "1.2.6",
"com.unity.ugui": "1.0.0",
"com.unity.xr.management": "3.2.13",
"com.unity.xr.oculus": "1.3.4",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.audio": "1.0.0",
Expand Down
Binary file modified ProjectSettings/EditorBuildSettings.asset
Binary file not shown.
Binary file modified ProjectSettings/EditorSettings.asset
Binary file not shown.
Binary file modified ProjectSettings/GraphicsSettings.asset
Binary file not shown.
Binary file modified ProjectSettings/ProjectSettings.asset
Binary file not shown.
3 changes: 2 additions & 1 deletion ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
m_EditorVersion: 2018.4.0f1
m_EditorVersion: 2019.4.0f1
m_EditorVersionWithRevision: 2019.4.0f1 (0af376155913)
Binary file modified ProjectSettings/UnityConnectSettings.asset
Binary file not shown.
Binary file modified ProjectSettings/VFXManager.asset
Binary file not shown.
5 changes: 5 additions & 0 deletions ProjectSettings/XRPackageSettings.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"m_Settings": [
"RemoveLegacyInputHelpersForReload"
]
}
10 changes: 10 additions & 0 deletions ProjectSettings/XRSettings.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"m_SettingKeys": [
"VR Device Disabled",
"VR Device User Alert"
],
"m_SettingValues": [
"True",
"True"
]
}
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ Sundsten, J. W. (1994). Digital anatomist: Interactive brain atlas.
Nolte, J., & Sundsten, J. W. (2001). The human brain : an introduction to its functional anatomy. Mosby.

## Development Requirements:
* [Unity](https://unity.com/) version [2018.4.0](https://unity3d.com/unity/qa/lts-releases?version=2018.4&page=2)
* [Blender](https://www.blender.org/) version [2.80](https://download.blender.org/release/Blender2.80/)
* [Unity](https://unity.com/) version [2019.4.0](https://unity3d.com/unity/qa/lts-releases?version=2018.4&page=2)
* [Blender](https://www.blender.org/) version [2.82](https://download.blender.org/release/Blender2.80/)

## Additional Unity Packages
* A license to [Dotween Pro](https://assetstore.unity.com/packages/tools/visual-scripting/dotween-pro-32416) is required to run this without errors. Perhaps Dotween free will work, but I haven't tested it.
* This version is built around the [Oculus Integration](https://assetstore.unity.com/packages/tools/integration/oculus-integration-82022) package, and is designed primarily for the Quest. It also runs very well on the Rift and Rift S, and runs partially on the Gear VR & Oculus Go.

* This version is built around the [Oculus Integration](https://assetstore.unity.com/packages/tools/integration/oculus-integration-82022) package, and is designed primarily for the Quest. It also runs very well on the Rift and Rift S, and runs partially on the Gear VR & Oculus Go.

0 comments on commit 6eaf81c

Please sign in to comment.