56045 commits

This branch

This branch

All branches

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
Thijs Wenker	87a6b16d16	Merge pull request #10713 from huffman/feat/remove-tutorial ... Remove /tutorial in favor of new repo	2017-06-16 01:18:40 +02:00
Stephen Birarda	c7e37a09fb	Merge pull request #10710 from seefo/fb5376 ... Fixed a bug where custom port wasn't used in AC when passed through CLI	2017-06-15 15:38:11 -07:00
Zach Fox	130d98fcfc	Merge pull request #10708 from zfox23/spectatorCamera_fixMonitorDisplay ... Ensure monitor never shows frozen SpectatorCamera preview	2017-06-15 15:35:31 -07:00
Ryan Huffman	154b33bddb	Remove /tutorial in favor of new repo ... Tutorial code has been moved to a new hifi-tutorial repo	2017-06-15 15:17:45 -07:00
seefo	6d480600d8	Fixed a bug where custom port wasn't used in AC when passed through CLI	2017-06-15 14:59:36 -07:00
Chris Collins	a1933b535d	Merge pull request #10704 from sethalves/remove-chat-from-default-scripts ... remove chat from default scripts	2017-06-15 14:44:47 -07:00
Zach Fox	eef4c9d747	Merge pull request #10706 from zfox23/spectatorCamera_cauterizedFix ... Show MyAvatar's head in the SpectatorCamera view!	2017-06-15 13:49:13 -07:00
Zach Fox	d7a9354b37	More CR comments; rename function	2017-06-15 13:25:16 -07:00
Zach Fox	70569021a8	Merge pull request #10697 from zfox23/spectatorCamera_HMDOnly ... Make the Spectator button only appear in HMD (also add a debug mode for devs)	2017-06-15 13:20:56 -07:00
Andrew Meadows	5e0be1a823	Merge pull request #10662 from ctrlaltdavid/21394 ... Smoothly ease hands from uncontrolled to controlled positions	2017-06-15 13:17:26 -07:00
Zach Fox	1088d248e3	Howard's CR comments	2017-06-15 13:13:58 -07:00
Zach Fox	834a2a5c3b	Ensure monitor never shows frozen SpectatorCamera preview	2017-06-15 12:49:09 -07:00
Zach Fox	47e5fb56d3	Show MyAvatar's head in the SpectatorCamera view!	2017-06-15 11:31:20 -07:00
Brad Hefta-Gaub	0597c3105f	Merge pull request #10705 from ZappoMan/moreAudioFixes ... fix no audio device from previously removed audio device	2017-06-15 11:04:14 -07:00
Zach Fox	68662bb209	Bugfixes	2017-06-15 10:20:17 -07:00
Zach Fox	a795822919	Comments and disable camera when switching	2017-06-15 10:09:28 -07:00
Zach Fox	498ed4cbe8	showSpectatorInDesktop true for now	2017-06-15 10:09:28 -07:00
Zach Fox	0114962e75	Make the Spectator button only appear in HMD (with debug mode)	2017-06-15 10:09:28 -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
Seth Alves	023ca85623	remove chat from default scripts	2017-06-15 09:27:43 -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
Brad Hefta-Gaub	c807827a36	Merge pull request #10693 from seefo/master ... Incomplete sandbox content updates are now removed and reperformed	2017-06-14 19:32:01 -07:00
Andrew Meadows	9c928f16b2	Merge pull request #10632 from Atlante45/fix/node-leak ... Fix SharedNodePointer leak	2017-06-14 17:03:52 -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
seefo	9fa21fc79f	Incomplete sandbox content updates are now removed and reperformed	2017-06-14 14:45:25 -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
howard-stearns	665870b846	comment per cr	2017-06-14 12:06:29 -07:00
howard-stearns	2deb26551f	typos in comments/help-strings	2017-06-14 11:56:47 -07:00
Zach Fox	03c61e2191	vFoV and clipping plane distances now come from config	2017-06-14 11:53:05 -07:00
Atlante45	5777b5e805	Create one packet per node	2017-06-14 11:42:25 -07:00
Atlante45	3cc2396021	CR	2017-06-14 11:42:25 -07:00
Atlante45	a15660993d	Fix comment	2017-06-14 11:42:25 -07:00
Atlante45	61eb93af35	Fix SharedNodePointer leak	2017-06-14 11:42:25 -07:00
howard-stearns	b3091de536	forgot proper initial value of flag after changing whitelist to be actual ... list	2017-06-14 11:16:55 -07:00
Stephen Birarda	1baff8af33	Merge pull request #10686 from seefo/fb4958 ... Resolved FB4958	2017-06-14 11:14:37 -07:00
Zach Fox	ec3b488897	Remove SECONDARY_CAMERA_RENDER_MODE for now	2017-06-14 10:27:08 -07:00
Howard Stearns	15a5464bab	Merge pull request #10682 from zfox23/PAL_fixTabBackgroundColor ... Make the PAL's tab background color white	2017-06-13 20:50:13 -07:00
David Rowe	e3b4e4aa20	Disable print statements	2017-06-14 15:37:36 +12: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
seefo	74066647c6	Resolved FB4958	2017-06-13 18:01:53 -07:00
David Rowe	395d40f0f9	Fix script default to match C++ default	2017-06-14 12:21:19 +12:00