Skip to content

Commit e146f91

Browse files
Merge pull request #8 from pollen-robotics/develop
Stable release of simulator 1.0.2
2 parents 4341cc8 + 0486434 commit e146f91

File tree

285 files changed

+9156
-5157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

285 files changed

+9156
-5157
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,8 @@ crashlytics-build.properties
7373

7474
# Temporary auto-generated Android Assets
7575
/[Aa]ssets/[Ss]treamingAssets/aa.meta
76-
/[Aa]ssets/[Ss]treamingAssets/aa/*
76+
/[Aa]ssets/[Ss]treamingAssets/aa/*
77+
78+
Assets/Plugins/Google*
79+
Assets/Plugins/Grpc*
80+
Assets/Plugins/System*

Assets/Plugins.meta renamed to Assets/3D Models.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Prefabs.meta renamed to Assets/3D Models/BasketBall.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!134 &13400000
4+
PhysicMaterial:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: Ball
10+
dynamicFriction: 1
11+
staticFriction: 1
12+
bounciness: 0.5
13+
frictionCombine: 0
14+
bounceCombine: 0

Assets/3D Models/BasketBall/Ball.physicMaterial.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Author:
2+
https://www.cgtrader.com/mason-dececchis
3+
4+
Asset:
5+
https://www.cgtrader.com/free-3d-models/sports/game/basketball-a534dde8-180a-4180-b0bd-7093262d8897

Assets/3D Models/BasketBall/LICENSE.txt.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Loading

Assets/3D Models/BasketBall/basketball_bump.jpg.meta

Lines changed: 98 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)