20640 commits

Author	SHA1	Message	Date
Zach Fox	8cf9c8708d	Allow user to click left thumbstick to switch 'MONITOR SHOWS'	2017-06-16 10:08:58 -07:00
Zach Fox	416ebaa2e8	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-16 10:08:10 -07:00
Zach Fox	47e5fb56d3	Show MyAvatar's head in the SpectatorCamera view!	2017-06-15 11:31:20 -07:00
Zach Fox	60549075dd	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-15 10:09:07 -07:00
ZappoMan	d352163d77	fix no audio device from previously removed audio device	2017-06-15 09:24:14 -07:00
Brad Hefta-Gaub	035a9e898f	Merge pull request #10684 from howard-stearns/avatar-whitelist ... avatar whitelist	2017-06-15 08:45:16 -07:00
druiz17	347f020b04	Merge pull request #10692 from jherico/fix_tablet_crash ... Fix crash on exit when tablet is open	2017-06-15 08:15:02 -07:00
Andrew Meadows	becb968a75	Merge pull request #10685 from ctrlaltdavid/21327-b ... Use HMD roll angle to turn while flying or walking in HMD	2017-06-14 16:56:29 -07:00
Zach Fox	f214712b33	Merge pull request #10678 from zfox23/spectatorCamera_improvements1 ... Secondary camera and rendering improvements	2017-06-14 14:39:38 -07:00
David Rowe	16bebdd409	Rename identifiers	2017-06-15 09:20:55 +12:00
David Rowe	55e0082792	Code review	2017-06-15 09:10:08 +12:00
Zach Fox	6b6b6026a4	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-14 13:44:13 -07:00
Brad Davis	7a6df850c5	Fix crash on exit when tablet is open	2017-06-14 13:22:53 -07:00
Zach Fox	8a217acd2b	Defaults for camera projection parameters	2017-06-14 12:19:38 -07:00
Zach Fox	03c61e2191	vFoV and clipping plane distances now come from config	2017-06-14 11:53:05 -07:00
Zach Fox	ec3b488897	Remove SECONDARY_CAMERA_RENDER_MODE for now	2017-06-14 10:27:08 -07:00
Howard Stearns	87f3ce7699	reset avatar on domain change if the last domain imposed something on us	2017-06-13 19:30:01 -07:00
David Rowe	be2bcb1c13	Turn with head roll in HMD when walking or flying	2017-06-14 12:20:46 +12:00
David Rowe	05f19d54f4	Add HMD roll control JavaScript API	2017-06-14 11:55:04 +12:00
Zach Fox	37e72f25a3	Make the PAL's tab background color white	2017-06-13 16:04:14 -07:00
Zach Fox	7b6033f7bc	Getting closer to a solution	2017-06-13 11:37:27 -07:00
Zach Fox	4acbb81413	Checkpoint	2017-06-13 10:22:48 -07:00
Zach Fox	ec162327a2	Merge branch 'spectator-camera' into flash	2017-06-13 10:22:02 -07:00
Zach Fox	7d1a7f4c0b	Merge branch 'master' of https://github.com/highfidelity/hifi into ... spectator-camera - INCLUDING MERGE CONFLICT FIXES	2017-06-13 09:42:14 -07:00
Sam Cake	f973f7b5e3	Fix the background not rendering on the second frame, this was imply due to a bug in the GLBackend	2017-06-12 21:25:27 -07:00
Brad Davis	db8bdbc0a6	Merge pull request #10659 from samcake/orange ... simple Render Engine refactors coming from the Spectator Cam project	2017-06-12 20:31:07 -07:00
Brad Hefta-Gaub	0a84a75bde	Merge pull request #10650 from jherico/web_event_handlers ... Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 19:23:01 -07:00
Seth Alves	aeaddd23c7	Merge pull request #10658 from seefo/fb5087 ... Resolved FB5087	2017-06-12 17:25:05 -07:00
Brad Hefta-Gaub	347742be1b	Merge pull request #10601 from birarda/mannequin-avatar ... Update default avatar to baked mannequin	2017-06-12 16:42:37 -07:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Andrew Meadows	321e307c9f	Merge pull request #10609 from 1P-Cusack/21317 ... WL21317 helper functions for getting into avatar coordinate space	2017-06-12 11:18:29 -07:00
seefo	cb5a114145	Fixed Ubuntu warning	2017-06-12 10:47:55 -07:00
Chris Collins	4b6c13bc1f	Merge pull request #10646 from ZappoMan/debugAudioProblems ... Fix for no-audio on clean install	2017-06-10 11:32:42 -10:00
samcake	bb38938534	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-09 14:34:25 -07:00
Stephen Birarda	8bc7ce6357	put back defaultAvatar_full.fst mode to 644	2017-06-09 13:55:57 -07:00
ZappoMan	6fe20f90a3	add better debugging for audio problems ... use OS default device if settings have no values	2017-06-09 13:36:12 -07:00
seefo	0343d4e443	Resolved FB5087	2017-06-09 13:33:46 -07:00
Seth Alves	3f425a5f02	Merge pull request #10649 from sethalves/fix-head-puck-broken-eyes ... Fix head puck broken eyes	2017-06-09 12:50:53 -07:00
Zach Fox	fd50434d86	New camera model; Cleanup; Bashing head :against desk	2017-06-09 11:42:16 -07:00
Zach Fox	5114fd8e1f	Rename correctly?	2017-06-09 11:39:28 -07:00
Zach Fox	7aef4dab4c	Variable renaming pass	2017-06-09 11:39:28 -07:00
Zach Fox	a4f5d327a2	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-09 11:38:35 -07:00
Zach Fox	12e5fc20f7	Merge pull request #10653 from samcake/flash ... Spectator-camera : Provide a way to render the side camera always mono	2017-06-09 11:34:37 -07:00
Seth Alves	5b62c9e83b	try again to get forward not-looking-at-anyone gaze to work right	2017-06-09 10:45:04 -07:00
seefo	dc02e34782	Resolved FB#5009	2017-06-09 10:23:53 -07:00
Seth Alves	197fb620d4	Merge branch 'master' of github.com:highfidelity/hifi into fix-head-puck-broken-eyes	2017-06-09 09:28:07 -07:00
Chris Howe	08d93173f0	Minor code feedback changes, moving test scripts to developer/tests.	2017-06-09 11:07:56 -04:00
Anthony Thibault	e3c342aa77	Merge pull request #10595 from hyperlogic/feature/spine-spline ... Spline IK target support	2017-06-08 18:09:55 -07:00
samcake	4c8eec4e16	Introducing a way to prevent a frame to render in stereo accross batches	2017-06-08 17:38:26 -07:00
Seth Alves	485df396ef	Merge pull request #10628 from jherico/qt59 ... Fixes for Qt 5.9 compatibility	2017-06-08 16:51:08 -07:00