You need help for something ? Go to https://xr4dev.pages.xr4all.eu

Commit 66025e0c authored by bokisjov@gmail.com's avatar bokisjov@gmail.com

Merge branch 'Release_1.7' into 'master'

Release 1.7

See merge request !367
parents 74fb5b96 1a486031
Pipeline #3319 passed with stages
in 33 minutes and 20 seconds

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -93,4 +93,5 @@ Assets/**/obj/**
# Sketchfab
/Assets/MirageXR/Common/Resources/Credentials
/Assets/MirageXR/Common/Resources/Credentials.meta
/.vsconfig
\ No newline at end of file
/.vsconfig
/Assets/Common/obj.meta
......@@ -6,10 +6,10 @@ stages:
variables:
BUILD_NAME: MirageXR
UNITY_VERSION: 2019.4.5f1
UNITY_VERSION: 2020.3.13f1
UNITY_ACTIVATION_FILE: ./Unity_v$UNITY_VERSION.alf
IMAGE: unityci/editor # https://hub.docker.com/r/unityci/editor
IMAGE_VERSION: "0.9" # https://hub.docker.com/r/unityci/editor
IMAGE_VERSION: "0.13.0" # https://hub.docker.com/r/unityci/editor
UNITY_DIR: $CI_PROJECT_DIR # this needs to be an absolute path. Defaults to the root of your tree.
image: $IMAGE:$UNITY_VERSION-base-$IMAGE_VERSION
......
fileFormatVersion: 2
guid: 79ccb14843b4c2749be9a1b82a3b9093
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -23,6 +23,7 @@ TextureImporter:
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
......@@ -31,12 +32,12 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: -1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
......@@ -54,9 +55,12 @@ TextureImporter:
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 1
platformSettings:
- serializedVersion: 3
......
......@@ -26,6 +26,7 @@ TextureImporter:
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
......@@ -34,12 +35,12 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: -1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
......@@ -57,9 +58,12 @@ TextureImporter:
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 1
platformSettings:
- serializedVersion: 3
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c46f07b5ed07e4e92aa78254188d3d10, type: 3}
m_Name: InputSystem.inputsettings
m_EditorClassIdentifier:
m_SupportedDevices: []
m_UpdateMode: 1
m_CompensateForScreenOrientation: 1
m_FilterNoiseOnCurrent: 0
m_DefaultDeadzoneMin: 0.125
m_DefaultDeadzoneMax: 0.925
m_DefaultButtonPressPoint: 0.5
m_DefaultTapTime: 0.2
m_DefaultSlowTapTime: 0.5
m_DefaultHoldTime: 0.4
m_TapRadius: 5
m_MultiTapDelayTime: 0.75
fileFormatVersion: 2
guid: 5af8949b7209364499abc8979cef0d21
NativeFormatImporter: