Skip to content

Commit

Permalink
Merge pull request #13 from smourph/hotfix/unwanted-commit
Browse files Browse the repository at this point in the history
Fix v0.2.0 release: the last commit is related to future network features and has been added by mystake.
  • Loading branch information
smourph authored Sep 16, 2017
2 parents 61e12cf + 73c5078 commit 5c7cb68
Show file tree
Hide file tree
Showing 14 changed files with 737 additions and 303 deletions.
2 changes: 1 addition & 1 deletion Assets/Prefabs/Bullet.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f58414871f90d014fad4dac38afca2d6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_particleEffect: {fileID: 1814433479905170, guid: da0ea28482e581442926a920a7c08491,
particleEffect: {fileID: 1814433479905170, guid: da0ea28482e581442926a920a7c08491,
type: 2}
--- !u!135 &135536798888832452
SphereCollider:
Expand Down
Loading

0 comments on commit 5c7cb68

Please sign in to comment.