5654 commits

Author	SHA1	Message	Date
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
John Conklin II	4129664368	Merge pull request #13145 from highfidelity/stable ... Merge RC67 stable into master	2018-05-10 17:07:20 -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
Gabriel Calero	e0b57a2228	Code review in radar.js	2018-05-09 18:20:19 -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
Zach Fox	646c0ec987	MS14878: Prevent wallet passphrase leak in specific case	2018-05-07 11:56:47 -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
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
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
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
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	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	c15ef56d90	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-05-02 14:38:10 -03:00
David Rowe	f27e363b68	Remove entity from list when it deletes; handle multiple deletions	2018-05-02 15:23:13 +12:00
David Rowe	5a064d3499	Remove selection handles and list highlight when entity deletes	2018-05-02 14:13:15 +12:00
David Rowe	1b99946c5f	Fix entity not highlighted in list after creating or undoing delete	2018-05-02 12:38:29 +12:00
Liv Erickson	7db07db9e2	remove menu item at cleanup	2018-04-30 13:55:01 -07:00
John Conklin II	47f68364d2	Merge pull request #13012 from misslivirose/fix/particle-prop-caps ... Limits for alpha sliders in particle explorer	2018-04-30 10:13:05 -07:00
David Back	61afd12eeb	change to not left button	2018-04-27 16:06:27 -07:00
David Back	0962e1fc16	ignore right clicks	2018-04-27 16:06:14 -07:00
David Back	729f3366ff	Merge pull request #13033 from dback2/desktopEquip ... Desktop equip - ignore right clicks	2018-04-27 14:36:26 -07:00
David Back	8d49d1c118	change to not left button	2018-04-27 13:32:05 -07:00
Zach Fox	684d2b08ba	Finalize work on MS14295 and MS14559	2018-04-27 12:03:54 -07:00
David Back	78436ebcbf	ignore right clicks	2018-04-27 11:30:45 -07:00
Zach Fox	bbc15cdc63	Finalize work on MS14295 and MS14559	2018-04-27 11:04:46 -07:00
Zach Fox	fc324f67bd	MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC	2018-04-26 15:09:53 -07:00
Liv Erickson	ef275485c0	fix alpha sliders for particles	2018-04-26 12:54:37 -07:00
John Conklin II	eef3bc2df5	Merge pull request #12980 from dback2/desktopEquip ... Desktop equip - deleted/cleared entities fix	2018-04-25 11:35:04 -07:00
David Back	71dc75b208	fix disconnect clear entities	2018-04-24 14:25:33 -07:00
Olivier Prat	f5296e9d97	Merge branch 'master' of http://github.com/highfidelity/hifi into taapre	2018-04-24 17:17:52 +02:00
David Back	e21c451815	ensure deleted or cleared entities properly unequipped	2018-04-23 16:56:18 -07:00
John Conklin II	2e6a563c87	Merge pull request #12959 from davidkelly/dk/14375 ... Don't populate user list in pal until you connect the events up	2018-04-23 14:47:31 -07:00
David Kelly	d84ea6bf0f	Don't populate user list in pal until you connect the events up	2018-04-20 16:09:20 -07:00
Olivier Prat	46a1ff4dd2	Set jitter to O on RenderableWebEntityItems	2018-04-20 12:02:17 +02:00
Olivier Prat	440e2b8452	Merged with master	2018-04-20 08:13:25 +02:00
David Back	8950c31378	fix mouse equipping while someone else far grabbing	2018-04-19 16:29:49 -07:00
Gabriel Calero	adfbaac18f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-19 19:40:00 -03:00
Gabriel Calero	f2184bf456	Handle android back button. Remove unused resources. Fix compilation errors.	2018-04-19 17:31:25 -03:00