diff --git a/Assets/Scenes/sceneRaffael.unity b/Assets/Scenes/sceneRaffael.unity index 3b6bc9031577ea1b0b7a2f476e6f699454cb8020..bd315339f884621528768e61bc922e2fce2ea280 100644 --- a/Assets/Scenes/sceneRaffael.unity +++ b/Assets/Scenes/sceneRaffael.unity @@ -2424,7 +2424,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1206561506436264875, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3} propertyPath: stage - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1206561506436264875, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3} propertyPath: player diff --git a/Documents/Installation.md b/Documents/Installation.md index cfca712fe91469f22c9920fcfdb494f17d2ebfae..22d5f79ede892e067bda9f2d8e2be65579a3376f 100644 --- a/Documents/Installation.md +++ b/Documents/Installation.md @@ -8,7 +8,7 @@ ## Installation - 1. Télécharger l'archive disponible [ici](<!--Mettre lien ici -->) + 1. Télécharger l'archive disponible pour [Windows](https://drive.google.com/file/d/1TFxojg_OYYUXMSM1d3-EsqE2AWvMthep/view?usp=sharing) ou pour [Mac/Linux](https://drive.google.com/file/d/1TFxojg_OYYUXMSM1d3-EsqE2AWvMthep/view?usp=sharing) 2. Décompresser l'archive 3. Lancer l'executable `CityEscape.exe` diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 008a07f0669b4c2a0a710cb64d116e88c6655a0f..984a004ecf3c455324ddc86f87db803a48a2a12a 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,25 +5,25 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 - path: Assets/Scenes/Niveau1.unity - guid: 2cda990e2423bbf4892e6590ba056729 + - enabled: 0 + path: + guid: 00000000000000000000000000000000 - enabled: 1 path: Assets/Scenes/Menu.unity guid: 458707c07ba6b4b4297fc1de6ac38622 - - enabled: 1 - path: Assets/Scenes/Niveau1.unity - guid: 2cda990e2423bbf4892e6590ba056729 + - enabled: 0 + path: + guid: 00000000000000000000000000000000 - enabled: 1 path: Assets/Scenes/sceneRaffael.unity guid: bdf7662389bf8487c9a7909d08af8c3e - - enabled: 1 + - enabled: 0 path: Assets/Scenes/Valentin.unity guid: 8c9ceab1c999ea749aa0fe2b0c87b0bf - - enabled: 1 - path: Assets/Scenes/Niveau2.unity - guid: 4ae30febc4f91474fa9164b85521aaf5 - - enabled: 1 + - enabled: 0 + path: + guid: 00000000000000000000000000000000 + - enabled: 0 path: Assets/Scenes/sceneTanguy.unity guid: b45818539c00d614f8e62d9be90b08c7 m_configObjects: {} diff --git a/build/LinuxPlayer_s.debug b/build/LinuxPlayer_s.debug old mode 100755 new mode 100644 diff --git a/build/UnityPlayer.so b/build/UnityPlayer.so old mode 100755 new mode 100644 diff --git a/build/UnityPlayer_s.debug b/build/UnityPlayer_s.debug deleted file mode 100755 index 4ced6163b6546f416691b582ef124d5d6134e989..0000000000000000000000000000000000000000 Binary files a/build/UnityPlayer_s.debug and /dev/null differ diff --git a/build/launch.x86_64 b/build/launch.x86_64 old mode 100755 new mode 100644 diff --git a/build/launch_Data/MonoBleedingEdge/etc/mono/2.0/Browsers/Compat.browser b/build/launch_Data/MonoBleedingEdge/etc/mono/2.0/Browsers/Compat.browser index 9950c71c5f02749b7fb17bbc13c07323c93339ae..dcedf7f7333565268eb99488767618235e7d24f1 100644 --- a/build/launch_Data/MonoBleedingEdge/etc/mono/2.0/Browsers/Compat.browser +++ b/build/launch_Data/MonoBleedingEdge/etc/mono/2.0/Browsers/Compat.browser @@ -1,5 +1,5 @@ -<!-- - This file defines some of the browsers that Microsoft's implementation provides in +<!-- + This file defines some of the browsers that Microsoft's implementation provides in <windir>\Microsoft.NET\Framework\<ver>\CONFIG\Browsers\*.browser It is not derived from any file distributed with Microsoft's implementation. Since @@ -7,36 +7,36 @@ browser capabilities. Then, if and only if the application contains App_Browser/*.browser files and we are using .NET 2.0 or higher, we supplement the capabilities with the information in those files and the files in this directory. The primary goal of this file - is provide browser definitions that might be referenced in App_Browser/*.browser files. ---> -<browsers> - <defaultBrowser id="Default"> + is provide browser definitions that might be referenced in App_Browser/*.browser files. +--> +<browsers> + <defaultBrowser id="Default"> </defaultBrowser> <browser id="Default"> <identification> <userAgent match="." /> - </identification> - </browser> + </identification> + </browser> <browser id="IE6to9" parentID="Default"> <identification> <capability name="majorver" match="^[6-9]" /> <capability name="browser" match="^(IE|AOL)$" /> - </identification> - </browser> - <browser id="Opera8to9" parentID="Default"> + </identification> + </browser> + <browser id="Opera8to9" parentID="Default"> <identification> <capability name="majorver" match="^[8-9]" /> <capability name="browser" match="^Opera$" /> - </identification> - </browser> - <browser id="Safari" parentID="Default"> + </identification> + </browser> + <browser id="Safari" parentID="Default"> <identification> <capability name="browser" match="^Safari$" /> - </identification> - </browser> - <browser id="Mozilla" parentID="Default"> + </identification> + </browser> + <browser id="Mozilla" parentID="Default"> <identification> <capability name="browser" match="^Mozilla" /> - </identification> - </browser> + </identification> + </browser> </browsers> \ No newline at end of file diff --git a/build/launch_Data/MonoBleedingEdge/etc/mono/4.0/Browsers/Compat.browser b/build/launch_Data/MonoBleedingEdge/etc/mono/4.0/Browsers/Compat.browser index 9950c71c5f02749b7fb17bbc13c07323c93339ae..dcedf7f7333565268eb99488767618235e7d24f1 100644 --- a/build/launch_Data/MonoBleedingEdge/etc/mono/4.0/Browsers/Compat.browser +++ b/build/launch_Data/MonoBleedingEdge/etc/mono/4.0/Browsers/Compat.browser @@ -1,5 +1,5 @@ -<!-- - This file defines some of the browsers that Microsoft's implementation provides in +<!-- + This file defines some of the browsers that Microsoft's implementation provides in <windir>\Microsoft.NET\Framework\<ver>\CONFIG\Browsers\*.browser It is not derived from any file distributed with Microsoft's implementation. Since @@ -7,36 +7,36 @@ browser capabilities. Then, if and only if the application contains App_Browser/*.browser files and we are using .NET 2.0 or higher, we supplement the capabilities with the information in those files and the files in this directory. The primary goal of this file - is provide browser definitions that might be referenced in App_Browser/*.browser files. ---> -<browsers> - <defaultBrowser id="Default"> + is provide browser definitions that might be referenced in App_Browser/*.browser files. +--> +<browsers> + <defaultBrowser id="Default"> </defaultBrowser> <browser id="Default"> <identification> <userAgent match="." /> - </identification> - </browser> + </identification> + </browser> <browser id="IE6to9" parentID="Default"> <identification> <capability name="majorver" match="^[6-9]" /> <capability name="browser" match="^(IE|AOL)$" /> - </identification> - </browser> - <browser id="Opera8to9" parentID="Default"> + </identification> + </browser> + <browser id="Opera8to9" parentID="Default"> <identification> <capability name="majorver" match="^[8-9]" /> <capability name="browser" match="^Opera$" /> - </identification> - </browser> - <browser id="Safari" parentID="Default"> + </identification> + </browser> + <browser id="Safari" parentID="Default"> <identification> <capability name="browser" match="^Safari$" /> - </identification> - </browser> - <browser id="Mozilla" parentID="Default"> + </identification> + </browser> + <browser id="Mozilla" parentID="Default"> <identification> <capability name="browser" match="^Mozilla" /> - </identification> - </browser> + </identification> + </browser> </browsers> \ No newline at end of file diff --git a/build/launch_Data/MonoBleedingEdge/etc/mono/4.5/Browsers/Compat.browser b/build/launch_Data/MonoBleedingEdge/etc/mono/4.5/Browsers/Compat.browser index 9950c71c5f02749b7fb17bbc13c07323c93339ae..dcedf7f7333565268eb99488767618235e7d24f1 100644 --- a/build/launch_Data/MonoBleedingEdge/etc/mono/4.5/Browsers/Compat.browser +++ b/build/launch_Data/MonoBleedingEdge/etc/mono/4.5/Browsers/Compat.browser @@ -1,5 +1,5 @@ -<!-- - This file defines some of the browsers that Microsoft's implementation provides in +<!-- + This file defines some of the browsers that Microsoft's implementation provides in <windir>\Microsoft.NET\Framework\<ver>\CONFIG\Browsers\*.browser It is not derived from any file distributed with Microsoft's implementation. Since @@ -7,36 +7,36 @@ browser capabilities. Then, if and only if the application contains App_Browser/*.browser files and we are using .NET 2.0 or higher, we supplement the capabilities with the information in those files and the files in this directory. The primary goal of this file - is provide browser definitions that might be referenced in App_Browser/*.browser files. ---> -<browsers> - <defaultBrowser id="Default"> + is provide browser definitions that might be referenced in App_Browser/*.browser files. +--> +<browsers> + <defaultBrowser id="Default"> </defaultBrowser> <browser id="Default"> <identification> <userAgent match="." /> - </identification> - </browser> + </identification> + </browser> <browser id="IE6to9" parentID="Default"> <identification> <capability name="majorver" match="^[6-9]" /> <capability name="browser" match="^(IE|AOL)$" /> - </identification> - </browser> - <browser id="Opera8to9" parentID="Default"> + </identification> + </browser> + <browser id="Opera8to9" parentID="Default"> <identification> <capability name="majorver" match="^[8-9]" /> <capability name="browser" match="^Opera$" /> - </identification> - </browser> - <browser id="Safari" parentID="Default"> + </identification> + </browser> + <browser id="Safari" parentID="Default"> <identification> <capability name="browser" match="^Safari$" /> - </identification> - </browser> - <browser id="Mozilla" parentID="Default"> + </identification> + </browser> + <browser id="Mozilla" parentID="Default"> <identification> <capability name="browser" match="^Mozilla" /> - </identification> - </browser> + </identification> + </browser> </browsers> \ No newline at end of file diff --git a/build/launch_Data/MonoBleedingEdge/x86_64/libMonoPosixHelper.so b/build/launch_Data/MonoBleedingEdge/x86_64/libMonoPosixHelper.so old mode 100755 new mode 100644 diff --git a/build/launch_Data/MonoBleedingEdge/x86_64/libmonobdwgc-2.0.so b/build/launch_Data/MonoBleedingEdge/x86_64/libmonobdwgc-2.0.so old mode 100755 new mode 100644