heinenrafael
/
Absinthe_Escape
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: heinenrafael:9a772cd6e8188fe430bed4cb4fd28028d845e374
Branches Tags
heinenrafael:master
..
compare: heinenrafael:34c47d9f1a0f6946a12275d63455f283445b2d80
Branches Tags
heinenrafael:master

No commits in common. "9a772cd6e8188fe430bed4cb4fd28028d845e374" and "34c47d9f1a0f6946a12275d63455f283445b2d80" have entirely different histories.
9a772cd6e8 ... 34c47d9f1a

5 changed files with 76 additions and 75 deletions
Show Stats Expand all files Collapse all files

BIN
Assets/.DS_Store vendored
View File

Binary file not shown.

29
Assets/Scenes/Absinte_Escape.unity
View File

@ -271,10 +271,6 @@ MonoBehaviour:
m_Flags: 0
m_Flags: 0
m_Reference: {fileID: 0}
m_CurrentPosition: {x: 0, y: 0, z: 0}
m_CurrentRotation: {x: 0, y: 0, z: 0, w: 1}
m_RotationBound: 0
m_PositionBound: 0
m_PositionAction:
m_Name:
m_Type: 0
@ -365,32 +361,7 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
<<<<<<< HEAD
--- !u!114 &1158284026
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1158284025}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e0cb9aa70a22847b5925ee5f067c10a9, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Camera: {fileID: 980968349}
<TrackablesParent>k__BackingField: {fileID: 0}
m_OriginBaseGameObject: {fileID: 1158284025}
m_CameraFloorOffsetObject: {fileID: 383304788}
m_RequestedTrackingOriginMode: 0
m_CameraYOffset: 1.1176
<CurrentTrackingOriginMode>k__BackingField: 0
m_CameraInitialized: 0
m_CameraInitializing: 0
--- !u!4 &1158284027
=======
--- !u!4 &668370361
>>>>>>> 34c47d9f1a0f6946a12275d63455f283445b2d80
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}

46
Logs/Packages-Update.log
View File

@ -64,49 +64,3 @@ The following packages were updated:
com.unity.collab-proxy from version 1.15.12 to 1.15.13
com.unity.ide.vscode from version 1.2.4 to 1.2.5
com.unity.test-framework from version 1.1.29 to 1.1.31
=== Tue Mar 29 16:30:23 2022
Packages were changed.
Update Mode: resetToDefaultDependencies
The following packages were added:
com.unity.collab-proxy@1.15.13
com.unity.ide.rider@2.0.7
com.unity.ide.visualstudio@2.0.14
com.unity.ide.vscode@1.2.5
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
com.unity.modules.cloth@1.0.0
com.unity.modules.director@1.0.0
com.unity.modules.imageconversion@1.0.0
com.unity.modules.imgui@1.0.0
com.unity.modules.jsonserialize@1.0.0
com.unity.modules.particlesystem@1.0.0
com.unity.modules.physics@1.0.0
com.unity.modules.physics2d@1.0.0
com.unity.modules.screencapture@1.0.0
com.unity.modules.terrain@1.0.0
com.unity.modules.terrainphysics@1.0.0
com.unity.modules.tilemap@1.0.0
com.unity.modules.ui@1.0.0
com.unity.modules.uielements@1.0.0
com.unity.modules.umbra@1.0.0
com.unity.modules.unityanalytics@1.0.0
com.unity.modules.unitywebrequest@1.0.0
com.unity.modules.unitywebrequestassetbundle@1.0.0
com.unity.modules.unitywebrequestaudio@1.0.0
com.unity.modules.unitywebrequesttexture@1.0.0
com.unity.modules.unitywebrequestwww@1.0.0
com.unity.modules.vehicles@1.0.0
com.unity.modules.video@1.0.0
com.unity.modules.vr@1.0.0
com.unity.modules.wind@1.0.0
com.unity.modules.xr@1.0.0
com.unity.test-framework@1.1.31
com.unity.textmeshpro@3.0.6
com.unity.timeline@1.4.8
com.unity.ugui@1.0.0

3
Packages/manifest.json
View File

@ -8,6 +8,9 @@
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.4.8",
"com.unity.ugui": "1.0.0",
"com.unity.xr.interaction.toolkit": "2.0.1",
"com.unity.xr.management": "4.2.1",
"com.unity.xr.oculus": "1.11.2",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",

73
Packages/packages-lock.json
View File

@ -41,6 +41,15 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.inputsystem": {
"version": "1.2.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.uielements": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.0.1",
"depth": 1,
@ -50,6 +59,13 @@
},
"url": "https://packages.unity.com"
},
"com.unity.subsystemregistration": {
"version": "1.0.6",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.31",
"depth": 0,
@ -91,6 +107,63 @@
"com.unity.modules.imgui": "1.0.0"
}
},
"com.unity.xr.core-utils": {
"version": "2.0.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.xr": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.interaction.toolkit": {
"version": "2.0.1",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.inputsystem": "1.2.0",
"com.unity.ugui": "1.0.0",
"com.unity.xr.core-utils": "2.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.8",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.physics": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.legacyinputhelpers": {
"version": "2.1.9",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.management": {
"version": "4.2.1",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.subsystems": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.7",
"com.unity.subsystemregistration": "1.0.6"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.oculus": {
"version": "1.11.2",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.xr.management": "4.2.0",
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.modules.ai": {
"version": "1.0.0",
"depth": 0,