5717 commits

Author	SHA1	Message	Date
Liv Erickson	de05388ebf	Merge branch 'master' of github.com:highfidelity/hifi into clone-server	2018-05-18 10:42:26 -07:00
Sam Gondelman	74840d2130	Merge pull request #12935 from gcalero/android_new_login ... Android new login	2018-05-17 15:53:25 -07:00
Clement	da08d747dc	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-05-17 12:10:08 -07:00
David Back	900b373c96	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-17 09:04:28 -07:00
Gabriel Calero	96da032b16	Add missing js to haptic feedback change	2018-05-17 11:49:44 -03:00
Gabriel Calero	8741c5e6a4	Make haptic pulse duration configurable in VirtualPadDevice	2018-05-17 11:37:13 -03:00
Zach Fox	585957409d	Merge pull request #13141 from zfox23/spectatorCameraImprovements ... Spectator Camera V2	2018-05-16 13:38:07 -07:00
samcake	adc8a07d3c	Merge branch 'RC67.2' of https://github.com/highfidelity/hifi into rc67.2-taaOn	2018-05-16 13:14:14 -07:00
samcake	21e069c90c	Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa	2018-05-16 13:09:55 -07:00
David Back	06fa4efe05	add comment	2018-05-16 11:39:53 -07:00
David Back	6c946d7ac5	prevent continuous clone calls	2018-05-16 11:36:57 -07:00
Gabriel Calero	5afc9c6df3	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-16 12:45:17 -03:00
David Back	1e2d2819d5	tweaks	2018-05-15 17:36:39 -07:00
David Back	f8fc7bedd7	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-15 17:31:43 -07:00
David Back	f74e219029	rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete	2018-05-15 17:24:14 -07:00
samcake	179801dab6	FIxing the transparent ambient lighting bug	2018-05-15 17:22:28 -07:00
John Conklin II	ce1231910c	Merge pull request #13140 from Cristo86/android_avatar_name ... @SamGondelman We just do a quick 5-10 minute Windows check, just to make sure Windows/Mac weren't broken by the change.	2018-05-15 13:22:15 -07:00
Zach Fox	bccaa2dbe5	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-15 11:50:38 -07:00
Dante Ruiz	931c8f5abe	Merge pull request #13110 from ctrlaltdavid/21866 ... Don't unnecessarily scroll HTML content when keyboard is raised	2018-05-15 11:00:38 -07:00
Seth Alves	6da59d15e5	Merge pull request #13167 from dback2/lowercaseUnequip ... Desktop equip: fix unequipping with capital U	2018-05-15 10:55:19 -07:00
John Conklin II	a76be78386	Merge pull request #13163 from sethalves/fix-near-grab-to-hips ... fix near-grab attaching entity to hips	2018-05-15 10:28:36 -07:00
Howard Stearns	39ccfc86ef	Merge pull request #13168 from zfox23/MS_15090 ... MS15090: Fix gifting when running marketplaces.js separately	2018-05-15 10:12:29 -07:00
David Back	623410a0aa	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-15 09:53:24 -07:00
Zach Fox	43254e2981	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-14 15:12:44 -07:00
Howard Stearns	d7121265d0	Merge pull request #13150 from howard-stearns/fix-lastEdited-vs-pal ... fix lastEdited vs pal	2018-05-14 15:12:07 -07:00
Zach Fox	a881d07e59	MS15090: Fix gifting when running marketplaces.js separately	2018-05-14 13:12:58 -07:00
David Back	ac78e14585	fix unequipping with capital U	2018-05-14 11:44:25 -07:00
Cristian Luis Duarte	e7abf3c7be	Android - Display Names - Use my avatar uuid directly when finding ray intersection	2018-05-14 15:26:57 -03:00
Cristian Luis Duarte	aaa6038d28	Prevent calling ending on displayNames if was never started	2018-05-11 22:27:58 -03:00
Cristian Luis Duarte	3fd8a02375	Prevent this name implementation to appear in radar mode	2018-05-11 21:58:12 -03:00
Cristian Luis Duarte	d39f7f7a58	Simplified avatar touch code + Fix Typo + Add my avatar to the exclusion list + Explain mouse events	2018-05-11 21:27:42 -03:00
Seth Alves	898dec29cb	don't cache value of getControllerJointIndex at startup, because the script may run before the data is available. Instead, refresh the data every few seconds	2018-05-11 17:07:51 -07:00
Cristian Luis Duarte	e3d7d65186	Merge remote-tracking branch 'origin/master' into android_avatar_name	2018-05-11 18:48:34 -03:00
David Back	65bda27ae3	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-11 13:03:27 -07:00
John Conklin II	4129664368	Merge pull request #13145 from highfidelity/stable ... Merge RC67 stable into master	2018-05-10 17:07:20 -07:00
howard-stearns	bf26aec260	untabify	2018-05-10 16:39:56 -07:00
howard-stearns	50a53a5174	fix lastEdited vs pal	2018-05-10 16:00:01 -07:00
John Conklin II	64d3219ee1	Merge pull request #12746 from gcalero/fix_radar_zoom_in ... Android: Fix zoom in unresponsive in radar mode	2018-05-10 13:14:52 -07:00
David Back	1aa653c5db	tabs	2018-05-09 18:20:07 -07:00
David Back	3241c18271	first pass cloneables WIP	2018-05-09 18:10:40 -07:00
Cristian Luis Duarte	cd3836883b	10 seconds timeout hides name	2018-05-09 19:27:03 -03:00
Zach Fox	44cfa95830	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-09 15:01:24 -07:00
Gabriel Calero	e0b57a2228	Code review in radar.js	2018-05-09 18:20:19 -03:00
Cristian Luis Duarte	936a319e62	Android - First version of showing up avatars names upon touch. Brought back (transparent) overlays into render forward task.	2018-05-09 17:15:57 -03:00
Dante Ruiz	1a0ded4526	adding windows	2018-05-08 15:10:57 -07:00
Dante Ruiz	0513204781	fix hmd.js	2018-05-08 15:05:55 -07:00
Stephen Birarda	4165ab3667	Merge branch 'RC67' of github.com:highfidelity/hifi into 67-to-master	2018-05-08 14:08:21 -07:00
Zach Fox	c5ebc436ce	Merge branch 'master' of github.com:highfidelity/hifi into MS14878_preventPasswordLeak	2018-05-08 09:40:53 -07:00
Dante Ruiz	a593209ec1	remove highlight when point to the sky	2018-05-07 15:33:12 -07:00
Zach Fox	fd4530e671	MS3128: Remove vestigal Edit menu item	2018-05-07 14:39:31 -07:00