huanld/speckle-unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed broken scene references (hopefully for good now)

Browse Source 
- Removed `.meta` from `.gitignore`
- Fixed broken scene references
- Upgraded project to 2020.3.17
This commit is contained in:
JR-Morgan
2021-09-15 11:40:36 +01:00
parent 0e357a9198
commit d8d2d3f574
8 changed files with 9 additions and 24341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -2
View File
@@ -72,5 +72,4 @@ crashlytics-build.properties
# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*
.idea/
*.meta
.idea/
.idea/.idea.Speckle Unity/.idea/contentModel.xml
Generated
-42
View File
@@ -1,42 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ContentModelStore">
<e p="C:\Code\Speckle-Next\speckle-unity\Speckle Unity" t="IncludeRecursive">
<e p="Assembly-CSharp-Editor.csproj" t="IncludeRecursive" />
<e p="Assembly-CSharp.csproj" t="IncludeRecursive" />
<e p="Assets" t="Include">
<e p="Extra" t="Include">
<e p="CameraOperate.cs" t="Include" />
<e p="RosolynDirectoryCreator.cs" t="Include" />
<e p="Selectable.cs" t="Include" />
<e p="SelectionManager.cs" t="Include" />
</e>
<e p="InteractionLogic.cs" t="Include" />
<e p="Speckle Connector" t="Include">
<e p="ConverterUnity.BuiltElements.cs" t="Include" />
<e p="ConverterUnity.cs" t="Include" />
<e p="ConverterUnity.Geometry.cs" t="Include" />
<e p="ConverterUnity.Units.cs" t="Include" />
<e p="Dispatcher.cs" t="Include" />
<e p="Editor" t="Include">
<e p="StreamManagerEditor.cs" t="Include" />
</e>
<e p="Receiver.cs" t="Include" />
<e p="RecursiveConverter.cs" t="Include" />
<e p="Sender.cs" t="Include" />
<e p="SpeckleProperties.cs" t="Include" />
<e p="StreamManager.cs" t="Include" />
<e p="Streams.cs" t="Include" />
<e p="Utils.cs" t="Include" />
</e>
<e p="SpeckleExamples.cs" t="Include" />
</e>
<e p="obj" t="ExcludeRecursive" />
<e p="Packages" t="ExcludeRecursive" />
<e p="Speckle Unity.sln" t="IncludeFlat" />
<e p="Temp\Bin" t="ExcludeRecursive" />
</e>
<e p="C:\Users\Admin\AppData\Local\JetBrains\Rider2020.2\extResources" t="IncludeRecursive" />
<e p="C:\Users\Admin\AppData\Local\JetBrains\Rider2020.2\resharper-host\Local\Transient\Rider\v202\SolutionCaches\_Speckle Unity.-1593363948.00" t="ExcludeRecursive" />
</component>
</project>
.idea/.idea.Speckle Unity/.idea/modules.xml
Generated
-8
View File
@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/.idea.Speckle Unity/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.Speckle Unity/riderModule.iml" />
</modules>
</component>
</project>
.idea/.idea.Speckle Unity/riderModule.iml
Generated
-7
View File
@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="RIDER_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$/../.." />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
Assets/SpecklePlayground.unity
-24274
View File
File diff suppressed because it is too large Load Diff
Packages/manifest.json
+3 -3
View File
@@ -1,11 +1,11 @@
{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.collab-proxy": "1.5.7",
"com.unity.collab-proxy": "1.7.1",
"com.unity.ide.rider": "2.0.7",
"com.unity.ide.visualstudio": "2.0.9",
"com.unity.ide.visualstudio": "2.0.11",
"com.unity.ide.vscode": "1.2.3",
"com.unity.test-framework": "1.1.26",
"com.unity.test-framework": "1.1.27",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.4.8",
"com.unity.ugui": "1.0.0",
Packages/packages-lock.json
+3 -3
View File
@@ -7,7 +7,7 @@
"dependencies": {}
},
"com.unity.collab-proxy": {
"version": "1.5.7",
"version": "1.7.1",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -32,7 +32,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.9",
"version": "2.0.11",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -55,7 +55,7 @@
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.26",
"version": "1.1.27",
"depth": 0,
"source": "registry",
"dependencies": {
ProjectSettings/ProjectVersion.txt
+2 -2
View File
@@ -1,2 +1,2 @@
m_EditorVersion: 2020.3.13f1
m_EditorVersionWithRevision: 2020.3.13f1 (71691879b7f5)
m_EditorVersion: 2020.3.17f1
m_EditorVersionWithRevision: 2020.3.17f1 (a4537701e4ab)