5596 commits

Author	SHA1	Message	Date
Olivier Prat	89669b326b	Merge branch 'master' of http://github.com/highfidelity/hifi into taapre	2018-04-17 09:24:35 +02:00
David Back	e86ef1c2d6	fix bracket	2018-04-16 13:33:17 -07:00
David Back	ad85e2b053	pre PR adjustments	2018-04-16 13:12:33 -07:00
David Back	78c0ec5770	remove animations	2018-04-16 12:56:22 -07:00
Zach Fox	02aa8ac566	Bugfixes per QA	2018-04-16 11:53:37 -07:00
Zach Fox	071bf35683	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
Dante Ruiz	08ea72d71f	Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting	2018-04-13 15:39:14 -07:00
David Back	76c7ec69ce	Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip	2018-04-13 14:28:14 -07:00
John Conklin II	08ca30cf43	Merge pull request #12870 from druiz17/fix-grab-js ... fix grab.js unable to grab other entities	2018-04-13 12:17:46 -07:00
John Conklin II	98f6899c3d	Merge pull request #12839 from SamGondelman/matMigrate ... Migrate materials from userData to materialData	2018-04-12 18:24:33 -07:00
David Back	243b3637c4	fix grab.js change	2018-04-12 12:41:36 -07:00
Dante Ruiz	43b92299d6	changing highlighting percentage	2018-04-12 10:35:29 -07:00
David Back	09f3b845a8	Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip	2018-04-12 10:17:17 -07:00
Seth Alves	32e7e5087e	Merge pull request #12668 from alexiamandeville/marketplace-update ... Updating repo script to match marketplace script	2018-04-12 09:20:03 -07:00
Dante Ruiz	7243160dac	making requested changes	2018-04-11 14:42:26 -07:00
Dante Ruiz	cdc248129c	fix grab.js	2018-04-11 14:25:06 -07:00
Dante Ruiz	ba9d5d18bc	make requested changes	2018-04-11 13:30:21 -07:00
John Conklin II	2f4bc5bd04	Merge pull request #12701 from misslivirose/fix-edit-grid-color ... Fix for grid color changes not applying	2018-04-11 12:06:09 -07:00
John Conklin II	28168e6e45	Merge pull request #12699 from misslivirose/fix/save-settings-for-editing ... Fix for edit preferences not persisting	2018-04-11 11:59:58 -07:00
David Back	59971869f5	desktop equip	2018-04-10 19:06:27 -07:00
Zach Fox	095b4ba5f2	Reduce logging from some Commerce/Discovery features	2018-04-10 16:02:58 -07:00
Zach Fox	01fec2edc7	Prevent the Bubble icon from ever blinking as per 14026	2018-04-10 16:00:35 -07:00
Zach Fox	a2f5891a0b	Cleanup 'Private' HMD Preview State Machine Logic	2018-04-10 16:00:18 -07:00
Zach Fox	a9b9a1cb10	Commerce: Gifts	2018-04-10 15:54:19 -07:00
Liv	c7be6e0934	Update edit.js ... remove the unneeded manual removal of the create setting - it's handled with the rest of the menu items now, and this was causing it to default to false every start.. tested locally but might have gotten in a weird state, so fixing in GH editor.	2018-04-10 12:15:57 -07:00
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
Liv Erickson	20ee169054	two more spaces	2018-04-10 09:23:14 -07:00
Liv Erickson	6c15577653	style fixes for eslint	2018-04-10 09:18:54 -07:00
Olivier Prat	2974e05cf2	Tweaked bloom intensity mix	2018-04-10 11:13:37 +02: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
SamGondelman	9b07880aab	migrate materials from userData to materialData	2018-04-09 12:49:03 -07:00
Dante Ruiz	2c20593b6d	editing equip code	2018-04-06 16:30:45 -07:00
Dante Ruiz	00713ab225	fix selection api	2018-04-06 14:00:50 -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	2e37b4a312	Merge pull request #12747 from Zvork/fade ... Update to Transitions debugging / editing script	2018-04-04 14:31:59 -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
Seth Alves	e8a62d2943	Merge pull request #12740 from druiz17/fix-scope ... Fix name conflict with c++ class and qml file(master)	2018-03-30 15:41:42 -07:00
Dante Ruiz	16749df83a	fix highlighting edge case	2018-03-30 14:14:13 -07:00
Livi Erickson	799963a009	fix syntax based on CR feedback	2018-03-30 13:50:46 -07:00
Liv Erickson	810930ff23	handle correct first time settings	2018-03-30 13:50:46 -07:00
Liv Erickson	ec0874be1a	fix for edit preferences not persisting	2018-03-30 13:50:46 -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
Olivier Prat	0c2c09e77b	Fixed layout in HMD	2018-03-30 15:22:48 -04:00
Dante Ruiz	420672a769	fix-qml-confict	2018-03-29 11:24:08 -07:00
Dante Ruiz	8cdb59413d	fix-qml-confict	2018-03-29 09:26:05 -07:00
Olivier Prat	ef63651b2b	Duration and timing controls are disabled when event is not time based	2018-03-29 12:07:56 -04:00
Olivier Prat	648e6a6c9b	Added description for each event	2018-03-29 10:47:18 -04:00
Olivier Prat	07cb1c1f9e	Moved gradient invert checkbox	2018-03-29 10:19:24 -04:00
Olivier Prat	3c8cd48dfb	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-29 07:21:01 -04: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
Olivier Prat	9a7f88cd78	Moved save / load buttons to top	2018-03-28 19:23:09 -04: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
Olivier Prat	6639a245df	Object picking / edition for transitions are activate / deactivated when transition editor window is shown / hidden	2018-03-28 18:20:10 -04: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
Olivier Prat	e4416db06f	Added save/file dialog for transition configurations in transition editor	2018-03-28 16:54:53 -04: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
Olivier Prat	7fa5e384b9	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-28 11:21:07 -04: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
Liv Erickson	c66badc53c	replace accidentally deleted line	2018-03-23 11:42:39 -07:00
Liv Erickson	9dd91ea31e	style fixes and fix for grid color changes not applying	2018-03-23 11:39:44 -07: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
Alexia Mandeville	35551f045c	Updating with jshint edits	2018-03-21 15:35:10 -07:00
David Rowe	05efc5a231	Revert "Remove Overlays.getOverlayObject() from JavaScript API" ... This reverts commit 8e2a3e8c99.	2018-03-21 15:36:39 +13:00
Olivier Prat	6b44d79f90	Proposal to improve fade editing with some extra visual cues	2018-03-20 17:48:41 -07:00
Olivier Prat	143a315f1d	Fade edited objects are now selected with ray picking	2018-03-20 15:29:50 -07:00
Cristian Duarte	d7081b261b	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-20 18:52:20 -03:00
Sam Gateau	5cc0e24921	Merge pull request #12666 from jherico/fix/web_overlay_crash ... Fix invalid QML surface cache interaction	2018-03-20 14:26:39 -07: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
John Conklin II	91db0ab00f	Merge pull request #12650 from ctrlaltdavid/21798 ... Messages API JSDoc	2018-03-19 13:56:57 -07:00
Zach Fox	daa68768b9	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-19 12:18:10 -07:00
John Conklin II	9219868406	Merge pull request #12667 from jherico/fix/web_overlay_crash ... HOTFIX RC65: Fix invalid QML surface cache interaction	2018-03-19 10:37:48 -07:00