Skip to content

Commit 98ea57a

Browse files
AntoineSmetAntoineSmet
authored
Merge branch 'develop' into main
2 parents d27974d + 1d75297 commit 98ea57a

File tree

372 files changed

+100115
-83721
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

372 files changed

+100115
-83721
lines changed

‎README.md

+12-3
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,24 @@ Dans cette section, explorez trois applications distinctes qui font partie inté
2020
Installations
2121
-------
2222

23-
## MIC
23+
### MIC
2424

25+
Posséder la version d'Unity 2022.3.7f
2526

26-
## API-conference
2727

28+
### API-conference
2829

29-
## Conference-IA
30+
Simplement cloner le repository et créer un "appsettings.json" avec un attribut BlobStorage
3031

3132

33+
### Conference-IA
34+
35+
Pour installer les packages nécessaire pour React, TypeScript
36+
<!-- npm i -->
37+
38+
Pour installer les packages nécessaire pour le service Azure Speech
39+
<!-- npm install microsoft-cognitiveservices-speech-sdk -->
40+
3241

3342
Équipes
3443
-------

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/AnimationScripts/SitAnimator.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace MeshApp.Animations
1313
[UserCreatable(false)]
1414
public class SitAnimator : AnimationNode
1515
{
16-
private readonly float[] _baseLayerSpeeds = { 0,2F, };
16+
private readonly float[] _baseLayerSpeeds = { 0.2F, };
1717

1818
protected SitAnimator(in Guid ahandle, bool transfer)
1919
: base(ahandle, transfer)

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/bin/Debug/net6.0/MIC-Maquette.dll

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:c5f2190fc83b50fe8d5dfeb204bcd98718080058b863bb339649386d42621833
2+
oid sha256:f3d0555ae70ec6cf205a5426c1cf92adff0deb26b10481e9ca19279df700d93d
33
size 338432

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/bin/Debug/net6.0/MIC-Maquette.exe

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:b46595ece5b883f034e8e402b551a039a3d0bd9b8b1ad60788a5a14e48b2b653
2+
oid sha256:6e8eb669a3cc6657e6debff7e9e47923a851406d8f4da087328e6ae64f8dd1d5
33
size 149504

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/bin/Debug/net6.0/mesh.cloudscripting.manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"wasLastProvisionAppSuccessful": "True",
2121
"wasLastDeployAppSuccessful": null,
2222
"wasLastUploadBlobSuccessful": "True",
23-
"meshAppBuildId": "ba0fcfab-ba53-4f76-8374-efd0444138f7",
23+
"meshAppBuildId": "627c8de8-3c33-44e0-8928-634871e46027",
2424
"debugTimeoutSecs": 120,
2525
"provisionState": "Inactive"
2626
}

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/bin/Release/net6.0/MIC-Maquette.dll

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:3011931ccb3afcf40ac9ad3bbb40a574f8ec869f1a870e158fef8ef1b98a6681
2+
oid sha256:72622ed5212038d7b6df8a4499b82437db8c800ca2d03180995dde13ef651da2
33
size 332800

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/bin/Release/net6.0/MIC-Maquette.exe

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:b46595ece5b883f034e8e402b551a039a3d0bd9b8b1ad60788a5a14e48b2b653
2+
oid sha256:6e8eb669a3cc6657e6debff7e9e47923a851406d8f4da087328e6ae64f8dd1d5
33
size 149504

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/bin/Release/net6.0/mesh.cloudscripting.manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"wasLastProvisionAppSuccessful": "True",
2121
"wasLastDeployAppSuccessful": null,
2222
"wasLastUploadBlobSuccessful": "False",
23-
"meshAppBuildId": "ba0fcfab-ba53-4f76-8374-efd0444138f7",
23+
"meshAppBuildId": "627c8de8-3c33-44e0-8928-634871e46027",
2424
"debugTimeoutSecs": 120,
2525
"provisionState": "Inactive"
2626
}

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/bin/mic-maquette.zip

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:a16ade8164d8dd0626c71b7f2dec0038f27b7ecead497276b3fce36098d123a1
3-
size 87493745
2+
oid sha256:2fcb88748f21c2ed6c745a605a1b164caaee8162fe23767364a0e907ae3a23cb
3+
size 87493760

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/bin/publish/MIC-Maquette.dll

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:c5f2190fc83b50fe8d5dfeb204bcd98718080058b863bb339649386d42621833
2+
oid sha256:f3d0555ae70ec6cf205a5426c1cf92adff0deb26b10481e9ca19279df700d93d
33
size 338432

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/bin/publish/MIC-Maquette.exe

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:b46595ece5b883f034e8e402b551a039a3d0bd9b8b1ad60788a5a14e48b2b653
2+
oid sha256:6e8eb669a3cc6657e6debff7e9e47923a851406d8f4da087328e6ae64f8dd1d5
33
size 149504

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/bin/publish/mesh.cloudscripting.manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"wasLastProvisionAppSuccessful": "True",
2121
"wasLastDeployAppSuccessful": null,
2222
"wasLastUploadBlobSuccessful": "True",
23-
"meshAppBuildId": "ba0fcfab-ba53-4f76-8374-efd0444138f7",
23+
"meshAppBuildId": "627c8de8-3c33-44e0-8928-634871e46027",
2424
"debugTimeoutSecs": 120,
2525
"provisionState": "Inactive"
2626
}

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/mesh.cloudscripting.manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"wasLastProvisionAppSuccessful": "True",
2121
"wasLastDeployAppSuccessful": null,
2222
"wasLastUploadBlobSuccessful": "True",
23-
"meshAppBuildId": "ba0fcfab-ba53-4f76-8374-efd0444138f7",
23+
"meshAppBuildId": "627c8de8-3c33-44e0-8928-634871e46027",
2424
"debugTimeoutSecs": 120,
2525
"provisionState": "Inactive"
2626
}

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Debug/net6.0/MIC-Maquette.AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
[assembly: System.Reflection.AssemblyCompanyAttribute("MIC-Maquette")]
1414
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
1515
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
16-
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+46dce6f371e6084b18455d4b5267cee70d5ac0b6")]
16+
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+07499d57b618c43e29c944d11248c76fb99f05bb")]
1717
[assembly: System.Reflection.AssemblyProductAttribute("MIC-Maquette")]
1818
[assembly: System.Reflection.AssemblyTitleAttribute("MIC-Maquette")]
1919
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Debug/net6.0/MIC-Maquette.AssemblyInfoInputs.cache

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c0f3d32173b077458b0afbf04a06cfd43a9c71334b36627be7f65423128d2665
1+
80e64f9ecc8e6e00567eb30fbe820734ef25bf0ad6ad4d0780a310ad190c0b34

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Debug/net6.0/MIC-Maquette.dll

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:c5f2190fc83b50fe8d5dfeb204bcd98718080058b863bb339649386d42621833
2+
oid sha256:f3d0555ae70ec6cf205a5426c1cf92adff0deb26b10481e9ca19279df700d93d
33
size 338432

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Debug/net6.0/MIC-Maquette.sourcelink.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"documents":{"C:\\Users\\MissonOscar\\Desktop\\Mesh-Innovate-Connect\\*":"https://raw.githubusercontent.com/micbelgique/Mesh-Innovate-Connect/46dce6f371e6084b18455d4b5267cee70d5ac0b6/*"}}
1+
{"documents":{"C:\\Users\\MissonOscar\\Desktop\\Mesh-Innovate-Connect\\*":"https://raw.githubusercontent.com/micbelgique/Mesh-Innovate-Connect/07499d57b618c43e29c944d11248c76fb99f05bb/*"}}

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Debug/net6.0/apphost.exe

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:b46595ece5b883f034e8e402b551a039a3d0bd9b8b1ad60788a5a14e48b2b653
2+
oid sha256:6e8eb669a3cc6657e6debff7e9e47923a851406d8f4da087328e6ae64f8dd1d5
33
size 149504

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Debug/net6.0/ref/MIC-Maquette.dll

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f9f50cf4d14d8bad07541831251259bc676e519476529dbbe45d26f31d4c40d2
2+
oid sha256:a39b16eb800281427f597903e5f8f969d8a3266859a394374ca42878eece1775
33
size 32256

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Debug/net6.0/refint/MIC-Maquette.dll

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f9f50cf4d14d8bad07541831251259bc676e519476529dbbe45d26f31d4c40d2
2+
oid sha256:a39b16eb800281427f597903e5f8f969d8a3266859a394374ca42878eece1775
33
size 32256

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Release/net6.0/MIC-Maquette.AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
[assembly: System.Reflection.AssemblyCompanyAttribute("MIC-Maquette")]
1414
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
1515
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
16-
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+46dce6f371e6084b18455d4b5267cee70d5ac0b6")]
16+
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+07499d57b618c43e29c944d11248c76fb99f05bb")]
1717
[assembly: System.Reflection.AssemblyProductAttribute("MIC-Maquette")]
1818
[assembly: System.Reflection.AssemblyTitleAttribute("MIC-Maquette")]
1919
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Release/net6.0/MIC-Maquette.AssemblyInfoInputs.cache

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e803eeeff1edb8dc57e9443275842c4cd44194bc19da19551e9f440b763eb665
1+
1b6001d01a0670375fab2dc85f1d3976ed639e106fd0483265b6c7a1adc76904

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Release/net6.0/MIC-Maquette.dll

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:3011931ccb3afcf40ac9ad3bbb40a574f8ec869f1a870e158fef8ef1b98a6681
2+
oid sha256:72622ed5212038d7b6df8a4499b82437db8c800ca2d03180995dde13ef651da2
33
size 332800

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Release/net6.0/MIC-Maquette.sourcelink.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"documents":{"C:\\Users\\MissonOscar\\Desktop\\Mesh-Innovate-Connect\\*":"https://raw.githubusercontent.com/micbelgique/Mesh-Innovate-Connect/46dce6f371e6084b18455d4b5267cee70d5ac0b6/*"}}
1+
{"documents":{"C:\\Users\\MissonOscar\\Desktop\\Mesh-Innovate-Connect\\*":"https://raw.githubusercontent.com/micbelgique/Mesh-Innovate-Connect/07499d57b618c43e29c944d11248c76fb99f05bb/*"}}

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Release/net6.0/apphost.exe

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:b46595ece5b883f034e8e402b551a039a3d0bd9b8b1ad60788a5a14e48b2b653
2+
oid sha256:6e8eb669a3cc6657e6debff7e9e47923a851406d8f4da087328e6ae64f8dd1d5
33
size 149504

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Release/net6.0/ref/MIC-Maquette.dll

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f4b7326a4df3301811836a8669a88a6009f57fcdeab7fa6c78557f85ad76427f
2+
oid sha256:c0657c394df50920df851de9caaec5349f9bad59def262bebf6128abe45b08ec
33
size 32256

