Merge remote-tracking branch 'refs/remotes/origin/Road' into Wwise

# Conflicts: # Assets/scripts/CarControl.cs # ProjectSettings/ProjectSettings.asset
nathanwentworth · Oct 1, 2016 · 6a930ea · 6a930ea
2 parents b644327 + d38c096
commit 6a930ea
Show file tree

Hide file tree

Showing 57 changed files with 1,554 additions and 315 deletions.
diff --git a/Assets/models/Cube.controller b/Assets/models/Cube.controller
diff --git a/Assets/models/Easy_track.fbx b/Assets/models/Easy_track.fbx
diff --git a/Assets/models/Easy_track.fbx.meta b/Assets/models/Easy_track.fbx.meta
diff --git a/Assets/ui/ui-components.meta → Assets/models/Track1.meta b/Assets/ui/ui-components.meta → Assets/models/Track1.meta
diff --git a/Assets/models/Track1/Easy_track.fbx b/Assets/models/Track1/Easy_track.fbx