3446 commits

Author	SHA1	Message	Date
Zach Fox	7d34b3fe67	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-11-17 15:45:03 -08:00
Brad Hefta-Gaub	ed4ec3208d	Merge pull request #11797 from luiscuenca/case7589 ... Fix notifications shrink with avatar	2017-11-17 15:27:46 -08:00
luiscuenca	df51d66f60	no double scaling and comments	2017-11-17 13:40:22 -07:00
Dante Ruiz	8f6c781014	Merge pull request #11831 from misslivirose/feat/scale-emit-hands ... Emit avatar scale changed signal when scaled with hand controllers	2017-11-17 11:55:31 -08:00
luiscuenca	bbf5e3b023	simplifications and comments	2017-11-17 12:45:36 -07:00
Andrew Meadows	98001b64d9	Merge pull request #11788 from ctrlaltdavid/21579-a ... Particles emitter fixes	2017-11-17 11:31:12 -08:00
Andrew Meadows	6a784794c9	Merge pull request #11789 from ctrlaltdavid/21599 ... Don't remove entities from list when try to delete locked entity	2017-11-17 11:26:00 -08:00
SamGondelman	b252c81d84	fix home button hover overlay dimensions	2017-11-16 15:34:42 -08:00
Liv Erickson	dda32f1987	Emit scale changed signal when scaled with hand controllers	2017-11-16 09:26:42 -08:00
Dante Ruiz	94ac8e52d5	Merge pull request #11822 from druiz17/fix-tablet-3d-person ... fixing tablet in 3d person	2017-11-16 08:55:27 -08:00
Zach Fox	93c3d53144	Fix marketplaces.js URLs	2017-11-15 16:46:00 -08:00
Dante Ruiz	9564b7567b	fixing tablet in 3d person	2017-11-15 13:39:21 -08:00
Alexander Ivash	78d89d886f	9264 dismiss keyboard after user finished typing in marketplace search bar and hit search or return key	2017-11-16 00:13:46 +03:00
Brad Davis	bb2e061d77	Fixing global declarations in JS	2017-11-15 12:00:52 -08:00
Brad Davis	26a745be6f	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-15 11:59:06 -08:00
Brad Davis	1167be4102	Reverting tablet API rename, cleaning up duplicated code	2017-11-15 11:52:55 -08:00
Brad Davis	64592d66d7	Fix relative path for tablet login dialog	2017-11-15 11:46:56 -08:00
John Conklin II	8592f3fd4d	Merge pull request #11764 from luiscuenca/case7587 ... 7587 Lasers resize with avatar	2017-11-15 09:31:45 -08:00
Zach Fox	d6c244d1d5	Remove incorrect logic	2017-11-14 14:54:03 -08:00
Zach Fox	f5994375cf	Remove Marketplace's dependency on Edit.js for rez	2017-11-14 14:29:49 -08:00
luiscuenca	26e401a069	fix broken HMD notifications	2017-11-14 14:22:53 -07:00
Brad Davis	69029b49f3	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-13 14:29:49 -08:00
Zach Fox	641c4656c4	Fix bug with disappearing certificate info	2017-11-13 10:53:16 -08:00
Brad Davis	5cf9c1bb33	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-13 10:48:21 -08:00
Nissim Hadar	f629357ded	Removed Keylight attenuation from .js (as well as .html).	2017-11-11 18:58:12 -08:00
luiscuenca	262dc091ce	7589 Fix notifications shrink with avatar	2017-11-10 17:22:41 -07:00
Brad Davis	7bf1b176d7	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
Sam Gateau	f857b37d2e	Merge pull request #11758 from NissimHadar/hazeUIFix ... Improved Haze UI in Create menu	2017-11-10 11:58:06 -08:00
Brad Davis	92a3c209aa	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-10 11:44:29 -08:00
luiscuenca	7dfdc8da59	Redesign and clean of unused lineWidths	2017-11-09 17:50:38 -07:00
David Rowe	ad661cb345	Don't remove entities from list when try to delete locked entity	2017-11-10 10:50:07 +13:00
David Rowe	c53c356842	Display "no preview available" for ATP images in particles UI	2017-11-10 10:23:35 +13:00
Clément Brisset	40baca6ee1	Merge pull request #11756 from ctrlaltdavid/21592 ... Fix import from URL adding multiple copies of imported entities	2017-11-08 18:01:48 -08:00
Nissim Hadar	7cb9514feb	Converted 'Glare Angle' control to a slider.	2017-11-08 16:50:44 -08:00
Nissim Hadar	5a56ea5894	Merge branch 'master' into hazeUIFix	2017-11-08 16:44:59 -08:00
Nissim Hadar	5c7ebc0af3	Converted 'Glare Angle' control to a slider.	2017-11-08 16:44:05 -08:00
Nissim Hadar	2920c6f9a9	Merge branch 'master' into hazeUIFix	2017-11-08 15:42:20 -08:00
Nissim Hadar	c1b5d00993	Converted 'Background Blend' control to a slider.	2017-11-08 15:41:24 -08:00
Zach Fox	33b6a13a4d	Revert 11728 and fix marketplace JS injection - should revisit	2017-11-08 15:21:36 -08:00
Luis Cuenca	6fb47eef85	Merge branch 'master' into case7587	2017-11-07 17:19:39 -07:00
luiscuenca	332cb48a41	Lasers and teleport scale with avatar	2017-11-07 16:57:55 -07:00
Seth Alves	0edf056b78	Merge pull request #11755 from MidnightRift/patch-1 ... Fix controllerDispatcherUtils file path	2017-11-07 13:22:18 -08:00
Seth Alves	e22926eb89	Merge pull request #11762 from ctrlaltdavid/21594 ... Speed up entity list update after deleting entities	2017-11-07 09:34:47 -08:00
Seth Alves	ce7d0c324b	Merge pull request #11761 from ctrlaltdavid/21593 ... Don't move or rotate entities if Alt or Meta keys are pressed	2017-11-07 09:33:21 -08:00
Seth Alves	e9c0e53aa6	Merge pull request #11760 from druiz17/far-grab-parent ... Far grab rolls up parent tree when grabbing and add offset to LaserPointer::lockEndUUID	2017-11-07 08:53:13 -08:00
David Rowe	fadbf09cdd	Avoid potentially slow entity list refresh upon deleting entities	2017-11-07 18:10:10 +13:00
David Rowe	60319e8d53	Don't move or rotate entities if Alt or Meta keys are pressed	2017-11-07 13:35:31 +13:00
Dante Ruiz	3b15897b12	fixed farGrab parent grabbing and laser LockEndUUID	2017-11-06 15:21:20 -08:00
David Rowe	b272b2e6c8	Fix import from URL adding multiple copies of imported entities	2017-11-07 11:28:35 +13:00
Nissim Hadar	650df24761	Improved Haze UI in Create menu	2017-11-06 14:27:02 -08:00