‎src/MIC/Assets/.MeshCloudScripting/MIC-Maquette/obj/Release/net6.0/refint/MIC-Maquette.dll

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f4b7326a4df3301811836a8669a88a6009f57fcdeab7fa6c78557f85ad76427f
2+
oid sha256:c0657c394df50920df851de9caaec5349f9bad59def262bebf6128abe45b08ec
33
size 32256

‎src/MIC/Assets/.MeshCloudScripting/appsettings.json

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"Logging": {
3+
"LogLevel": {
4+
"Default": "Information"
5+
},
6+
"Console": {
7+
"LogLevel": {
8+
"Default": "Error"
9+
},
10+
"FormatterName": "json"
11+
},
12+
"ApplicationInsights": {
13+
"LogLevel": {
14+
"Default": "Information"
15+
}
16+
}
17+
}
18+
}

‎src/MIC/Assets/.MeshCloudScripting/mesh.cloudscripting.manifest.json

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"updatedDate": "2024-03-28T10:18:32.1597991+01:00",
3+
"appEndpoint": "https://app-ma-d667ef32a3b041e8-we-svc.azurewebsites.net/channel",
4+
"appEndpointStaging": "https://app-ma-d667ef32a3b041e8-we-svc-staging.azurewebsites.net/channel",
5+
"appId": "86a4449d-c84f-4d2b-be9e-59892d396d17",
6+
"cloudhostVersion": "ms.mrservices.meshapps:cloudhost_main_2311.2203_2.0.105",
7+
"InfraCreatedDate": "2024-03-28T10:38:37.2840516+01:00",
8+
"deactivateAppInstanceWhenVacant": "False",
9+
"enableAppMonitoring": "True",
10+
"entryPoint": "MIC-Maquette.dll",
11+
"instanceIdleTimeout": "30",
12+
"instanceResponseTimeout": "30",
13+
"language": "C#",
14+
"latestAppId": "d667ef32-a3b0-41e8-9f3d-4489504ac8f1",
15+
"location": "westeurope",
16+
"mode": "Dev",
17+
"name": "MIC-Maquette",
18+
"resourceGroup": "rg-meshInnovateCreate-westeurope-dev-001",
19+
"subscriptionId": "1310286d-4161-404b-b6eb-6a936fac3555",
20+
"wasLastProvisionAppSuccessful": "True",
21+
"wasLastDeployAppSuccessful": null,
22+
"wasLastUploadBlobSuccessful": "True",
23+
"meshAppBuildId": "a33e4349-76d0-4bec-a0f7-4a87b265d06a",
24+
"debugTimeoutSecs": 120,
25+
"provisionState": "Inactive"
26+
}

‎src/MIC/Assets/hallThomas.unitypackage.meta ‎src/MIC/Assets/BigFurniturePack.meta

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/MIC/Assets/BigFurniturePack/Demo.meta

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/MIC/Assets/BigFurniturePack/Demo/demo.meta

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)