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
added multiple partner following feature
Merge branch 'develop' of https://github.com/bro9918/Conversation_Drawer into develop

Conflicts:
	Assets/Player with Tail.prefab
	Assets/Prefabs/Globals.prefab
	Assets/Prefabs/Partner.prefab
	Assets/Prefabs/Player.prefab
	Assets/Scenes/Points.unity
	Assets/Scenes/controller_hookup.unity
	Assets/Scenes/feedback.unity
	Assets/Scenes/partner with controller.unity
	Assets/Scenes/partner.unity
	Assets/Scenes/world.unity
	Assets/Scripts/WaypointSeek.cs
	ProjectSettings/GraphicsSettings.asset
	ProjectSettings/TagManager.asset
Extra feedback and potential textures added
Added triangle trail prefab and updated firework
Forgot to save from previous update
Added bounce off of touchy subjects
Merge branch 'feature/OneWayPartner' into develop
Merge branch 'develop' of https://github.com/setrapp/Conversation_Drawer-Production into develop

Conflicts:
	Assets/Prefabs/Partner.prefab