cgvr/DeltaVR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perparing for merge

Browse Source
This commit is contained in:
mxssw 2025-06-21 13:51:16 +03:00
parent f42fc6463c
commit 0fab2c9722
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Fish-Networking-Discovery-main/NetworkDiscovery.cs
View File

@ -242,7 +242,11 @@ namespace FishNet.Discovery
// //
// return; // return;
// } // }
<<<<<<< HEAD
Debug.Log("NetworkDiscovery is searching"); Debug.Log("NetworkDiscovery is searching");
=======
// Debug.Log("NetworkDiscovery is searching on port " + port);
>>>>>>> master
if (InstanceFinder.IsClient) if (InstanceFinder.IsClient)
{ {

4
Assets/Prefabs.meta
View File

@ -1,5 +1,9 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Prefabs.meta
guid: f5d758e3acccf474babdbe217a2702ba guid: f5d758e3acccf474babdbe217a2702ba
========
guid: b75b31ee55930864c993630f33293a65
>>>>>>>> master:Assets/_PROJECT/Components/Bolt.meta
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

4
Assets/Scripts.meta
View File

@ -1,5 +1,9 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Scripts.meta
guid: 8f19a044f4ee30042a6ad8c58d595f40 guid: 8f19a044f4ee30042a6ad8c58d595f40
========
guid: d130522c3b40916429cacacf79ffbc9b
>>>>>>>> master:Assets/_PROJECT/Components/Bolt/Intercation Logic.meta
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

3
Assets/XR/Settings/OpenXR Package Settings.asset
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c4dfd870243f7478ecd0558d9b6821d6952a0367b38a5c3e225896d287b4c07b
size 26638