51947 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	aa4cbe2892	Merge branch 'fix-tablet-qml-overlay-in-hmd' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-07 12:10:20 -08:00
Seth Alves	694fc58374	restore missing shading pipeline for simple opaque in deferred	2017-03-07 12:07:24 -08:00
Seth Alves	b938579598	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 11:42:44 -08:00
Andrew Meadows	1e9623e2f2	Merge pull request #9813 from druiz17/multipule-audio-fix ... removed duplicated audio devices	2017-03-07 10:00:48 -08:00
Brad Hefta-Gaub	d8b7076a9e	Merge pull request #9816 from AndrewMeadows/sphere-means-sphere ... ModelEntityItems that use 'sphere' for shapeType should collide as true spheres	2017-03-07 09:53:52 -08:00
Seth Alves	df2e73c2f0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 09:44:41 -08:00
Howard Stearns	f0fd29abd3	Merge pull request #9815 from davidkelly/dk/3377 ... Retain selection in PAL when sorting or reloading	2017-03-07 09:38:07 -08:00
Seth Alves	f594689fa8	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 09:24:50 -08:00
Brad Hefta-Gaub	69a8ea99ca	Merge pull request #9823 from vladest/qml_js_in_qtcreator ... Adding ability for QML/JS file to be visible in QtCreator. Also chang…	2017-03-07 09:20:51 -08:00
David Kelly	b760e86226	rest of cr feedback	2017-03-07 10:17:32 -07:00
David Kelly	c6dbfc85f0	cr feedback	2017-03-07 09:54:00 -07:00
Vladyslav Stelmakhovskyi	2d2b2094fd	Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination	2017-03-07 10:11:09 +01:00
Andrew Meadows	8c773483cf	Merge pull request #9820 from Atlante45/fix/avatar-lean ... Fix avatar lean	2017-03-06 22:18:34 -08:00
Brad Hefta-Gaub	b111bcb826	Merge pull request #9818 from ctrlaltdavid/21205 ... Remove Developer > Network > Bandwith Details dialog	2017-03-06 22:02:33 -08:00
Atlante45	ff9d6d657c	Remove weighted offset, special case downward pressure	2017-03-06 19:41:08 -08:00
David Rowe	51739f2f99	Remove Developer > Network > Bandwith Details dialog	2017-03-07 15:02:26 +13:00
Andrew Meadows	d749c0c8be	use fabsf() rather than fabs()	2017-03-06 15:50:32 -08:00
Andrew Meadows	10b3e7fc67	sphere shapeType for models means 'sphere'	2017-03-06 15:14:51 -08:00
David Kelly	3d39aae35b	minor tweak - just in case	2017-03-06 15:52:33 -07:00
David Kelly	f23f882595	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3377	2017-03-06 15:26:21 -07:00
David Kelly	e14a1ad1af	minor cleanup	2017-03-06 15:26:03 -07:00
David Kelly	db036d997c	first pass	2017-03-06 15:18:35 -07:00
Dante Ruiz	fc65723d68	corrected removing duplicate devices	2017-03-06 22:14:20 +00:00
Zach Fox	5223f872c1	Merge pull request #9753 from zfox23/FB_3234_TakeTwo ... Optimize AvatarMixer with respect to Identity and Avatar Data	2017-03-06 13:37:29 -08:00
Andrew Meadows	1b8f6b9835	Merge pull request #9784 from samcake/blue ... Fixing Emissive on overlay for models (opaque and transparent)	2017-03-06 13:24:00 -08:00
samcake	21f36d7212	removing comments and restoring the correct behavior for Pal.js	2017-03-06 12:41:00 -08:00
Seth Alves	4886f1cbfc	don't run stylus-on-overlay code unless the overlay is a web3d overlay	2017-03-06 12:38:19 -08:00
Brad Hefta-Gaub	38668b6ce5	Merge pull request #9812 from sethalves/dont-auto-ungrab-overlays ... don't automatically unhook overlays from hands unless they were grabbable overlays	2017-03-06 12:32:18 -08:00
Thijs Wenker	6ded937b25	Merge pull request #9809 from Menithal/21201 ... WL#21201 Snap-together Magnetic blocks	2017-03-06 21:30:53 +01:00
Seth Alves	27066e89a6	Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-06 11:46:19 -08:00
Seth Alves	a2d2c41f02	remove debug print	2017-03-06 11:45:49 -08:00
Menithal	01ba44c572	Fixed print	2017-03-06 21:32:27 +02:00
Seth Alves	08e2e421e4	Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js	2017-03-06 11:08:27 -08:00
Seth Alves	eb47db4441	Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-06 11:07:22 -08:00
Menithal	d50a0e33a9	CR. Run through Lint ECMAScript 5 standard ... Meaning all const are out, non-variable definitions are out, etc	2017-03-06 21:07:16 +02:00
Seth Alves	4b02e550db	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-06 11:07:12 -08:00
Seth Alves	8a614bf0b3	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-03-06 11:07:05 -08:00
Andrew Meadows	6ea6477c73	Merge pull request #9683 from jherico/cache_flush ... Clear caches on domain switch	2017-03-06 11:05:44 -08:00
Dante Ruiz	b6671d92c8	removed duplicated audio devices	2017-03-06 18:46:57 +00:00
Seth Alves	6ac576c9e6	Merge branch 'master' of github.com:highfidelity/hifi into dont-auto-ungrab-overlays	2017-03-06 10:43:43 -08:00
Seth Alves	19a31d7630	don't automatically unhook overlays from hands unless they were grabbable overlays	2017-03-06 10:15:53 -08:00
Zach Fox	0000b8fb21	OMG I think it's actually fully working	2017-03-06 10:03:42 -08:00
Zach Fox	685bd95105	I think I'm done. Not straightforward!	2017-03-06 10:03:42 -08:00
Zach Fox	5418a7c230	Important addition before rebase	2017-03-06 10:03:42 -08:00
Zach Fox	5fa5e6e0a7	First pass at implementing Brad's simplification ideas	2017-03-06 10:03:42 -08:00
Zach Fox	fda87b3a53	Quick cleanup	2017-03-06 10:03:42 -08:00
Zach Fox	8bdbbd4b25	CR feedback 1	2017-03-06 10:03:41 -08:00
Zach Fox	718ecea404	Potential non-spammy solution using pseudo-state	2017-03-06 10:03:41 -08:00
Zach Fox	cfb8534d71	Comment	2017-03-06 10:03:41 -08:00
Zach Fox	9969d422d6	Cleanup	2017-03-06 10:03:41 -08:00