2427 commits

Author	SHA1	Message	Date
David Rowe	ead1f00bbf	Title	2017-03-28 09:10:20 +13:00
David Rowe	35305b4476	Make dialog single column with images above controls	2017-03-28 08:55:38 +13:00
David Rowe	e58e3fbbf7	Disconnect snapshot event handler when tablet "home" button pressed	2017-03-27 17:32:04 +13:00
David Rowe	dc3095bfcd	Fix "don't share" button not closing window	2017-03-27 16:24:14 +13:00
David Rowe	d0fc352d3b	Address event bridge being shared with other scripts	2017-03-27 16:07:58 +13:00
David Rowe	aa8a1e1dda	Open snapshot dialog in tablet or window appropriately	2017-03-27 15:04:33 +13:00
Seth Alves	bb28976d0e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-26 09:32:35 -07:00
Seth Alves	90db9af2f9	Merge pull request #9978 from Triplelexx/fix-tablet-users-typo ... fix myVisibility typo	2017-03-26 07:36:11 -08:00
Seth Alves	d45e124529	Merge pull request #9995 from hyperlogic/bug-fix/no-scroll-bar-on-marketplace ... Hide the scrollbar on the marketplace	2017-03-25 08:36:31 -08: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	6178a86a46	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help	2017-03-24 23:56:33 +01:00
Seth Alves	f1470e34f9	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-24 15:17:52 -07:00
Brad Hefta-Gaub	9b26e8ee95	Merge pull request #9871 from Triplelexx/21208 ... 21208 - Muted microphone indicator	2017-03-24 13:07:43 -07:00
Anthony J. Thibault	7e6ff7c2fb	Scrollbar is visible on marketplace in toolbar mode.	2017-03-24 11:40:10 -07:00
Lexx	fa606446a7	remove cache buster	2017-03-24 18:27:38 +00:00
Anthony J. Thibault	54b11bb6ee	Hide the scrollbar on the marketplace	2017-03-24 11:22:50 -07:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 ... 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Seth Alves	ff3fc244d1	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-23 09:50:53 -07:00
Dante Ruiz	dfa6174069	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help	2017-03-23 17:34:50 +01:00
Seth Alves	62f10204d9	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-03-23 09:25:48 -07:00
Triplelexx	6a17e328e8	fix myVisibility typo	2017-03-22 22:13:39 +00:00
Brad Davis	85c80f3be8	Merge remote-tracking branch 'upstream/master' into smarter_textures ... Conflicts: libraries/gpu/src/gpu/Texture.cpp	2017-03-22 14:25:23 -07:00
Triplelexx	c7b9492620	revert removing rightUnitVec ... .....	2017-03-22 19:14:20 +00:00
Triplelexx	d1db04f93a	fix lost forwardOffset declaration	2017-03-22 18:57:00 +00:00
Dante Ruiz	3a89654111	saving work	2017-03-22 19:14:53 +01:00
Anthony J. Thibault	2c38d7ff89	Tablet spawn orientation now takes hand orientation into account. ... Perhaps this will make the tablet spawn location feel more predictable and consistent to the user.	2017-03-22 11:03:03 -07:00
Triplelexx	2fc8dd48de	change testFront to testForward	2017-03-22 17:13:45 +00:00
Triplelexx	2d1ca99e2e	change variable names that use Quat.getForward	2017-03-22 17:00:12 +00:00
Seth Alves	bd32104bc1	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-22 08:41:59 -08:00
Ryan Huffman	1285f2a9eb	Merge pull request #9937 from thoys/boppo ... El Boppo the Clown punching bag game	2017-03-22 09:30:54 -07:00
Triplelexx	6e740a5fbb	change Mat4 getFront to getForward	2017-03-21 22:33:37 +00:00
Triplelexx	66d697873f	change mat4test back to getFront ... premature, including in seperate commit	2017-03-21 22:31:06 +00:00
Triplelexx	a964edee91	change all references of Quat.getFront to Quat.getForward in scripts directory	2017-03-21 22:25:30 +00:00
Dante Ruiz	d2c139ce6e	fix error from using a misspelled function	2017-03-21 22:25:45 +01:00
Seth Alves	14027d4acb	Merge pull request #9968 from druiz17/tablet-xbox ... Fixed the third eye for the xbox controller	2017-03-21 11:03:53 -08:00
Seth Alves	04a334fd07	unmangle merge	2017-03-21 11:02:18 -08:00
Dante Ruiz	bf3c5dbf0e	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-xbox	2017-03-21 19:47:16 +01:00
Dante Ruiz	1811a2edc7	fixed third eye laser	2017-03-21 19:45:00 +01:00
Seth Alves	1da6349505	merge from upstream	2017-03-21 10:26:02 -07:00
Ryan Huffman	13222468e3	Merge pull request #9712 from huffman/feat/edit-particle-icon ... Add particle system overlay in edit.js	2017-03-21 10:02:52 -07:00
Seth Alves	cc4ddd1387	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
Brad Hefta-Gaub	b7f48644af	Merge pull request #9955 from druiz17/tablet-edit-selecting ... Fix edit.js from deselecting an object when trying to delete it	2017-03-21 09:27:30 -07:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
Seth Alves	bc90e9081b	Merge pull request #9957 from hyperlogic/bug-fix/tablet-scale ... Tablet scale settings now take effect soon after they are changed.	2017-03-20 15:05:47 -08:00
Anthony J. Thibault	f5c3d41f2c	Tablet scale settings now take effect soon after they are changed.	2017-03-20 14:51:47 -07:00
Dante Ruiz	de24023a21	Fix edit.js from deselecting an object when trying to delete it	2017-03-20 20:43:32 +01:00
Seth Alves	8988110c3b	Merge pull request #9953 from fayeli/edit-export-entities ... Adding Export Entities Functionality in Tablet Edit	2017-03-20 11:35:18 -08:00