7 commits

Author	SHA1	Message	Date
Brad Davis	070fb25b80	Cleaning up differnces from master	2019-02-07 13:33:28 -08:00
Brad Davis	c46d73128b	Merge branch 'feature/quest_frame_player' into feature/quest	2019-01-30 16:16:51 -08:00
Bradley Austin Davis	f45166f508	Fix mac frame player	2019-01-30 14:45:31 -08:00
Brad Davis	ab9a4a55f8	Allow movement in frameplayer app	2019-01-30 13:15:22 -08:00
Brad Davis	f1d3fc36e5	Cleaning up pre-master merge	2019-01-28 15:52:36 -08:00
Brad Davis	b1e4e17f47	Santa Cruz	2019-01-28 15:52:36 -08:00
Brad Davis	e18e3fc138	Gpu Frame serialization	2019-01-23 13:21:34 -08:00