Skip to content

Commit

Permalink
Merge branch 'release/v1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
javibm committed Dec 4, 2017
2 parents ba9976a + 6ad98aa commit 6baacee
Show file tree
Hide file tree
Showing 1,048 changed files with 236,671 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ sysinfo.txt
# Builds
*.apk
*.unitypackage
.vscode/settings.json
56 changes: 56 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"files.exclude":
{
"**/.DS_Store":true,
"**/.git":true,
"**/.gitignore":true,
"**/.gitmodules":true,
"**/*.booproj":true,
"**/*.pidb":true,
"**/*.suo":true,
"**/*.user":true,
"**/*.userprefs":true,
"**/*.unityproj":true,
"**/*.dll":true,
"**/*.exe":true,
"**/*.pdf":true,
"**/*.mid":true,
"**/*.midi":true,
"**/*.wav":true,
"**/*.gif":true,
"**/*.ico":true,
"**/*.jpg":true,
"**/*.jpeg":true,
"**/*.png":true,
"**/*.psd":true,
"**/*.tga":true,
"**/*.tif":true,
"**/*.tiff":true,
"**/*.3ds":true,
"**/*.3DS":true,
"**/*.fbx":true,
"**/*.FBX":true,
"**/*.lxo":true,
"**/*.LXO":true,
"**/*.ma":true,
"**/*.MA":true,
"**/*.obj":true,
"**/*.OBJ":true,
"**/*.asset":true,
"**/*.cubemap":true,
"**/*.flare":true,
"**/*.mat":true,
"**/*.meta":true,
"**/*.prefab":true,
"**/*.unity":true,
"build/":true,
"Build/":true,
"Library/":true,
"library/":true,
"obj/":true,
"Obj/":true,
"ProjectSettings/":true,
"temp/":true,
"Temp/":true
}
}
Binary file added Assets/3DModels/Coffe_maker.FBX
Binary file not shown.
101 changes: 101 additions & 0 deletions Assets/3DModels/Coffe_maker.FBX.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/3DModels/Couch.FBX
Binary file not shown.
96 changes: 96 additions & 0 deletions Assets/3DModels/Couch.FBX.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/3DModels/Drink_machine.FBX
Binary file not shown.
96 changes: 96 additions & 0 deletions Assets/3DModels/Drink_machine.FBX.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/3DModels/Fish_tank.FBX
Binary file not shown.
Loading

0 comments on commit 6baacee

Please sign in to comment.