started throwing together  our "character controller"
Merge branch 'master' of https://github.com/dimmondslice/TeamPlaceholder

Conflicts:
	TeamPlaceHolderGame/Assembly-CSharp-vs.csproj
	TeamPlaceHolderGame/Assembly-CSharp.csproj
	TeamPlaceHolderGame/TeamPlaceHolderGame-csharp.sln
	TeamPlaceHolderGame/TeamPlaceHolderGame.sln
	TeamPlaceHolderGame/TeamPlaceHolderGame.userprefs
shhhh theres nothing here
getting pulls
Merge branch 'master' of https://github.com/dimmondslice/TeamPlaceholder

Conflicts:
	TeamPlaceHolderGame/TeamPlaceHolderGame-csharp.sln
	TeamPlaceHolderGame/TeamPlaceHolderGame.sln
	TeamPlaceHolderGame/TeamPlaceHolderGame.userprefs
Finally got a "finished" character to play around with. Everything should work except jumping is weird at the moment. you can switch between perceptions with keys 1-6
just put a pink debug ray there
Merge branch 'master' of https://github.com/dimmondslice/TeamPlaceholder

Conflicts:
	TeamPlaceHolderGame/Assets/Prefabs/static objects/2x2x1_doublesided_stairs.mb.meta
	TeamPlaceHolderGame/Assets/Prefabs/static objects/4_way_tunnel.mb.meta
	TeamPlaceHolderGame/Assets/Prefabs/static objects/4x1x3_archway.mb.meta
	TeamPlaceHolderGame/Assets/Prefabs/static objects/4x1x3_doorway.mb.meta
	TeamPlaceHolderGame/Assets/Prefabs/static objects/90_degree_tunnel_bend.mb.meta
	TeamPlaceHolderGame/Assets/Prefabs/static objects/bridge_endcap.mb.meta
	TeamPlaceHolderGame/Assets/Prefabs/static objects/doorway.mb.meta
	TeamPlaceHolderGame/Assets/Prefabs/static objects/editable_doorway.mb.meta
	TeamPlaceHolderGame/Assets/Prefabs/static objects/tunnel.mb.meta
	TeamPlaceHolderGame/TeamPlaceHolderGame-csharp.sln
	TeamPlaceHolderGame/TeamPlaceHolderGame.sln
	TeamPlaceHolderGame/TeamPlaceHolderGame.userprefs
still merging. what's with all these meta files?