Manual resolution of merge conflicts
Showing
- CMPT306_Fall2017/Assets/Prefabs/Door.prefab 81 additions, 0 deletionsCMPT306_Fall2017/Assets/Prefabs/Door.prefab
- CMPT306_Fall2017/Assets/Prefabs/Door.prefab.meta 9 additions, 0 deletionsCMPT306_Fall2017/Assets/Prefabs/Door.prefab.meta
- CMPT306_Fall2017/Assets/Prefabs/cave.mat 76 additions, 0 deletionsCMPT306_Fall2017/Assets/Prefabs/cave.mat
- CMPT306_Fall2017/Assets/Prefabs/cave.mat.meta 9 additions, 0 deletionsCMPT306_Fall2017/Assets/Prefabs/cave.mat.meta
- CMPT306_Fall2017/Assets/Prefabs/caveMesh.prefab 82 additions, 0 deletionsCMPT306_Fall2017/Assets/Prefabs/caveMesh.prefab
- CMPT306_Fall2017/Assets/Prefabs/caveMesh.prefab.meta 9 additions, 0 deletionsCMPT306_Fall2017/Assets/Prefabs/caveMesh.prefab.meta
- CMPT306_Fall2017/Assets/Scenes/ProceduralScene.unity 486 additions, 0 deletionsCMPT306_Fall2017/Assets/Scenes/ProceduralScene.unity
- CMPT306_Fall2017/Assets/Scenes/ProceduralScene.unity.meta 8 additions, 0 deletionsCMPT306_Fall2017/Assets/Scenes/ProceduralScene.unity.meta
- CMPT306_Fall2017/Assets/Scripts/OldScripts.meta 9 additions, 0 deletionsCMPT306_Fall2017/Assets/Scripts/OldScripts.meta
- CMPT306_Fall2017/Assets/Scripts/OldScripts/AutoDestroyParticleSystem.cs 20 additions, 0 deletions...17/Assets/Scripts/OldScripts/AutoDestroyParticleSystem.cs
- CMPT306_Fall2017/Assets/Scripts/OldScripts/AutoDestroyParticleSystem.cs.meta 12 additions, 0 deletions...sets/Scripts/OldScripts/AutoDestroyParticleSystem.cs.meta
- CMPT306_Fall2017/Assets/Scripts/OldScripts/Background.cs 29 additions, 0 deletionsCMPT306_Fall2017/Assets/Scripts/OldScripts/Background.cs
- CMPT306_Fall2017/Assets/Scripts/OldScripts/Background.cs.meta 12 additions, 0 deletions...306_Fall2017/Assets/Scripts/OldScripts/Background.cs.meta
- CMPT306_Fall2017/Assets/Scripts/OldScripts/CameraController.cs 48 additions, 0 deletions...06_Fall2017/Assets/Scripts/OldScripts/CameraController.cs
- CMPT306_Fall2017/Assets/Scripts/OldScripts/CameraController.cs.meta 12 additions, 0 deletions...ll2017/Assets/Scripts/OldScripts/CameraController.cs.meta
- CMPT306_Fall2017/Assets/Scripts/OldScripts/CameraFollow.cs 17 additions, 0 deletionsCMPT306_Fall2017/Assets/Scripts/OldScripts/CameraFollow.cs
- CMPT306_Fall2017/Assets/Scripts/OldScripts/CameraFollow.cs.meta 12 additions, 0 deletions...6_Fall2017/Assets/Scripts/OldScripts/CameraFollow.cs.meta
- CMPT306_Fall2017/Assets/Scripts/OldScripts/CharacterController2D.cs 332 additions, 0 deletions...ll2017/Assets/Scripts/OldScripts/CharacterController2D.cs
- CMPT306_Fall2017/Assets/Scripts/OldScripts/CharacterController2D.cs.meta 12 additions, 0 deletions...7/Assets/Scripts/OldScripts/CharacterController2D.cs.meta
- CMPT306_Fall2017/Assets/Scripts/OldScripts/Checkpoint.cs 41 additions, 0 deletionsCMPT306_Fall2017/Assets/Scripts/OldScripts/Checkpoint.cs
Loading
Please register or sign in to comment