56016 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Atlante45	35a0c41cf5	Move Ktx processing to thread pool.	2017-06-16 14:31:56 -07:00
Chris Collins	a0cd210b60	Merge pull request #10724 from Atlante45/master ... Stable -> Master	2017-06-16 13:48:37 -07:00
Atlante45	69a5444993	Merge branch 'stable' of https://github.com/highfidelity/hifi	2017-06-16 13:43:41 -07:00
Chris Collins	f160034bf0	Merge pull request #10681 from zzmp/audio/parity ... Revamp audio device selection	2017-06-16 10:31:55 -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 Pomerantz	eb4255e1ac	fix audio checkbox bindings	2017-06-15 18:21:23 -04: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
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 Pomerantz	3093a73ce1	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-15 15:04:06 -04: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
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
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
Brad Davis	7a6df850c5	Fix crash on exit when tablet is open	2017-06-14 13:22:53 -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
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
Chris Collins	10d78e32f0	Merge pull request #10654 from highfidelity/RC-43 ... Beta Release 43 - Includes up to Developer Release 6661	2017-06-14 10:50:03 -07:00
Zach Pomerantz	969582c23d	clean audio device names	2017-06-14 09:04:22 -04:00
Zach Pomerantz	bc44e7beaf	bring qml to standard	2017-06-14 10:25:41 -04: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
David Rowe	be2bcb1c13	Turn with head roll in HMD when walking or flying	2017-06-14 12:20:46 +12:00
Zach Fox	bae27ec209	Merge pull request #10680 from zfox23/ZachRenderingImprovements1 ... Small rendering improvements based on spectator-camera changes	2017-06-13 17:18:43 -07:00
howard-stearns	6271b8ee7c	avatar whitelist	2017-06-13 16:56:18 -07: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
David Rowe	570ec8457d	Refactor	2017-06-14 10:45:30 +12:00
Brad Hefta-Gaub	88929c7bd7	Merge pull request #10679 from zzmp/audio/check-timer ... start device check timer	2017-06-13 15:37:50 -07:00
Zach Fox	79b6dc3f78	Remove one more instance of FramebufferCache	2017-06-13 15:26:07 -07:00
Zach Fox	52ea7e7994	Rendering improvements based on spectator-camera changes	2017-06-13 15:19:29 -07:00
Zach Pomerantz	b24681125d	rm debugging	2017-06-13 18:16:16 -04:00