Merge branch 'master' of https://git.hugowillaume.com/Hurlu/Carnage

2019-05-23 17:32:20 +09:00 · 2019-05-23 17:32:20 +09:00 · 038b36bf74
commit 038b36bf74
parent f02570adcb 56d0947559
15 changed files with 57 additions and 18 deletions
--- a/Assets/Menus/Lobby/ChoiceButton.cs
+++ b/Assets/Menus/Lobby/ChoiceButton.cs
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b0d70a5afe43fcda053fafe055c261b20b0cae0ff939894555ff164fd29b8cf
-size 4913
+oid sha256:f6ddd91b0c030d9f0aaa275a0442ad8c2182bab09170d37828fa26cd753525de
+size 4855
--- a/Assets/Menus/Network/PlayerIdentity.cs
+++ b/Assets/Menus/Network/PlayerIdentity.cs
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b207dfad1f5610eb09d50c084ff9ddb2eddd76e79217f3de56a02bb111ec254f
-size 351
+oid sha256:bced47de427fe655ba99b22cd1cb9683e214e7e62037a9766094db4a6bd07d39
+size 384
--- a/Assets/Menus/WaitingRoom/WaitingRoomManager.cs
+++ b/Assets/Menus/WaitingRoom/WaitingRoomManager.cs
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a50b2f57cdcd926893fae1975ce5146e15b43e7029e3db050272bfc43aa4be5f
-size 4482
+oid sha256:bec8f6a6099436086f43ba845e936ec78940e01ade9fb64f84ef2b84e06ccd97
+size 4596
--- a/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll
+++ b/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6af8463c246acd3a42aeb7f6885b6caa5b4e76db173b29ff0335b90210ef640c
-size 1350656
+oid sha256:73f30e4bdea5de1180722029149177d7c97f061aeb36dc7f1a626f24c8d32fd0
+size 817664
--- a/Assets/Plugins/TextMesh
+++ b/Assets/Plugins/TextMesh
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 731f1baa9d144a9897cb1d341c2092b8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/LobbyScene.unity
+++ b/Assets/Scenes/LobbyScene.unity
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ea473be3d831df127ea15471233afa3d6c12f8fadfd43011ffb8e9f1636bed0
-size 267895
+oid sha256:cefc3a0563ae3d4ce11d02b3079164719aa9a4f1f73a597985f5264febbc6a46
+size 267887
--- a/Assets/Scripts/NetworkTestLaunchManager.cs
+++ b/Assets/Scripts/NetworkTestLaunchManager.cs
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ec5360613e97d8d295a4867bdf0def43bfa07272e61acf7c8ff89c3d129e156a
-size 1286
--- a/Assets/Scripts/SceneInitialization.meta
+++ b/Assets/Scripts/SceneInitialization.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7eb63a258c7d8384ab2ebeb41579eecd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/SceneInitialization/CarInitializer.cs
+++ b/Assets/Scripts/SceneInitialization/CarInitializer.cs
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09ac02f987c56be1f2af9164c6f0ad2c70ff835ebbaf0698f81f6aaa7d8584a9
+size 1918
--- a/Assets/Scripts/SceneInitialization/CarInitializer.cs.meta
+++ b/Assets/Scripts/SceneInitialization/CarInitializer.cs.meta
@ -0,0 +1,20 @@
+fileFormatVersion: 2
+guid: 6730e9056ecc88c478c9e31a7a015aca
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences:
+  - LightCar: {fileID: 2193745503433322958, guid: 80eb47f1eeb97c543a16ad9daa42364e,
+      type: 3}
+  - MediumCar: {fileID: 4786026965939563618, guid: 1c389d213e32dce4299a5f1323c437ea,
+      type: 3}
+  - HeavyCar: {fileID: 23044736461324762, guid: 687465781237140468bf8260666deae7,
+      type: 3}
+  - MachineGun: {instanceID: 0}
+  - Sniper: {instanceID: 0}
+  - Shotgun: {instanceID: 0}
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/SceneInitialization/NetworkTestLaunchManager.cs
+++ b/Assets/Scripts/SceneInitialization/NetworkTestLaunchManager.cs
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1a554900f7068cb45f332c812297ed0f8792be99a2cf7818acdab30e58685dfa
+size 1238
--- a/Assets/Scripts/SceneInitialization/NetworkTestLaunchManager.cs.meta
+++ b/Assets/Scripts/SceneInitialization/NetworkTestLaunchManager.cs.meta
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a10b012043232327506a4aee1490d145d6e6176d620bf88358bb6384ee20243a
-size 754
+oid sha256:46cf77e1c7d4a819696ffa92de1940d8db696c772c823ff423162c1fd306ecb2
+size 558
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f328dc3005d7577c0066fca9581eceb40065873bf8d1ff67d7a17278b8d2989
-size 2152
+oid sha256:b9d17ff3c5231a288e150a8e8ea770b9a7b83baaceaba54e20603955b234b4e0
+size 2290
--- a/ProjectSettings/UnityConnectSettings.asset
+++ b/ProjectSettings/UnityConnectSettings.asset
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e06370b3d2256d4dbc8892f59a8467d9f9785f034a4836a6790380252eb4916
+oid sha256:40f4069ef87c987912306c30baf267eeb27081af1429e14caab0908e123c30e2
 size 853