Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

GroupProject
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

012d30a2

Commit 012d30a2 authored 7 years ago by clg544

Downloads
- Patches
- Plain Diff

Resolving diff's from merge

parent 35e1fad8

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

CMPT306_Fall2017/Assets/Scenes/CMPT306_Fall2017.unity 0 additions, 24 deletions

CMPT306_Fall2017/Assets/Scenes/CMPT306_Fall2017.unity
CMPT306_Fall2017/Assets/Scripts/PlayerCameraScript.cs 0 additions, 5 deletions

CMPT306_Fall2017/Assets/Scripts/PlayerCameraScript.cs
CMPT306_Fall2017/ProjectSettings/Physics2DSettings.asset 5 additions, 9 deletions

CMPT306_Fall2017/ProjectSettings/Physics2DSettings.asset
CMPT306_Fall2017/ProjectSettings/TagManager.asset 1 addition, 13 deletions

CMPT306_Fall2017/ProjectSettings/TagManager.asset

with 6 additions and 51 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment