Skip to content

Commit

Permalink
updated .gitignore, .gitattributes, removed SteamVR, added license
Browse files Browse the repository at this point in the history
for now  the latest SteamVR Unity plugin is required
  • Loading branch information
dariol committed Jul 26, 2017
1 parent a5b00f2 commit 6cec8ea
Show file tree
Hide file tree
Showing 741 changed files with 92 additions and 98,011 deletions.
27 changes: 27 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

## Unity ##

*.txt text
*.cs diff=csharp text
*.cginc text
*.shader text

*.mat merge=unityyamlmerge eol=lf
*.anim merge=unityyamlmerge eol=lf
*.unity merge=unityyamlmerge eol=lf
*.prefab merge=unityyamlmerge eol=lf
*.physicsMaterial2D merge=unityyamlmerge eol=lf
*.physicsMaterial merge=unityyamlmerge eol=lf
*.physicMaterial merge=unityyamlmerge eol=lf
*.asset merge=unityyamlmerge eol=lf
*.meta merge=unityyamlmerge eol=lf
*.controller merge=unityyamlmerge eol=lf
*.flare merge=unityyamlmerge eol=lf

#3D Object
*.FBX -text
*.fbx -text
*.blend -text
*.obj -text
38 changes: 34 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,37 @@
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/

Library/
Temp/
Build/
.vs/
ProjectSettings/*
!ProjectSettings/EditorSettings.asset

Assets/SteamVR/
Assets/SteamVR.meta

*.cfg

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd

# Unity3D generated meta files
*.pidb.meta

# Unity3D Generated File On Crash Reports
sysinfo.txt

# Builds
*.apk
*.unitypackage
6 changes: 0 additions & 6 deletions Assets/SteamVR/Editor.meta

This file was deleted.

127 changes: 0 additions & 127 deletions Assets/SteamVR/Editor/SteamVR_Editor.cs

This file was deleted.

9 changes: 0 additions & 9 deletions Assets/SteamVR/Editor/SteamVR_Editor.cs.meta

This file was deleted.

105 changes: 0 additions & 105 deletions Assets/SteamVR/Editor/SteamVR_RenderModelEditor.cs

This file was deleted.

12 changes: 0 additions & 12 deletions Assets/SteamVR/Editor/SteamVR_RenderModelEditor.cs.meta

This file was deleted.

Loading

0 comments on commit 6cec8ea

Please sign in to comment.