forked from JamesBear/vive_ik_demo
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
updated .gitignore, .gitattributes, removed SteamVR, added license
for now the latest SteamVR Unity plugin is required
- Loading branch information
Showing
741 changed files
with
92 additions
and
98,011 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.