19655 commits

Author	SHA1	Message	Date
Andrew Meadows	0181783290	Merge pull request #10064 from samcake/ambient ... Fix the sharp reflection happening after pr 10036 and bugs on backend 4.1	2017-03-31 16:04:00 -07:00
Seth Alves	cec02bbf6f	Merge pull request #10011 from humbletim/fix-rightclick-menu-again ... Fix right-click popup menus in web views	2017-03-31 15:48:11 -07:00
Chris Collins	b36f688a5a	Merge pull request #10089 from sethalves/tablet-ui-use-stylus-by-default ... use tablet-ui stylus as default, rather than avatar finger	2017-03-31 15:34:37 -07:00
Clément Brisset	9d0676dd87	Merge pull request #10088 from huffman/stable-merge ... Stable merge	2017-03-31 14:27:42 -07:00
Seth Alves	8d4982d794	Merge pull request #10087 from druiz17/tablet-webView ... Better webview handing for the tablet	2017-03-31 13:26:56 -07:00
Seth Alves	54c66aff07	use tablet-ui stylus as default, rather than avatar finger	2017-03-31 13:18:40 -07:00
Dante Ruiz	70d2d69557	Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView	2017-03-31 19:29:31 +01:00
Dante Ruiz	9658e1b8ac	better web view handling	2017-03-31 19:25:03 +01:00
Dante Ruiz	b6901bba3e	added tabletWebView.qml	2017-03-31 18:48:08 +01:00
Sam Cake	dd73cb7b8e	Use a magic number gpu::Texture::SINGLE_MIP instead of 1	2017-03-30 23:46:37 -07:00
Dante Ruiz	8f402c73b0	saving work 2.0	2017-03-31 01:18:31 +01:00
Ryan Huffman	150dcd7dec	Merge remote-tracking branch 'upstream/master' into stable-merge	2017-03-30 14:22:27 -07:00
David Rowe	985a804fe9	Merge branch 'master' into 21242	2017-03-31 08:03:05 +13:00
samcake	e6d30fbb2f	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-03-29 18:22:47 -07:00
David Rowe	06910d1881	Add comment re scrollbar stability in tablet	2017-03-30 14:20:02 +13:00
David Rowe	f954767b84	Get entities list and entity properties scrollbars working on tablet	2017-03-30 14:04:03 +13:00
samcake	b6504bba56	Moving the num mips per texture to the creator so it s immutable and simpler	2017-03-29 17:58:56 -07:00
Dante Ruiz	cb8660c699	saving work	2017-03-30 01:34:14 +01:00
Anthony J. Thibault	332dfa098f	Fix for disappearing toolbar after reload all scripts	2017-03-29 14:10:26 -07:00
Delamare2112	3ebe1a0015	Add AvatarInputs::loudnessToAudioLevel	2017-03-29 14:01:27 -07:00
Delamare2112	2f6add3398	Expose LimitlessSpeechRecognition to scripts	2017-03-29 12:56:08 -07:00
Delamare2112	4f7cbd5b7c	Add limitless connection and scripting interface	2017-03-29 12:47:58 -07:00
samcake	9bc7e41642	Remove extra calls for binding default textures, not needed	2017-03-29 10:57:08 -07:00
Seth Alves	8dcbf33e16	Merge pull request #10041 from druiz17/tablet-improve-goto ... added left out design elements to the tablet goto page	2017-03-28 17:19:50 -07:00
Dante Ruiz	a76e5ef8d9	improve the design of the tablet goto	2017-03-28 23:02:23 +01:00
Seth Alves	6df4dda746	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 11:42:14 -07:00
Seth Alves	39ec53d69a	Merge pull request #10032 from hyperlogic/bug-fix/null-tablet-proxy ... Mark the system TabletProxy object as Cpp ownership.	2017-03-28 10:08:05 -07:00
Seth Alves	9e675d4c93	Merge pull request #9990 from hyperlogic/bug-fix/sliders ... Added inputMode property to Web3DOverlay	2017-03-28 10:07:37 -07:00
Anthony J. Thibault	ec6ef01600	Mark the system TabletProxy object as Cpp ownership. ... This should prevent the problem where the QML engine erroneously thinks the QObject has been collected/destroyed.	2017-03-28 09:53:00 -07:00
Andrew Meadows	60b8dbfce1	Merge pull request #10026 from AndrewMeadows/cleanup-fbx ... reduce memory bandwitdh to GPU for skinned meshes	2017-03-28 08:55:06 -07:00
Seth Alves	b50a02ea19	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 08:16:59 -07:00
Chris Collins	83aa7358e2	Merge pull request #9998 from birarda/bug/oculus-buttons-flipped ... fix swapped buttons in oculus touch graphic	2017-03-28 06:50:20 -07:00
Seth Alves	c013813161	Merge pull request #10027 from druiz17/tablet-disable-vto ... Remove visibleToOthers option for the tablet from general settings	2017-03-27 16:28:23 -07:00
Dante Ruiz	65be71fa69	min diff	2017-03-28 00:05:02 +01:00
Dante Ruiz	7434cc5644	force vto to false on start up	2017-03-28 00:02:02 +01:00
Dante Ruiz	02535722ba	removed visible to others opition from general settings	2017-03-27 23:31:41 +01:00
Dante Ruiz	018138f422	fixed some issues with tablet help	2017-03-27 22:46:06 +01:00
Andrew Meadows	18544581e6	remove warnings about implicit float cast	2017-03-27 14:40:31 -07:00
Brad Hefta-Gaub	c986077a4f	Merge pull request #10007 from hyperlogic/feature/ik-debug-draw ... Added Developer > Avatar > Show IK Targets	2017-03-27 14:29:02 -07:00
Seth Alves	9c990b0358	Merge pull request #10018 from druiz17/tablet-login ... Show login screen in tablet at startup if not logged in and connecting to a domain that requires login	2017-03-27 10:10:41 -08:00
Dante Ruiz	cba7adf32a	removed qDebug	2017-03-27 19:08:41 +01:00
Seth Alves	48ea9acfb3	Merge pull request #10016 from druiz17/tablet-goto ... Porting goto to the tablet	2017-03-27 10:04:11 -08:00
Dante Ruiz	f4255735a9	make login screen show up on the tablet on startup	2017-03-27 18:03:38 +01:00
Dante Ruiz	b8eac7abef	revoming useless code	2017-03-27 16:17:50 +01:00
Seth Alves	bb28976d0e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-26 09:32:35 -07:00
humbletim	59008e4a40	remove old ../../qml/menus import	2017-03-25 18:37:36 -04:00
Seth Alves	3abd6b3948	Merge pull request #10006 from druiz17/tablet-help ... Ported help into the tablet	2017-03-25 08:33:41 -08:00
Vladyslav Stelmakhovskyi	edb66ae704	Merge branch 'tablet-ui' into tablet-ui-audio-screen	2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi	fc23c348cb	Implemented Audio settings screen for Tablet UI	2017-03-25 13:17:38 +01:00
Dante Ruiz	2a59139c76	trying to fix focus issue	2017-03-25 01:17:37 +01:00