Refixed scaled collisions.
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop
Merge branch 'develop' into feature/splitscreen
Pulses have wavy trails and animation components
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into feature/generative_experiments

Conflicts: (Used Arun's)
	Assets/Scripts/PulseShot.cs
Soooo broken.
minor changes
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop
Mostly fixed integration of dynamic camera. Player special masks are visible for some reason.
Merge branch 'feature/splitscreen' into develop
Fixed special visibility stencil for split screens.
Color Fixes.
More failed attempts to prevent scale tunneling.
Rechecked prototype spin.
Minor tweaks.
More tweaks.
Wow, rigidbody makes this stuff waaaaay easier than character controller.
Added cube puzzle, and discovered that particle effect velocities can be manipulated through script.
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop

Conflicts:
	Assets/Scenes/prototype.unity
Added mouse aiming to keyboard controls.