4768 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	ed4ec3208d	Merge pull request #11797 from luiscuenca/case7589 ... Fix notifications shrink with avatar	2017-11-17 15:27:46 -08:00
SamGondelman	393ad0079c	home button is circle instead of sphere, fixed positioning, fix lasers on tablet	2017-11-17 15:24:21 -08:00
Zach Fox	f47f259816	Turn Commerce on by default	2017-11-17 15:12:49 -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
SamGondelman	42d047c572	merge with master	2017-11-17 11:52:34 -08:00
SamGondelman	e38b0ab6b8	make web overlays match web entities more, remove resolution	2017-11-17 11:50:24 -08:00
luiscuenca	bbf5e3b023	simplifications and comments	2017-11-17 12:45:36 -07:00
Dante Ruiz	4bbf2ff482	near grab entity while stylus is showing	2017-11-17 11:32:02 -08: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	61c7ccde6e	cleanup	2017-11-17 10:45:39 -08:00
SamGondelman	b252c81d84	fix home button hover overlay dimensions	2017-11-16 15:34:42 -08:00
Dante Ruiz	b66153b9cb	fixing setting incorrect parent	2017-11-16 15:07:00 -08:00
Dante Ruiz	f6a74cc80e	fixing merge conflicts	2017-11-16 10:04:36 -08:00
SamGondelman	ac7242102c	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-16 09:47:29 -08:00
SamGondelman	e3aa79990b	merge with master	2017-11-16 09:45:32 -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
Alexander Ivash	c5d2f598d7	8244 Rename captionColorOverride to captionColor	2017-11-16 15:46:49 +03:00
SamGondelman	3274c41aeb	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-15 17:45:45 -08:00
Sam Gateau	3f5b21ec22	Merge pull request #11559 from Zvork/bloom ... Bloom	2017-11-15 15:11:31 -08:00
SamGondelman	7eb22b372f	merge with master	2017-11-15 14:35:30 -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
Sam Gateau	2c51e516eb	Merge pull request #11744 from Zvork/shadow ... Shadow caster culling fix	2017-11-15 09:49:39 -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
Olivier Prat	f47a3e7d2c	Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake	2017-11-15 09:42:57 +01:00
Olivier Prat	bf46ccefaf	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-15 08:59:36 +01: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
Dante Ruiz	b026cfc42f	make sure teleport pointers are deleted	2017-11-14 14:09:08 -08:00
luiscuenca	26e401a069	fix broken HMD notifications	2017-11-14 14:22:53 -07:00
Dante Ruiz	54075d4c9a	make hud laser relative to camera	2017-11-14 13:09:16 -08:00
Dante Ruiz	8779d52ad3	making requested changes	2017-11-14 13:04:09 -08:00
Olivier Prat	5102c8e1b1	Merged with master	2017-11-14 21:56:00 +01:00
Dante Ruiz	416a47cfc7	adding controller haptic feedback to tablet onPress	2017-11-14 09:34:17 -08:00
Dante Ruiz	b779c33a1b	fixed lockEndUUID offset for scripts	2017-11-13 16:42:16 -08:00
Dante Ruiz	6173c33b51	fixing merge conflict	2017-11-13 15:02:25 -08:00
Dante Ruiz	132b33dbe7	disable stylus pointer when not being used	2017-11-13 14:53:54 -08:00
SamGondelman	60db24f2d3	merge with master	2017-11-13 14:36:24 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00
Dante Ruiz	7613bddefa	fixing some issues with hud module	2017-11-13 14:26:34 -08:00
Dante Ruiz	5852224a31	clean up code and finialize changes	2017-11-13 13:37:53 -08:00
Zach Fox	641c4656c4	Fix bug with disappearing certificate info	2017-11-13 10:53:16 -08:00
Olivier Prat	dd6b7b04c2	Merged with master	2017-11-13 14:33:59 +01:00
Nissim Hadar	f629357ded	Removed Keylight attenuation from .js (as well as .html).	2017-11-11 18:58:12 -08:00
Dante Ruiz	43c6d71236	fix stylus module	2017-11-10 17:28:55 -08:00
luiscuenca	262dc091ce	7589 Fix notifications shrink with avatar	2017-11-10 17:22:41 -07:00
Sam Gateau	ecf67cc331	Merge pull request #11650 from Zvork/outline ... Multiple Outline Groups	2017-11-10 15:45:03 -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
Melissa Brown	f7eb57a54c	Merge pull request #11653 from vladest/fix_sriptslog_multiply_window ... Fix scriptslog multiply window	2017-11-10 11:11:46 -08:00
Olivier Prat	8b6a2eeb24	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-10 10:19:32 +01:00
luiscuenca	7dfdc8da59	Redesign and clean of unused lineWidths	2017-11-09 17:50:38 -07:00
Dante Ruiz	ef55e3181d	moveing controllerDispatchaer pointers to pointerUtils.js	2017-11-09 16:48:52 -08: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
Dante Ruiz	86439eff07	fixing merge conflict	2017-11-09 13:07:55 -08:00
SamGondelman	5a78c9ebfe	integrated stylus into pointer system, need to update controller module	2017-11-09 11:59:17 -08: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
vladest	02625a6e28	Remove script from engine	2017-11-08 21:53:42 +01:00
vladest	5e32298183	Rework as script=only solution	2017-11-08 18:43:59 +01:00
Olivier Prat	f996435ac8	Merge branch 'master' of git://github.com/highfidelity/hifi into highlight	2017-11-08 11:41:21 +01:00
Olivier Prat	91d8435a99	Merge branch 'master' of git://github.com/highfidelity/hifi into bloom	2017-11-08 08:17:55 +01: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
Olivier Prat	9817cb4c44	Added highlight configuration in HighlightStageSetup job	2017-11-07 15:35:43 +01:00
Olivier Prat	3cc445ff02	Renamed outline to highlight	2017-11-07 11:07:25 +01:00
Olivier Prat	84be026e0b	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-07 09:48:45 +01:00
David Rowe	fadbf09cdd	Avoid potentially slow entity list refresh upon deleting entities	2017-11-07 18:10:10 +13:00
Dante Ruiz	bdd31b63ed	update functions call names to match pointer API changes	2017-11-06 17:23:40 -08:00
Dante Ruiz	3e9eaa727b	Merge branch 'ui' of github.com:SamGondelman/hifi into ui	2017-11-06 16:39:10 -08: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
SamGondelman	f970eb2302	merge with pointers branch	2017-11-06 14:49:50 -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
Brad Davis	544c54b8ee	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-06 10:07:22 -08:00
Midnight	e2ca3c6de0	Fix lib file path ... Changed the include to what should be the correct file path. it does not exist in the controllers folder.	2017-11-05 13:39:26 -07:00
SamGondelman	55ac585cd9	Merge remote-tracking branch 'upstream/master' into ui	2017-11-03 17:32:13 -07:00
Dante Ruiz	539cf35f30	saving work	2017-11-03 17:14:27 -07:00
Olivier Prat	fcf1c301b6	Merge branch 'master' of git://github.com/highfidelity/hifi into bloom	2017-11-03 18:12:15 +01:00
Olivier Prat	fbcb2924e8	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-03 15:08:15 +01:00
Olivier Prat	4b598a6e24	Working stencil mask with object bounding boxes	2017-11-03 14:26:36 +01:00
Dante Ruiz	b6e3262164	removing the last remaining laserPointers	2017-11-02 11:31:13 -07:00
Olivier Prat	f2444f9a30	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-02 09:25:07 +01:00
howard-stearns	76e06a6214	Update to stable-v-staging metaverse switching, to handle marketplace ... injection.	2017-11-01 15:28:28 -07:00
Dante Ruiz	0580e23686	fixed edit mode and allow to scroll off tablet	2017-11-01 15:16:02 -07:00
Dante Ruiz	66f07cb21b	eslint controller modules	2017-11-01 11:36:36 -07:00
Brad Davis	f061b9c2da	Add stylus functionality to pointer manager	2017-11-01 11:27:57 -07:00