Skip to content
This repository has been archived by the owner on Aug 11, 2024. It is now read-only.

Dev cleanup #134

Merged
merged 2 commits into from
Apr 29, 2019
Merged

Dev cleanup #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
815ba4d
removed unused .npmignore
StephenHodgson Apr 29, 2019
0fd388e
Merge branch 'development' into dev-cleanup
StephenHodgson Apr 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion XRTK-Core/Packages/com.xrtk.core/.npmignore
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions XRTK-Core/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"dependencies": {
"com.unity.multiplayer-hlapi": "1.0.2",
"com.unity.package-manager-ui": "2.1.2",
"com.unity.textmeshpro": "2.0.0",
"com.unity.timeline": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.0.2",
"com.unity.xr.magicleap": "2.0.0-preview.16",
"com.unity.xr.oculus.standalone": "1.29.1",
Expand Down
1 change: 0 additions & 1 deletion XRTK-Core/ProjectSettings/GraphicsSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16004, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
Expand Down