19167 commits

Author	SHA1	Message	Date
Dante Ruiz	4a5be4238e	messages and file dialogs in tablet	2017-02-24 00:19:32 +00:00
Dante Ruiz	93ae93a45a	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-23 15:43:24 +00:00
Dante Ruiz	3ba605bf23	saving work	2017-02-23 00:28:30 +00:00
Seth Alves	a6b4f07674	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-22 12:07:31 -08:00
Seth Alves	5bff2034c3	cleanups, attempt to get particle explorer to work right	2017-02-22 12:07:18 -08:00
Chris Collins	c967f9383a	Merge pull request #9706 from ZappoMan/avatarMixerLoopImprovements ... Multi-core Avatar Mixer	2017-02-22 11:20:28 -08:00
Seth Alves	84b93826d0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-22 09:30:16 -08:00
Seth Alves	a8de6c8c93	Merge pull request #9723 from hyperlogic/bug-fix/tablet-ui-reload-script-bug ... Fix for system toolbar hiding when scripts are reloaded	2017-02-22 07:34:20 -08:00
Anthony J. Thibault	379b7bc56d	Fix for system toolbar hiding when scripts are reloaded	2017-02-21 17:24:22 -08:00
Brad Hefta-Gaub	97fc88491f	Merge pull request #9718 from AndrewMeadows/sort-avatars-correctly ... fix sorting algorithm for avatar render updates	2017-02-21 16:14:12 -08:00
Andrew Meadows	dd447689e0	expose avatar sort coefficients for fine tuning	2017-02-21 15:09:44 -08:00
Seth Alves	3b181eb803	code review	2017-02-21 13:56:28 -08:00
Andrew Meadows	27dd82b517	fix sorting algorithm for avatar render updates	2017-02-21 13:34:07 -08:00
Dante Ruiz	f58a018c64	fixing merge conflicts	2017-02-21 15:46:41 +00:00
Brad Hefta-Gaub	ec8a95037d	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements	2017-02-20 17:01:29 -08:00
Seth Alves	43f47c1106	merge from upstream	2017-02-20 12:45:39 -08:00
Seth Alves	70c9853189	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-20 12:38:13 -08:00
Seth Alves	4a650ff2bb	Overlays::getOverlayAtPoint was depending on the order in which the overlays were added	2017-02-19 18:37:35 -08:00
Brad Hefta-Gaub	fa0749b494	Merge pull request #9696 from ctrlaltdavid/21168 ... Add finger painting script	2017-02-19 11:37:25 -08:00
Seth Alves	ea03f41b57	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-18 10:32:11 -08:00
Brad Hefta-Gaub	42d916a719	fix warnings	2017-02-17 21:58:48 -08:00
Brad Hefta-Gaub	291b823cfa	const cleanup and fix crash	2017-02-17 18:28:07 -08:00
David Rowe	2c02b42c96	Finger paint button icon files	2017-02-18 14:21:54 +13:00
Chris Collins	ec07969c0b	Merge pull request #9703 from kunalgosar/logDisplayMode ... Logging HMD/Desktop Transitions	2017-02-17 17:07:02 -08:00
David Rowe	784009a9fa	Merge branch 'master' into 21168	2017-02-18 13:20:39 +13:00
Seth Alves	def669364b	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-17 15:45:19 -08:00
Seth Alves	d7bb6f105b	make tablet part IDs available through qApp	2017-02-17 15:43:20 -08:00
Dante Ruiz	3f8ea4ac54	fixed merge conflict	2017-02-17 23:33:39 +00:00
kunalgosar	b8b5927351	Logging display mode changes	2017-02-17 13:21:01 -08:00
Seth Alves	39e1edafd2	merge from upstream	2017-02-17 13:16:12 -08:00
Seth Alves	5ddcbae934	save tablet web-overlay ID in HMD interface. don't trigger edit affordances if the click was intented for the tablet	2017-02-17 11:51:23 -08:00
Seth Alves	47cdade1e9	fix home-button on tablet	2017-02-17 11:47:37 -08:00
Anthony J. Thibault	5963c6ddc3	Fix for toolbar visibility after snapshots.	2017-02-17 11:04:04 -08:00
Dante Ruiz	dedd85d296	saving work	2017-02-17 18:47:59 +00:00
Seth Alves	4c1f5c1dc8	Merge branch 'overlays-uuid' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-02-17 09:58:58 -08:00
Seth Alves	0d10667bb4	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-17 09:58:33 -08:00
Seth Alves	2b02998fae	hook up overlaysToDiscard and overlaysToInclude in Overlays::findRayIntersection	2017-02-17 09:47:40 -08:00
Seth Alves	81f6344023	allow overlays to be parents	2017-02-17 09:36:00 -08:00
Dante Ruiz	08ffa18008	Merge branch 'master' into menuFix	2017-02-17 15:53:33 +00:00
Dante Ruiz	80551cf0dd	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-17 15:50:27 +00:00
Dante Ruiz	3189b44612	refreshing with master	2017-02-17 15:50:08 +00:00
David Rowe	585691f71c	Add finger painting button to tablet	2017-02-17 19:29:11 +13:00
Seth Alves	05c135b9d8	uuid keys for overlays appears to work	2017-02-16 21:22:23 -08:00
Seth Alves	c1e41311fc	working toward using uuids for overlay IDs	2017-02-16 17:18:09 -08:00
Anthony J. Thibault	cffdecbf68	Merge branch 'master' into feature/toolbar-tablet-switcheroo	2017-02-16 16:28:43 -08:00
Dante Ruiz	628b97bfc6	fixed merge issues	2017-02-17 00:08:31 +00:00
Dante Ruiz	afd56bbbbe	fixed qml font path issue for desktop and tablet	2017-02-17 00:01:12 +00:00
Anthony J. Thibault	8ccca86dee	Settings for Tablet Becomes Toolbar	2017-02-16 15:57:36 -08:00
Anthony J. Thibault	5b1f150171	Fix for race condition when switching between Main Menu and Audio Menu	2017-02-16 12:52:46 -08:00
howard-stearns	6e3ae1fe4f	cleanup some accumulated cruft in pal code	2017-02-16 10:53:02 -08:00