29682 commits

Author	SHA1	Message	Date
Wayne Chen	0a7102b4d3	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-10-04 08:59:26 -07:00
Wayne Chen	d6af09ca62	ignoring entities in interstitial/saving address on 404 error	2018-10-03 17:40:42 -07:00
John Conklin II	4d7b2bb429	Merge pull request #14113 from Atlante45/feat/audio-mixer-throttle-equation ... Audio Mixer Scaling	2018-10-03 13:17:28 -07:00
John Conklin II	4805d3564a	Merge pull request #14075 from ctrlaltdavid/M18586 ... Teleport with play area	2018-10-03 11:02:33 -07:00
John Conklin II	8bd8d05409	Merge pull request #14118 from luiscuenca/handTouchLMFix ... Disable Hand Touch when Leap Motion is running	2018-10-03 09:03:43 -07:00
John Conklin II	658c74a1c6	Merge pull request #14080 from huffman/fix/111-models-not-being-resized ... Fix models with 1^3 dimensions never being resized	2018-10-02 14:11:45 -07:00
David Rowe	f7fd76b316	Merge branch 'master' into M18586 ... # Conflicts: # interface/src/scripting/HMDScriptingInterface.h	2018-10-02 16:49:16 +13:00
David Rowe	2f3a9412f3	Make highlight occlusion match overlay occlusion	2018-10-02 15:36:18 +13:00
Brad Hefta-Gaub	7c9464572a	Merge pull request #14027 from huffman/feat/deprecate-undo-stack ... Remove UndoStack API	2018-10-01 17:13:48 -07:00
John Conklin II	0ef407a45c	Merge pull request #14116 from sethalves/fix-bad-render-downcasts ... get asan to not complain about invalid downcasts during transaction.updateItem	2018-10-01 16:57:03 -07:00
John Conklin II	9cbd819a39	Merge pull request #13965 from ctrlaltdavid/M17428-f ... Mini tablet in palm	2018-10-01 16:56:36 -07:00
John Conklin II	3ab83731b9	Merge pull request #14087 from sethalves/quiet-asan ... fix several uninitialized reads	2018-10-01 16:48:54 -07:00
Brad Hefta-Gaub	e5d9c0d442	Merge pull request #14083 from sethalves/fix-recording-upload-crash ... call saveRecordingToAsset callback on correct thread	2018-10-01 16:46:36 -07:00
John Conklin II	87b39f690c	Merge pull request #14106 from jherico/fix/mac_gl1 ... Fix some Mac rendering issues	2018-10-01 16:35:57 -07:00
Seth Alves	c144671c97	Merge pull request #14110 from sethalves/fix-clang-7-build ... get interface building and working with clang-7 on ubuntu 18	2018-10-01 16:32:39 -07:00
Brad Hefta-Gaub	6290b56383	Merge pull request #14079 from luiscuenca/simpleAvatarTransit ... Simple avatar transit	2018-10-01 16:24:46 -07:00
Brad Hefta-Gaub	edd5db7768	Merge pull request #14042 from thoys/perf/create/getMultipleEntities ... Speed up Entity List properties fetching by adding Entities.getMultipleEntities API	2018-10-01 16:16:48 -07:00
Wayne Chen	8f36bc0850	Merge pull request #4 from danteruiz/interstitialMerged ... Interstitial screen updates	2018-10-01 15:43:04 -07:00
David Rowe	6ccd73ea47	Merge branch 'master' into M18586	2018-10-02 10:17:24 +13:00
Dante Ruiz	652ec2210d	fixing loading issues	2018-10-01 13:58:14 -07:00
luiscuenca	f3c89dd9d7	Same mutex	2018-10-01 13:08:14 -07:00
luiscuenca	c1aa5e9308	Add mutex to setter	2018-10-01 12:54:47 -07:00
luiscuenca	2c6003e40b	Add mutex	2018-10-01 11:44:08 -07:00
Clement	073b3ae57d	Merge branch 'master' of github.com:highfidelity/hifi into feat/audio-mixer-throttle-equation	2018-10-01 10:50:28 -07:00
luiscuenca	5ccbc5c029	Disable Hand Touch when Leap Motion is running	2018-10-01 10:47:06 -07:00
Wayne Chen	5f05be554f	check for hard refusal to 404	2018-10-01 10:06:13 -07:00
Wayne Chen	eab57633a5	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-10-01 09:21:26 -07:00
Seth Alves	90d9af35b5	minimize diff	2018-09-30 16:05:08 -07:00
Seth Alves	e30497595c	static_cast can be used here rather than dynamic	2018-09-30 15:49:42 -07:00
Seth Alves	f784b33eed	get asan to not complain about invalid downcast of EntityRenderer UpdateFunctor	2018-09-30 15:25:21 -07:00
Seth Alves	749b02cfb8	get asan to not complain about invalid downcast of CauterizedMeshPartPayload UpdateFunctor	2018-09-30 15:12:49 -07:00
John Conklin II	1135228b3b	Merge pull request #14095 from kencooke/audio-hrtf-reset ... Audio-mixer optimizations	2018-09-28 16:34:38 -07:00
John Conklin II	11492ce8ee	Merge pull request #14045 from sethalves/enterEntity-wait-for-script ... don't call enterEntity before the entity's script is loaded	2018-09-28 16:07:08 -07:00
Seth Alves	bbe9b5c26f	code review, remove some unneeded automoc includes	2018-09-28 16:04:40 -07:00
Clement	585c278400	streamline mix operation	2018-09-28 15:45:56 -07:00
Ken Cooke	ac6dd57a30	HRTF starts in silent state	2018-09-28 15:00:52 -07:00
Ken Cooke	2dc89f81a5	Add HRTF reset()	2018-09-28 15:00:52 -07:00
Stephen Birarda	88fd42010d	make sure the audio stream stats size is right	2018-09-28 14:54:50 -07:00
Stephen Birarda	dacf343e9a	reduce codec mismatch and starve log spam	2018-09-28 14:54:50 -07:00
Stephen Birarda	7d8b15ed75	move valid position check to packet processing	2018-09-28 14:54:50 -07:00
Stephen Birarda	371de312cc	enumerate a vector of mixable streams for each listener	2018-09-28 14:54:50 -07:00
Stephen Birarda	aed79b3b17	use a vector for ignored node IDs	2018-09-28 14:54:49 -07:00
Seth Alves	cb04894e33	try another way of fixing _spare warning	2018-09-28 14:53:05 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
John Conklin II	5d00aa0bdb	Merge pull request #14009 from sethalves/fix-worn-shape-double-scale ... fix scaling of worn shape entities	2018-09-28 13:08:46 -07:00
David Rowe	1c4bde3e84	Fix build warnings	2018-09-28 18:38:38 +12:00
David Rowe	545c2591e3	Merge branch 'master' into M18586	2018-09-28 16:19:44 +12:00
Bradley Austin Davis	3dea4fd10a	Fix some Mac rendering issues	2018-09-27 19:21:50 -07:00
David Rowe	2456fd0e99	Merge branch 'master' into M17428-f	2018-09-28 08:41:57 +12:00
Roxanne Skelly	af6db93b70	Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray	2018-09-27 12:05:21 -07:00