Commit 7f405eae authored by g6herbre's avatar g6herbre
Browse files

Merge branch 'master' of https://git.enib.fr/g6herbre/jeu-rev

parents 3fa6e475 32a6f5d5
{
"files.exclude":
{
"**/.DS_Store":true,
"**/.git":true,
"**/.gitignore":true,
"**/.gitmodules":true,
"**/*.booproj":true,
"**/*.pidb":true,
"**/*.suo":true,
"**/*.user":true,
"**/*.userprefs":true,
"**/*.unityproj":true,
"**/*.dll":true,
"**/*.exe":true,
"**/*.pdf":true,
"**/*.mid":true,
"**/*.midi":true,
"**/*.wav":true,
"**/*.gif":true,
"**/*.ico":true,
"**/*.jpg":true,
"**/*.jpeg":true,
"**/*.png":true,
"**/*.psd":true,
"**/*.tga":true,
"**/*.tif":true,
"**/*.tiff":true,
"**/*.3ds":true,
"**/*.3DS":true,
"**/*.fbx":true,
"**/*.FBX":true,
"**/*.lxo":true,
"**/*.LXO":true,
"**/*.ma":true,
"**/*.MA":true,
"**/*.obj":true,
"**/*.OBJ":true,
"**/*.asset":true,
"**/*.cubemap":true,
"**/*.flare":true,
"**/*.mat":true,
"**/*.meta":true,
"**/*.prefab":true,
"**/*.unity":true,
"build/":true,
"Build/":true,
"Library/":true,
"library/":true,
"obj/":true,
"Obj/":true,
"ProjectSettings/":true,
"temp/":true,
"Temp/":true
}
}
\ No newline at end of file
......@@ -15,7 +15,7 @@ GameObject:
- component: {fileID: 733436471773155079}
m_Layer: 0
m_Name: Ground
m_TagString: Untagged
m_TagString: floor
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......
......@@ -14,7 +14,7 @@ GameObject:
- component: {fileID: 6236673629081195536}
m_Layer: 0
m_Name: Plateform
m_TagString: Untagged
m_TagString: plateform
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......
{
"dependencies": {
"com.unity.collab-proxy": "1.2.16",
"com.unity.ide.rider": "1.1.4",
"com.unity.ide.rider": "1.2.1",
"com.unity.ide.vscode": "1.2.3",
"com.unity.postprocessing": "3.0.3",
"com.unity.test-framework": "1.1.22",
"com.unity.textmeshpro": "2.1.1",
"com.unity.test-framework": "1.1.24",
"com.unity.textmeshpro": "2.1.4",
"com.unity.timeline": "1.2.18",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",
......
......@@ -15,7 +15,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "1.1.4",
"version": "1.2.1",
"depth": 0,
"source": "registry",
"dependencies": {
......@@ -40,7 +40,7 @@
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.22",
"version": "1.1.24",
"depth": 0,
"source": "registry",
"dependencies": {
......@@ -51,7 +51,7 @@
"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "2.1.1",
"version": "2.1.4",
"depth": 0,
"source": "registry",
"dependencies": {
......
m_EditorVersion: 2019.4.21f1
m_EditorVersionWithRevision: 2019.4.21f1 (b76dac84db26)
m_EditorVersion: 2019.4.26f1
m_EditorVersionWithRevision: 2019.4.26f1 (e0392c6b2363)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment