29707 commits

Author	SHA1	Message	Date
Sam Gateau	c194e795ac	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-03 12:12:15 -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
sam gateau	da6e399161	INtroduce a safe destruction of the TBO defined when using a gpu::Buffer as REsourceBuffer in gl41 backend	2018-10-02 17:15:07 -07:00
sam gateau	680f5f5703	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-10-02 15:25:19 -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
sam gateau	5d0f2e3035	And more changes for better syntax and less useless stuff	2018-10-02 13:09:04 -07:00
sam gateau	e5df356774	Fixing warnings from jenkins	2018-10-02 12:38:14 -07:00
sam gateau	ff24a99032	Unify the the packing of the blendshape offset for simplicity and settle on the name DrawcallUniform	2018-10-02 11:18:20 -07:00
Sam Gateau	c95c736b1f	FOUnd a working path for gl41	2018-10-01 22:50:29 -07:00
Sam Gateau	d1d4920c35	Check and fixed the shader for nvidia regarding the unpacked variable name, adjust luci.js to be able to move the viewport	2018-10-01 21:35:18 -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
Sam Gateau	c593f00839	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-01 19:10:18 -07:00
sam gateau	392e2ff535	trying and failing andad trying and rince and repeat	2018-10-01 17:45:16 -07: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
David Rowe	6ccd73ea47	Merge branch 'master' into M18586	2018-10-02 10:17:24 +13: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
sam gateau	c12115bfda	Addressing the 4.1 pass and make sure it works on windows pc and mac	2018-10-01 11:51:46 -07:00
luiscuenca	2c6003e40b	Add mutex	2018-10-01 11:44:08 -07:00
luiscuenca	5ccbc5c029	Disable Hand Touch when Leap Motion is running	2018-10-01 10:47:06 -07:00
sam gateau	305ea80a18	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-10-01 08:37:19 -07:00
Sam Gateau	5842416ae6	Exploring the possible packing schemes and trying to debug the tangent	2018-09-30 23:11:36 -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
sam gateau	1ff4c54c1c	Packing normal and tangents	2018-09-28 17:49:52 -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
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
Sam Gateau	faf489855c	Packing the offsets and catching up performances	2018-09-28 02:13:08 -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
Sam Gateau	97de12fcbc	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-09-27 19:01:55 -07:00
sam gateau	eb97f0d193	Bringing back packed normal and tangents for static mesh!	2018-09-27 17:27:55 -07:00
sam gateau	215818e313	adjusting page size but still seeing a perf drop	2018-09-27 17:18:43 -07:00