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

Jump to bottom

feat: merge all on main scene ✨ #21

Merged
merged 1 commit into from
Jan 20, 2023
Merged

feat: merge all on main scene ✨ #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Assets/Level/Prefabs/Player.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1c6c0943eb3256b31b419a45d221a368, type: 3}
m_Name:
m_EditorClassIdentifier:
sensX: 200
sensY: 200
sensX: 500
sensY: 500
player: {fileID: 7601803230581162137}
gunPosition: {fileID: 4239183470328706560}
--- !u!114 &8607814543266890481
Expand Down
2 changes: 1 addition & 1 deletion Assets/Level/Prefabs/spawningPoint1.prefab → Assets/Level/Prefabs/SpawnPoint.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 5981645854533450410}
m_Layer: 0
m_Name: spawningPoint1
m_Name: SpawnPoint
m_TagString: SpawningPoint
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down
0 .../Level/Prefabs/spawningPoint1.prefab.meta → Assets/Level/Prefabs/SpawnPoint.prefab.meta
View file
Open in desktop
File renamed without changes.
Loading