Skip to content

Commit 575c7e0

Browse files
JamesMunro-ULCraig-J
authored andcommitted
Removed Unity project and restructured as UPM package
1 parent e3d9963 commit 575c7e0

File tree

1,273 files changed

+111
-6715
lines changed

Some content is hidden

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

1,273 files changed

+111
-6715
lines changed

.gitattributes

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
# Auto detect text files and perform LF normalization
2-
* text=auto
3-
4-
# Custom for Visual Studio
5-
*.cs diff=csharp
6-
# Standard to msysgit
7-
*.doc diff=astextplain
8-
*.DOC diff=astextplain
9-
*.docx diff=astextplain
10-
*.DOCX diff=astextplain
11-
*.dot diff=astextplain
12-
*.DOT diff=astextplain
13-
*.pdf diff=astextplain
14-
*.PDF diff=astextplain
15-
*.rtf diff=astextplain
16-
*.RTF diff=astextplain
171
*.so filter=lfs diff=lfs merge=lfs -text
182
*.png filter=lfs diff=lfs merge=lfs -text
193
*.dll filter=lfs diff=lfs merge=lfs -text

.github/workflows/build-docs.yml

Lines changed: 0 additions & 62 deletions
This file was deleted.

.github/workflows/main.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

.gitignore

Lines changed: 64 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,74 @@
1-
*.sln
2-
*.userprefs
1+
# This .gitignore file should be placed at the root of your Unity project directory
2+
#
3+
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
4+
#
5+
/[Ll]ibrary/
6+
/[Tt]emp/
7+
/[Oo]bj/
8+
/[Bb]uild/
9+
/[Bb]uilds/
10+
/[Ll]ogs/
11+
/[Uu]ser[Ss]ettings/
12+
13+
# MemoryCaptures can get excessive in size.
14+
# They also could contain extremely sensitive data
15+
/[Mm]emoryCaptures/
16+
17+
# Asset meta data should only be ignored when the corresponding asset is also ignored
18+
!/[Aa]ssets/**/*.meta
19+
20+
# Uncomment this line if you wish to ignore the asset store tools plugin
21+
# /[Aa]ssets/AssetStoreTools*
22+
23+
# Autogenerated Jetbrains Rider plugin
24+
/[Aa]ssets/Plugins/Editor/JetBrains*
25+
26+
# Visual Studio cache directory
27+
.vs/
28+
29+
# Gradle cache directory
30+
.gradle/
31+
32+
# Rider cache directory
33+
.idea/
34+
35+
# Autogenerated VS/MD/Consulo solution and project files
36+
ExportedObj/
37+
.consulo/
338
*.csproj
439
*.unityproj
5-
*.pidb
6-
*.svd
40+
*.sln
741
*.suo
42+
*.tmp
843
*.user
44+
*.userprefs
45+
*.pidb
946
*.booproj
10-
*.unitypackage
11-
*.apk
12-
*.vs
13-
14-
*.exe
15-
*_Data/
16-
17-
/Library/*
18-
/Library/FailedAssetImports.txt
19-
/Library/cache/
20-
/Library/previews/
21-
/Library/ScriptAssemblies
22-
/obj
23-
/Temp
24-
ExportedObj/
25-
Temp/
26-
[Bb]uild/
27-
[Bb]uilds/
28-
Assets/XR/
29-
Assets/XR.meta
47+
*.svd
48+
*.pdb
49+
*.mdb
50+
*.opendb
51+
*.VC.db
3052

31-
.vs/
32-
.vscode/
53+
# Unity3D generated meta files
54+
*.pidb.meta
55+
*.pdb.meta
56+
*.mdb.meta
3357

34-
*~
35-
*.swp
36-
*.Trashes
58+
# Unity3D generated file on crash reports
59+
sysinfo.txt
60+
61+
# Builds
62+
*.apk
63+
*.aab
64+
*.unitypackage
3765

38-
ehthumbs.db
39-
Thumbs.db
66+
# Crashlytics generated file
67+
crashlytics-build.properties
4068

41-
.DS_Store
42-
.DS_Store?
69+
# Packed Addressables
70+
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
4371

44-
*_ElementData*
45-
UnityPlayer.dll
72+
# Temporary auto-generated Android Assets
73+
/[Aa]ssets/[Ss]treamingAssets/aa.meta
74+
/[Aa]ssets/[Ss]treamingAssets/aa/*

.gitlab-ci.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,14 @@ trigger::trigger-downstream:
55
stage: trigger
66
inherit:
77
variables: false
8-
98
rules:
10-
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
9+
- if: $CI_COMMIT_BRANCH == "main"
1110
when: always
1211
allow_failure: false
13-
14-
- if: $UPSTREAM_COMMIT_BRANCH == "windows/legacy" && $CI_PIPELINE_SOURCE == "pipeline"
15-
when: always
16-
allow_failure: false
17-
18-
- if: $CI_COMMIT_BRANCH == "windows/legacy"
12+
- if: $CI_COMMIT_BRANCH != "main"
1913
when: manual
2014
allow_failure: false
2115

22-
variables:
23-
UPSTREAM_COMMIT_BRANCH: $CI_COMMIT_BRANCH
24-
2516
trigger:
26-
project: xr/integrations/ci/unityplugin
27-
branch: windows/legacy
28-
strategy: depend
17+
project: creative/ci/uhi/unity
18+
branch: main

.idea/.idea.unity-modules/.idea/.gitignore

Lines changed: 0 additions & 13 deletions
This file was deleted.

.idea/.idea.unity-modules/.idea/encodings.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

.idea/.idea.unity-modules/.idea/indexLayout.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.idea/.idea.unity-modules/.idea/vcs.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

Assets/Plugins.meta

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)