5799 commits

Author	SHA1	Message	Date
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 Rowe	b74f42dc23	Merge branch 'master' into 21863	2018-05-17 07:44:39 +12: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
Dante Ruiz	37c51a7246	Merge branch 'menu-updates' of github.com:vladest/hifi into menu-updates	2018-05-16 10:41:40 -07:00
Dante Ruiz	e676348c4f	fixing some menu reog bugs	2018-05-16 10:40:28 -07:00
Gabriel Calero	5afc9c6df3	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-16 12:45:17 -03:00
vladest	5127cb0ea6	Merge branch 'master' into menu-updates	2018-05-16 14:37:00 +02: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
vladest	7ea6181520	Merge branch 'master' into menu-updates	2018-05-15 21:54:45 +02: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
Dante Ruiz	82422edb59	fixinig the controller settings page and have menu option on by default	2018-05-14 18:51:39 -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
vladest	0a67fc3b36	Merge conflicts	2018-05-12 11:24:35 +02: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
samcake	cc582cf2ce	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-05-11 12:34:55 -07:00
samcake	02be965271	more stuff fixed	2018-05-10 18:10:01 -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
Sam Gateau	bf85034f36	Tree view comming together for the engine!	2018-05-10 02:08:19 -07:00
vladest	62aa2df836	Merge branch 'master' into menu-updates	2018-05-10 10:36:38 +02:00
samcake	f08f77098d	Adding a true ListView for the engine	2018-05-09 18:28:47 -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
samcake	70a570d958	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-05-09 11:31:59 -07:00
samcake	859b187db6	Separate panel for inspecting the engine	2018-05-08 18:17:52 -07: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
samcake	728577dfd8	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-05-08 11:46:01 -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
Cristian Luis Duarte	0bab311b0d	Merge remote-tracking branch 'origin/master' into android_avatar_name	2018-05-07 18:26:02 -03:00
Gabriel Calero	9b63b76b68	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-07 16:06:02 -03:00
Zach Fox	646c0ec987	MS14878: Prevent wallet passphrase leak in specific case	2018-05-07 11:56:47 -07:00
samcake	86b2eb0829	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-05-07 11:11:20 -07:00
John Conklin II	1e6e182c63	Merge pull request #13090 from druiz17/fix-entity-highlighting ... fix highlighting issues (master)	2018-05-07 10:20:38 -07:00
David Rowe	1ccde9a1b2	Disable moving selection when camera is in inside bounding box	2018-05-06 20:53:20 +12:00
David Rowe	8fd972fce9	Don't disable lasering on particle or light entity icon when is selected	2018-05-06 20:23:49 +12:00
Sam Gateau	9b65e0771b	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-05-05 12:17:20 -07:00
vladest	c7ab1f3dbf	Merge branch 'master' into menu-updates	2018-05-05 20:48:40 +02:00
vladest	5a5bfcfe02	Merge branch 'master' into menu-updates	2018-05-05 07:11:39 +02:00
David Rowe	ed1391581e	Merge branch 'master' into 21863	2018-05-05 16:49:51 +12:00
samcake	6424b91e86	Templatizing the timeProfiler for the task	2018-05-04 17:58:21 -07:00
David Rowe	5021778dc0	Merge branch 'master' into 21866	2018-05-05 12:17:18 +12:00
David Rowe	3c2bee757a	Remove calls to function that's been removed	2018-05-05 12:14:40 +12:00
Gabriel Calero	1330132a32	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-04 18:35:51 -03:00
Dante Ruiz	0e92bb41bf	fix-another-highlighting-issue	2018-05-04 14:30:38 -07:00
Liv	e4b6686e1c	Merge pull request #13075 from ctrlaltdavid/21862 ... Clear entity selection handles and update list when entities are deleted	2018-05-04 14:23:37 -07:00
Dante Ruiz	607de3dfb4	Merge branch 'RC67' of github.com:highfidelity/hifi into RC67	2018-05-04 14:20:57 -07:00
Dante Ruiz	6414fcaae5	fix-another-highlighting-issue	2018-05-04 14:20:17 -07:00
Gabriel Calero	868b58e66d	Un-expose Application from javascript. Restore displayplugin deactivation when goes to background	2018-05-04 18:01:01 -03:00
Zach Fox	1da840984b	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-04 10:24:28 -07:00
Dante Ruiz	d44882e6dc	fix entity highlighting during edit mode	2018-05-04 09:01:24 -07:00
Dante Ruiz	a57c72df6e	fix entity highlighting during edit mode	2018-05-04 08:53:49 -07:00
Sam Gateau	e1d063e908	Adding the scripts for Jet	2018-05-04 00:01:48 -07:00
David Rowe	dd8eac8cb2	Remove superfluous keyboardControl.js file and references ... The raiseAndLowerKeyboard.js script is automatically injected into these pages, instead.	2018-05-04 16:14:42 +12:00
RebeccaStankus	7a7474baca	moved checkEditPermissionsAndUpdate function to higher scope	2018-05-03 13:34:55 -07:00
Dante Ruiz	a6eab29b14	fixing edge case	2018-05-03 13:09:45 -07:00
Dante Ruiz	cffb008c31	fixing edge case	2018-05-03 13:07:32 -07:00
Zach Fox	c3d3cdca3d	Add cubemap output format	2018-05-03 12:57:00 -07:00
Dante Ruiz	c258e8c248	fix highlighting issues	2018-05-03 11:38:59 -07:00
Dante Ruiz	4793cddde6	fix highlighting issues	2018-05-03 11:27:07 -07:00
David Rowe	ebd46f1861	Fix intermittent ability to select particle and light entities	2018-05-03 14:43:54 +12:00
Cristian Luis Duarte	4ec68f6f76	Merge remote-tracking branch 'origin/master' into android_avatar_name	2018-05-02 18:48:04 -03:00
David Rowe	5312c81a6f	Match style of surrounding code	2018-05-03 08:49:18 +12:00
David Rowe	4a96dc2fdc	Refactor	2018-05-03 08:48:17 +12:00
Gabriel Calero	d0ab81d1f9	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-02 17:00:32 -03:00
Gabriel Calero	c15ef56d90	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-05-02 14:38:10 -03:00
Zach Fox	ecae3ceb9d	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-02 10:05:15 -07:00
vladest	53350b471b	Merge branch 'master' into menu-updates	2018-05-02 19:02:11 +02:00
Gabriel Calero	e83f1a8ec7	Merge branch 'android_new_login' of https://github.com/gcalero/hifi into android_new_login	2018-05-02 12:20:23 -03:00
Gabriel Calero	0f08bd8fa1	Use a single AccountManager for android.	2018-05-02 12:11:11 -03:00