Skip to content

Commit 275bf33

Browse files
LPLafontaineBLPLafontaineB
committed
Merge branch 'develop' into sam/feat/bump-pre.10
2 parents 48d2fd1 + 309ee34 commit 275bf33

Some content is hidden

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

44 files changed

+1188
-172
lines changed

‎Assets/GameData/Action/VandalImp.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.

‎Assets/GameData/Action/VandalImp/ImpToss.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:e00e1324dfeec11224fd0f99393c9c0b04e50932abeba8e408c135fc3d6aa79a
3+
size 1073

‎Assets/GameData/Action/VandalImp/ImpToss.asset.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.

‎Assets/GameData/Character/Imp/VandalImp.asset

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Assets/GameData/Character/VandalImp.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.

‎Assets/GameData/Character/VandalImp/BaseHP.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:f657f7081f4fb2c005104ef7612e7c8816ac8ce2aa6485b146767190c7264841
3+
size 408

‎Assets/GameData/Character/VandalImp/BaseHP.asset.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.

‎Assets/GameData/Character/VandalImp/VandalImp.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:6135b8795be90c0ee170bfdd401595eaa0892ba2b54f3b1f8771b5da9ce81cd7
3+
size 666

‎Assets/GameData/Character/Imp/VandalImp.asset.meta renamed to ‎Assets/GameData/Character/VandalImp/VandalImp.asset.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/GameData/Game/ImpTossPhysics.physicMaterial

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: ImpTossPhysics
10+
dynamicFriction: 0.1
11+
staticFriction: 0.6
12+
bounciness: 1
13+
frictionCombine: 0
14+
bounceCombine: 0

‎Assets/GameData/Game/ImpTossPhysics.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.

0 commit comments

Comments
 (0)