Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add barrel and catapult with improvements #90

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

add barrel and catapult with improvements #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1d50bca
Added barrel and catapult
fahad-30 May 14, 2020
d80c277
Merge pull request #1 from gamedev-iitk/master
sps1112 May 18, 2020
cba7a0e
add wallet and dialog tests
sps1112 May 19, 2020
a0d46a2
Merge pull request #2 from gamedev-iitk/master
sps1112 May 22, 2020
cccba0d
Merge pull request #3 from sps1112/master
sps1112 May 22, 2020
525a4f3
Merge pull request #4 from fahad-30/BarrelAndCatapult
sps1112 May 22, 2020
acbcac8
Merge pull request #5 from sps1112/barrelTest
sps1112 May 22, 2020
408bba3
add barrel and catapult improvements
sps1112 May 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Assets/Geometry.meta
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions Assets/Geometry/barrel FBX12.fbx
View file
Open in desktop
Git LFS file not shown
108 changes: 108 additions & 0 deletions Assets/Geometry/barrel FBX12.fbx.meta
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions Assets/Geometry/catapult1.fbx
View file
Open in desktop
Git LFS file not shown
118 changes: 118 additions & 0 deletions Assets/Geometry/catapult1.fbx.meta
View file
Open in desktop

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

110 changes: 110 additions & 0 deletions Assets/Materials/barrel-texture-planks-rings-wooden-63557111.mat
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions Assets/Materials/barrel-texture-planks-rings-wooden-63557111.mat.meta
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions Assets/Prefabs/Environment.meta
View file
Open in desktop

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

Loading