broken
nothing
Merge branch 'develop' of https://github.com/setrapp/Conversation_Drawer-Production into feature/merge

Conflicts:
	Assets/Prefabs/Cursor.prefab
	Assets/Prefabs/Globals.prefab
	Assets/Prefabs/Partner.prefab
	Assets/Prefabs/Waypoint.prefab
	Assets/Scenes/controller_hookup.unity
	Assets/Scenes/partner with controller.unity
	Assets/Scenes/partner.unity
	Assets/Scripts/WaypointSeek.cs
	ProjectSettings/GraphicsSettings.asset
	ProjectSettings/TagManager.asset
Partially fixed waypoints, some errors still exist
Merge branch 'feature/merge' into feature/waypoints

Conflicts:
	Assets/Prefabs/Partner.prefab
	Assets/Prefabs/Player.prefab
	Assets/Scenes/Points.unity
	Assets/Scenes/drag.unity
	Assets/Scenes/feedback.unity
	Assets/Scenes/partner.unity
	Assets/Scenes/waypoints.unity
	ProjectSettings/GraphicsSettings.asset
	ProjectSettings/TagManager.asset
Merge branch 'feature/waypoints' into develop
Made trail more of a cone and check player following based on an approximation of that cone.
Basic back and forth is possible.
Partners slow down to yield and let other take lead.
Require partner to have high enough score to overtake.
Base score on how long the partner is within distance to overtake.
Started adding tail.
added orbit feature into waypointseek script
Using tails to fade line drawing smoothly between stop and go.
Merge branch 'feature/back_and_forth' into develop
Merge branch 'develop' of https://github.com/setrapp/Conversation_Drawer-Production into develop

Conflicts:
	Assets/Scripts/WaypointSeek.cs
Altering tail following to actually reach yield proximity.
Basing conversation title distance off of conversation variables.
Making tailed characters the default.
Recovered lost code and half fixed tail rotation.
Merge branch 'feature/storyteller' into develop