4057 commits

Author	SHA1	Message	Date
Dante Ruiz	54c3f48e65	Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting	2018-04-10 09:32:40 -07:00
Dante Ruiz	447163bd07	clean up scripts	2018-04-10 09:23:40 -07:00
Dante Ruiz	2e1ebac03f	clean up functionality	2018-04-09 18:07:03 -07:00
Dante Ruiz	1113202a90	reverting file	2018-04-09 16:51:20 -07:00
Dante Ruiz	2c20593b6d	editing equip code	2018-04-06 16:30:45 -07:00
Dante Ruiz	fd47832857	saving changes	2018-04-06 11:47:09 -07:00
Dante Ruiz	07b1a6be01	saving work	2018-04-06 11:01:40 -07:00
Stephen Birarda	1d76dea9f6	Merge pull request #12818 from highfidelity/RC66 ... Merge back RC66 to master	2018-04-06 10:43:01 -07:00
Dante Ruiz	893832f4c7	Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting	2018-04-05 16:01:36 -07:00
Dante Ruiz	cc341e8ad7	highlight nearby entities	2018-04-05 15:38:56 -07:00
Zach Fox	8e46ebf83b	Prevent Interface from crashing when a Snapshot upload fails	2018-04-05 11:27:26 -07:00
John Conklin II	89127a06b3	Merge pull request #12714 from dback2/editUpDownArrowFix ... Fix Y arrow translation handle issues	2018-04-04 13:46:31 -07:00
Dante Ruiz	42149e295d	editing seletion style	2018-04-04 12:55:28 -07:00
John Conklin II	cba307f28b	Merge pull request #12762 from samcake/one ... Remove notifications and print outs when degrading LOD	2018-04-04 10:35:05 -07:00
Zach Fox	b641f87792	Merge pull request #12778 from zfox23/MS13792 ... Prevent Context Overlay from flashing when briefly hovering over certified entity	2018-04-04 09:31:33 -07:00
Dante Ruiz	c9c3d8f332	adding entity selection for far grabbing	2018-04-04 08:07:35 -07:00
Clément Brisset	3d4490f3fd	Merge pull request #12737 from highfidelity/RC66 ... RC66 mergeback	2018-04-03 15:39:16 -07:00
Zach Fox	5f47d51171	Prevent Context Overlay from flashing when briefly hovering over certified entity	2018-04-03 15:35:46 -07:00
howard-stearns	f229e24e60	fix help.js noisy log reference to undefined string#startsWith	2018-04-03 13:48:51 -07:00
samcake	2dc4630e68	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-04-03 12:55:21 -07:00
Seth Alves	5f13df4102	Merge pull request #12722 from druiz17/fix-entities-outline ... fix ContextOverlayInferface highlighing unspecified entities.	2018-04-03 12:29:19 -07:00
Seth Alves	249a97b5d0	don't move or rotate children if a parent is being changed by the same action	2018-04-03 12:14:59 -07:00
Seth Alves	08b7326bd1	when moving a group of selections, don't move a child if a parent is being moved	2018-04-03 12:14:40 -07:00
samcake	077b2dab30	Code review fixes	2018-04-02 16:09:43 -07:00
samcake	5a1eac563b	Code review fixes	2018-04-02 15:50:18 -07:00
samcake	d4bc61fb3d	Remove notifications and print outs for LOD changes because it was too much noise	2018-04-02 13:53:30 -07:00
John Conklin II	7ba05e3a5b	Merge pull request #12653 from vladest/bubblu_button_blink_fix ... Bubble button blink fix	2018-04-02 11:12:12 -07:00
Dante Ruiz	16749df83a	fix highlighting edge case	2018-03-30 14:14:13 -07:00
John Conklin II	542d1ad1ff	Merge pull request #12720 from druiz17/fix-parent-tree ... Fix far grabbing a grabbable child when the parent is not grabbable.	2018-03-30 12:25:22 -07:00
Sam Gondelman	d2a74e5713	Merge pull request #12686 from gcalero/android_ui_not_move_camera ... Android - Prevent Camera movement with UI (especially Windows and Radar mode)	2018-03-28 17:14:42 -07:00
Cristian Luis Duarte	fe9481b28d	Cleanup code, comment out log, simplify radar is valid touch code (no more flag)	2018-03-28 19:50:44 -03:00
John Conklin II	790162c88b	Merge pull request #12689 from ctrlaltdavid/21808 ... Reinstate Overlays.getOverlayObject API function	2018-03-28 14:00:28 -07:00
Cristian Luis Duarte	f0bcaa47c8	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-28 16:47:21 -03:00
Dante Ruiz	3d7f7f0e62	fix parent tree grabbing	2018-03-27 14:05:43 -07:00
John Conklin II	bcd2de3bf8	Merge pull request #12660 from alexiamandeville/awayImage-update ... Update away image and image paths	2018-03-27 12:46:37 -07:00
unknown	194b00d732	fix translate arrow normals	2018-03-26 16:31:58 -07:00
Cristian Luis Duarte	6cb5cd7f92	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-26 11:19:42 -03:00
Cristian Luis Duarte	686af4ff77	Clean code that manually checked for windows coordinates to disable radar touch	2018-03-23 20:02:51 -03:00
Cristian Luis Duarte	242b009562	Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events.	2018-03-23 18:59:55 -03:00
John Conklin II	563ff61325	Merge pull request #12661 from SamGondelman/android ... Android: Stats, disable IK, reduce impact of InputRecorder	2018-03-23 11:08:50 -07:00
Howard Stearns	113670e33b	Merge pull request #12638 from zfox23/commerce_upgrades_1 ... Commerce: Item Updates!	2018-03-22 15:40:22 -07:00
Clément Brisset	feec59655c	Merge pull request #12692 from highfidelity/stable ... Merge stable back into master	2018-03-22 15:08:30 -07:00
David Rowe	05efc5a231	Revert "Remove Overlays.getOverlayObject() from JavaScript API" ... This reverts commit 8e2a3e8c99.	2018-03-21 15:36:39 +13:00
Cristian Duarte	0d6bfada40	Prevent Go To and Avatar windows to move Radar Mode's camera when touched or interacted with	2018-03-20 17:24:38 -03:00
Zach Fox	daa68768b9	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-19 12:18:10 -07:00
David Back	3f2a49d243	fix list of tablet IDs ray cast checks in edit.js	2018-03-17 10:59:18 -07:00
Sam Gondelman	b96f398274	Merge pull request #12593 from gcalero/android_joystick_rotate_move ... Android joystick rotate move	2018-03-16 17:24:15 -07:00
Zach Fox	a792bcc3d3	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-16 13:24:17 -07:00
Alexia Mandeville	921b19139d	Updating indentation	2018-03-16 11:09:53 -07:00
Alexia Mandeville	74c654690f	Updating image path in script for HMD	2018-03-15 16:55:41 -07:00