Auto stash before merge of "master" and "origin/master"
Merging;
Showing
- TTCS_Prot/Assets/Scenes/SampleScene.unity 53 additions, 26 deletionsTTCS_Prot/Assets/Scenes/SampleScene.unity
- TTCS_Prot/Assets/Scenes/example.meta 8 additions, 0 deletionsTTCS_Prot/Assets/Scenes/example.meta
- TTCS_Prot/Assets/Scripts/Classes/CameraMove.cs 7 additions, 27 deletionsTTCS_Prot/Assets/Scripts/Classes/CameraMove.cs
- TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs 1 addition, 1 deletionTTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs
- TTCS_Prot/Assets/Scripts/Classes/InputManager.cs 2 additions, 1 deletionTTCS_Prot/Assets/Scripts/Classes/InputManager.cs
- TTCS_Prot/Assets/example.meta 8 additions, 0 deletionsTTCS_Prot/Assets/example.meta
- TTCS_Prot/ProjectSettings/DynamicsManager.asset 33 additions, 29 deletionsTTCS_Prot/ProjectSettings/DynamicsManager.asset
- TTCS_Prot/ProjectSettings/InputManager.asset 32 additions, 0 deletionsTTCS_Prot/ProjectSettings/InputManager.asset
- TTCS_Prot/ProjectSettings/NavMeshAreas.asset 1 addition, 1 deletionTTCS_Prot/ProjectSettings/NavMeshAreas.asset
- TTCS_Prot/ProjectSettings/TagManager.asset 1 addition, 1 deletionTTCS_Prot/ProjectSettings/TagManager.asset
Please register or sign in to comment