merge de l'enfer

.gitignore

@@ -69,6 +69,10 @@ crashlytics-build.properties
 
 # Temporary auto-generated Android Assets
 /[Aa]ssets/[Ss]treamingAssets/aa.meta
+<<<<<<< HEAD
 /[Aa]ssets/[Ss]treamingAssets/aa/*.vs/
 .vsconfig
 Temp/
+=======
+/[Aa]ssets/[Ss]treamingAssets/aa/*
+>>>>>>> 038cd4de6ed2a5b213dc0ae6fc370afb63a28826

Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity

@@ -20,13 +20,21 @@ RenderSettings:
   m_FogDensity: 0.01
   m_LinearFogStart: 0
   m_LinearFogEnd: 300
+<<<<<<< HEAD:Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity
   m_AmbientSkyColor: {r: 0, g: 0, b: 0, a: 1}
+=======
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+>>>>>>> 038cd4de6ed2a5b213dc0ae6fc370afb63a28826:Assets/Scenes/SampleScene.unity
   m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
   m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
   m_AmbientIntensity: 1
   m_AmbientMode: 0
   m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+<<<<<<< HEAD:Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity
   m_SkyboxMaterial: {fileID: 0}
+=======
+  m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
+>>>>>>> 038cd4de6ed2a5b213dc0ae6fc370afb63a28826:Assets/Scenes/SampleScene.unity
   m_HaloStrength: 0.5
   m_FlareStrength: 1
   m_FlareFadeSpeed: 3
@@ -37,21 +45,34 @@ RenderSettings:
   m_ReflectionBounces: 1
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
+<<<<<<< HEAD:Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity
   m_Sun: {fileID: 0}
+=======
+  m_Sun: {fileID: 705507994}
+>>>>>>> 038cd4de6ed2a5b213dc0ae6fc370afb63a28826:Assets/Scenes/SampleScene.unity
   m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
+<<<<<<< HEAD:Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity
   serializedVersion: 11
   m_GIWorkflowMode: 0
+=======
+  serializedVersion: 12
+  m_GIWorkflowMode: 1
+>>>>>>> 038cd4de6ed2a5b213dc0ae6fc370afb63a28826:Assets/Scenes/SampleScene.unity
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
     m_IndirectOutputScale: 1
     m_AlbedoBoost: 1
     m_EnvironmentLightingMode: 0
+<<<<<<< HEAD:Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity
     m_EnableBakedLightmaps: 0
+=======
+    m_EnableBakedLightmaps: 1
+>>>>>>> 038cd4de6ed2a5b213dc0ae6fc370afb63a28826:Assets/Scenes/SampleScene.unity
     m_EnableRealtimeLightmaps: 0
   m_LightmapEditorSettings:
     serializedVersion: 12
@@ -98,7 +119,11 @@ LightmapSettings:
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 0}
+<<<<<<< HEAD:Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity
   m_UseShadowmask: 1
+=======
+  m_LightingSettings: {fileID: 0}
+>>>>>>> 038cd4de6ed2a5b213dc0ae6fc370afb63a28826:Assets/Scenes/SampleScene.unity
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -121,6 +146,7 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+<<<<<<< HEAD:Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity
 --- !u!1 &639890310
 GameObject:
   m_ObjectHideFlags: 0
@@ -131,6 +157,84 @@ GameObject:
   m_Component:
   - component: {fileID: 639890313}
   - component: {fileID: 639890312}
+=======
+--- !u!1 &705507993
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 705507995}
+  - component: {fileID: 705507994}
+  m_Layer: 0
+  m_Name: Directional Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!108 &705507994
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 705507993}
+  m_Enabled: 1
+  serializedVersion: 8
+  m_Type: 1
+  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 2
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_Lightmapping: 1
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!4 &705507995
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 705507993}
+  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
+  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &963194225
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 963194228}
+  - component: {fileID: 963194227}
+  - component: {fileID: 963194226}
+>>>>>>> 038cd4de6ed2a5b213dc0ae6fc370afb63a28826:Assets/Scenes/SampleScene.unity
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -138,6 +242,7 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+<<<<<<< HEAD:Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity
 --- !u!20 &639890312
 Camera:
   m_ObjectHideFlags: 0
@@ -154,6 +259,29 @@ Camera:
   m_FOVAxisMode: 0
   m_SensorSize: {x: 36, y: 24}
   m_LensShift: {x: 0, y: 0}
+=======
+--- !u!81 &963194226
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 963194225}
+  m_Enabled: 1
+--- !u!20 &963194227
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 963194225}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_GateFitMode: 2
+>>>>>>> 038cd4de6ed2a5b213dc0ae6fc370afb63a28826:Assets/Scenes/SampleScene.unity
   m_FocalLength: 50
   m_NormalizedViewPortRect:
     serializedVersion: 2
@@ -163,7 +291,11 @@ Camera:
     height: 1
   near clip plane: 0.3
   far clip plane: 1000
+<<<<<<< HEAD:Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity
   field of view: 26.991467
+=======
+  field of view: 60
+>>>>>>> 038cd4de6ed2a5b213dc0ae6fc370afb63a28826:Assets/Scenes/SampleScene.unity
   orthographic: 0
   orthographic size: 5
   m_Depth: -1
@@ -181,6 +313,7 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
+<<<<<<< HEAD:Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity
 --- !u!4 &639890313
 Transform:
   m_ObjectHideFlags: 0
@@ -188,6 +321,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 639890310}
+=======
+--- !u!4 &963194228
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 963194225}
+>>>>>>> 038cd4de6ed2a5b213dc0ae6fc370afb63a28826:Assets/Scenes/SampleScene.unity
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 1, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -195,6 +336,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+<<<<<<< HEAD:Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity
 --- !u!1 &2008127829
 GameObject:
   m_ObjectHideFlags: 0
@@ -310,3 +452,5 @@ MonoBehaviour:
   showGUI: 1
   offsetX: 0
   offsetY: 0
+=======
+>>>>>>> 038cd4de6ed2a5b213dc0ae6fc370afb63a28826:Assets/Scenes/SampleScene.unity

Assets/test.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class NewBehaviourScript : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}