50181 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dante Ruiz	d5427f8722	close tablet bug fix	2017-01-23 17:33:33 +00:00
Dante Ruiz	5c55b86be6	fix bug	2017-01-21 01:56:06 +00:00
Dante Ruiz	41bf65ed5e	home button improvments	2017-01-20 16:35:41 -08:00
Seth Alves	ff17aa7745	Merge pull request #9464 from sethalves/tablet-ui ... Tablet ui	2017-01-20 14:51:16 -08:00
Seth Alves	e96a3d4bcb	try another click sound	2017-01-20 14:50:24 -08:00
Seth Alves	87ea9161e4	avoid bad interaction between far-grab and equip	2017-01-20 14:49:49 -08:00
Seth Alves	dfa949f2d8	switch to new click sound	2017-01-20 13:35:41 -08:00
Seth Alves	2f08972578	Merge pull request #9460 from druiz17/touchUp ... Tablet button clickable in desktop mode && correct icons for switch	2017-01-20 12:58:41 -08:00
Seth Alves	503723a269	Merge pull request #9459 from hyperlogic/tablet-ui ... Updated tablet dimensions to better reflect mockup and 3d model	2017-01-20 12:40:47 -08:00
Anthony J. Thibault	3ebf2ebc9b	Updated tablet dimensions to better reflect mockup and 3d model	2017-01-20 12:27:44 -08:00
Dante Ruiz	58e04f8e35	home button works in desktop mode	2017-01-20 19:43:13 +00:00
Seth Alves	d449c6ca78	Merge pull request #9456 from sethalves/tablet-ui ... try again on haptics from touching tablet overlay with stylus	2017-01-20 11:07:59 -08:00
Seth Alves	7f25135633	try again on haptics from touching tablet overlay with stylus	2017-01-20 11:06:35 -08:00
Dante Ruiz	672deb903c	correct switch icons	2017-01-20 10:34:09 -08:00
Seth Alves	6641f9bafd	Merge pull request #9444 from druiz17/homeButtonFix ... Home button is now an overlay	2017-01-20 10:32:31 -08:00
Seth Alves	7b2bc3a3ed	Merge pull request #9453 from sethalves/tablet-ui ... unmangle merge	2017-01-20 10:29:48 -08:00
Seth Alves	2d220a557f	unmangle merge	2017-01-20 10:29:18 -08:00
Seth Alves	e96b646f66	Merge pull request #9452 from sethalves/tablet-ui ... Tablet ui	2017-01-20 10:14:44 -08:00
Seth Alves	c492319be2	merge from upstream	2017-01-20 10:14:11 -08:00
Seth Alves	5a316d639a	Merge pull request #9451 from sethalves/tablet-ui ... re-enable haptic pulse when stylus touches tablet overlay	2017-01-20 10:12:45 -08:00
Seth Alves	caae804318	re-enable haptic pulse when stylus touches tablet overlay	2017-01-20 10:12:15 -08:00
Seth Alves	eb169abdd7	Merge pull request #9449 from hyperlogic/tablet-ui ... Can now use mouse to move tablet in 2D desktop mode.	2017-01-20 09:18:02 -08:00
Ryan Downe Karpf	03851d4188	Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics ... Some initial analytics for PAL usage	2017-01-20 08:30:46 -08:00
Anthony J. Thibault	4e4545ac00	Updated orientation of tablet when no hand controllers are present.	2017-01-19 20:27:06 -08:00
Anthony J. Thibault	8304aa7b19	Added ability to mouse move the tablet in 2d desktop mode.	2017-01-19 18:04:08 -08:00
David Kelly	5adc2cc593	Couple improvements ... Only send one message when gain is changed. Eliminated the bool and now just sending un-personalMute, etc...	2017-01-19 17:22:39 -08:00
Dante Ruiz	e1c2c73e5f	clean up	2017-01-20 01:04:14 +00:00
Dante Ruiz	a319db3cb4	removed duplicate code	2017-01-20 00:57:48 +00:00
Dante Ruiz	1e7e4576cc	comparing with ID instead of strings	2017-01-19 16:38:55 -08:00
Anthony J. Thibault	2c3c96b600	Fix for broken entity scrolling introduced by 23ea65e2 ... this.grabbedEntity was being cleared before entityTouchingExit transition could send the release event.	2017-01-19 14:23:43 -08:00
Seth Alves	fc8b09d2b3	Merge pull request #9442 from sethalves/tablet-ui ... don't save tablet to Settings when logging out or switching domains	2017-01-19 14:11:14 -08:00
Seth Alves	47b59ffae3	don't save tablet to Settings when logging out or switching domains	2017-01-19 14:10:48 -08:00
Zach Fox	64ef3d5665	Merge pull request #9426 from zfox23/PAL_AdminLabel ... PAL: Admin Labels, Updated Letterboxes	2017-01-19 13:48:05 -08:00
Seth Alves	18e9b476c5	Merge pull request #9439 from hyperlogic/tablet-ui ... Improved stylus and laser input deadspot	2017-01-19 12:43:02 -08:00
David Kelly	d9fbf832e2	Some initial analytics for PAL usage	2017-01-19 11:35:17 -08:00
Seth Alves	a861f5091e	Merge pull request #9440 from sethalves/tablet-ui ... clean up grab.js. provide a way to delete old tablets that got saved…	2017-01-19 11:35:07 -08:00
Seth Alves	41ddfbfd27	clean up grab.js. provide a way to delete old tablets that got saved into Settings on exit	2017-01-19 11:34:38 -08:00
Zach Fox	44eaa64a1d	It was writeString() all along!	2017-01-19 11:25:17 -08:00
Zach Fox	534fcd9399	Potential fix	2017-01-19 10:20:36 -08:00
Seth Alves	99de46cb27	Merge pull request #9438 from sethalves/tablet-ui ... make tablet be an avatar-entity	2017-01-19 10:12:34 -08:00
Seth Alves	0e9ff7f7fc	make tablet be an avatar-entity	2017-01-19 10:12:06 -08:00
Seth Alves	c3505b854e	Merge pull request #9437 from sethalves/tablet-ui ... Tablet ui	2017-01-19 09:42:33 -08:00
Seth Alves	eb25e1c12d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-19 09:41:49 -08:00
Seth Alves	1a6ae01d9c	Merge pull request #9435 from druiz17/tabletNav ... Tablet issues Fixed	2017-01-19 09:22:18 -08:00
Chris Collins	601223aa98	Merge pull request #9402 from ctrlaltdavid/clara-tidying ... Remove a line of old code in Clara.io download	2017-01-19 09:15:58 -08:00
Brad Davis	70de00c6bf	Merge pull request #9421 from jherico/more_trace_details ... Additional trace details for GPU timing, frame data updates	2017-01-19 09:12:34 -08:00
Dante Ruiz	342a6c67fb	menu checkable button fix	2017-01-19 08:12:49 -08:00
Dante Ruiz	30b57b62da	toggle help	2017-01-19 08:12:49 -08:00
samcake	149e727cf3	Merge pull request #9429 from gcalero/android_forward_shaders ... Create render forward version of pixel shaders	2017-01-19 00:48:25 -08:00
Anthony J. Thibault	2fd691d844	Improved stylus and laser input deadspot	2017-01-18 18:23:00 -08:00