Skip to content

Commit 575e9d5

Browse files
fernando-cortezfernando-cortez
committed
Merge branch 'develop' into feature/networkobject-spawner
2 parents 8776856 + b449a4d commit 575e9d5

Some content is hidden

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

52 files changed

+2022
-275
lines changed

‎Assets/GameData/Action/General/Drop.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:233623c213dbc645c5c3a93da5963445fbb7028c9b8abaa24b684d5f90e3ee8b
3+
size 979

‎Assets/GameData/Action/General/Drop.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/Action/General/PickUp.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:912155f31fbc6d9317b07ef92e5c7affee747fba3c8bd711179339fec38ab44b
3+
size 1023

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

0 commit comments

Comments
 (0)