Marker Functionality#4

Open

devibri wants to merge 13 commits intomasterfrom

Commits on Jun 23, 2017

Updating marker collision functionality
Devi Acharya
committed
Updating collide script -- getting rid of gameobject error
Devi Acharya
committed
Adding script that rotates arrow on marker
Devi Acharya
committed

Commits on Jun 26, 2017

adding scripts for second arrow
Devi Acharya
committed
Adding specular and normal materials
Devi Acharya
committed

Commits on Jun 27, 2017

rotation of marker2 now matches marker1
Devi Acharya
committed
marker 2 now follows first arrow rotation
Devi Acharya
committed
adding copy of main scene
Devi Acharya
committed
getting rid of merge conflicts
Devi Acharya
committed
marker1 no longer spawns at origin
Devi Acharya
committed
making markers transparent
Devi Acharya
committed

Commits on Jul 5, 2017

making triangles
Devi Acharya
committed
change of scene name
Devi Acharya
committed