Skip to content
This repository has been archived by the owner on Jun 28, 2022. It is now read-only.

Commit

Permalink
Merge branch 'v1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Wilter committed May 31, 2018
1 parent 540e274 commit 757bf6b
Show file tree
Hide file tree
Showing 812 changed files with 5,468 additions and 53,791 deletions.
76 changes: 50 additions & 26 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,34 +1,58 @@
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/Assets/AssetStoreTools*
# ============================================================================ #
# VR Developer Nanodegree | Unity Gitignore Rules Revision 02/14/2018 #
# ============================================================================ #
# #
# - Assumes the Unity project folder is an immediate child of the repository #
# root directory. #
# - Assumes miscellaneous folders such as, for example, a manually created #
# folder for storing builds are created in the repository root directory and #
# not inside the Unity project folder. #
# - Includes OS generated ignore rules for macOS and Windows typically defined #
# within the global ignore rules. #
# #
# ============================================================================ #


# ============================================================================ #
# OS Generated #
# ============================================================================ #
.DS_Store
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
[Tt]humbs.db
[Dd]esktop.ini


# Visual Studio 2015 cache directory
/.vs/
# ============================================================================ #
# Unity Generated #
# ============================================================================ #
*/[Tt]emp/
*/[Ll]ibrary/
*/[Oo]bj/
*/sysinfo.txt
*/*.stackdump

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/

# ============================================================================ #
# Visual Studio / MonoDevelop Generated #
# ============================================================================ #
*/.vs/
[Ee]xported[Oo]bj/
*.userprefs
*.csproj
*.unityproj
*.sln
*.pidb
*.suo
*.tmp
*.sln
*.user
*.userprefs
*.pidb
*.unityproj
*.booproj
*.svd
*.pdb

# Unity3D generated meta files
*.pidb.meta

# Unity3D Generated File On Crash Reports
sysinfo.txt

# Builds
*.apk
*.unitypackage
# ============================================================================ #
# Common Repository Child Directories #
# ============================================================================ #
/[Bb]uild/
/[Bb]uilds/
53 changes: 0 additions & 53 deletions Assets/GoogleVR/Demos/Editor/DemoInputManagerEditor.cs

This file was deleted.

139 changes: 0 additions & 139 deletions Assets/GoogleVR/Demos/Editor/PermissionsDemoBuildEditor.cs

This file was deleted.

57 changes: 0 additions & 57 deletions Assets/GoogleVR/Demos/Environment/DemoEnvUnlitGrayscale.shader

This file was deleted.

This file was deleted.

26 changes: 0 additions & 26 deletions Assets/GoogleVR/Demos/Environment/Materials/cubeRoomEnvMat.mat

This file was deleted.

Loading

0 comments on commit 757bf6b

Please sign in to comment.