19135 commits

Author	SHA1	Message	Date
Seth Alves	2c42309aaa	perfer tablet over other overlays for mouse-clicks	2017-02-23 13:32:24 -08:00
Seth Alves	84d9af14b0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-23 10:40:18 -08:00
Chris Collins	de84e07281	Merge pull request #9714 from thoys/fix-recorder-js-playback ... Fix recorder.js playback in interface	2017-02-23 09:59:37 -08:00
Thijs Wenker	5033e7be11	CR fixes	2017-02-23 18:22:36 +01:00
Seth Alves	37004e4347	steps toward making mouse work on tablet	2017-02-23 08:11:31 -08:00
Seth Alves	41ef7b8dbb	add setting to control if tablet is an entity or overlay	2017-02-22 21:13:42 -08:00
Seth Alves	1b26c3469f	fix signed/unsigned joint index problem	2017-02-22 20:39:34 -08:00
Seth Alves	b4be942348	trying to get tablet overlay to show up in the right place	2017-02-22 19:18:03 -08:00
Seth Alves	273f0130f3	fix sphere vs box check for grabbing overlays. fix newly introduced equipping bug.	2017-02-22 17:43:09 -08:00
Seth Alves	bfc4853947	make overlays near-grabbable. make tablet be an overlay	2017-02-22 16:50:02 -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	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
Thijs Wenker	13b2b6086f	Fix recorder.js playback in interface	2017-02-21 19:47:26 +01: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	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
kunalgosar	b8b5927351	Logging display mode changes	2017-02-17 13:21:01 -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
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
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
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
Anthony J. Thibault	03b6280ed0	Fix for empty toolbar issue	2017-02-15 16:50:08 -08:00
Anthony J. Thibault	67302cbd2b	toolbar work to better support tablet buttons	2017-02-15 15:53:08 -08:00
Anthony J. Thibault	ed11edad56	EventBridge support	2017-02-15 13:59:04 -08:00
Clément Brisset	eba6a8f028	Merge pull request #9674 from Atlante45/fix/mac-macro ... Fix SSE2 macros for Macs	2017-02-15 11:29:55 -08:00
kunalgosar	4579ac4998	Changed button margin	2017-02-14 16:43:55 -08:00
kunalgosar	91a73b2689	Button styling	2017-02-14 16:13:40 -08:00
kunalgosar	5e5d76ead7	Implemented toggle prev search button	2017-02-14 16:13:40 -08:00
kunalgosar	2dd2018d7d	change next button style properties	2017-02-14 16:13:40 -08:00