329 commits

Author	SHA1	Message	Date
Dante Ruiz	249d22b4b4	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-21 10:31:24 -07:00
Liv	0927cadf10	Merge pull request #13093 from RebeccaStankus/edit-bug-14671 ... moved checkEditPermissionsAndUpdate function to higher scope	2018-05-18 16:44:53 -07:00
RebeccaStankus	27638b9ced	Removing duplicate function	2018-05-18 09:20:03 -07:00
David Rowe	b74f42dc23	Merge branch 'master' into 21863	2018-05-17 07:44:39 +12: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	fd4530e671	MS3128: Remove vestigal Edit menu item	2018-05-07 14:39:31 -07: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
RebeccaStankus	7a7474baca	moved checkEditPermissionsAndUpdate function to higher scope	2018-05-03 13:34:55 -07: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
Liv Erickson	7db07db9e2	remove menu item at cleanup	2018-04-30 13:55:01 -07:00
John Conklin II	5ef90b242e	Merge pull request #12925 from thoys/fix/create-errorOnShutdown ... Create app: Save light selection menu option properly	2018-04-19 10:16:40 -07:00
John Conklin II	eedc8a8c0a	Merge pull request #12929 from misslivirose/fix/misc-edit-bugs ... Fix edit icon behavior	2018-04-18 13:46:38 -07:00
Liv Erickson	e795af03dd	move function out of global scope	2018-04-18 09:56:39 -07:00
Liv Erickson	2a055429cd	handle edit changes	2018-04-17 17:31:16 -07:00
Liv Erickson	e35efccfa3	make icon slightly more robust	2018-04-17 17:11:37 -07:00
Liv Erickson	6c1872caba	remove old dependency on domain changed message to fix issue with edit icon not handling domain changes	2018-04-17 16:38:29 -07:00
Liv Erickson	abe8a3e6d9	correct implementation that doesn't interfere with other app status	2018-04-17 15:41:03 -07:00
Liv	071396bed0	move logic for disconnecting out of initalize() and into setActive()	2018-04-17 15:40:59 -07:00
Liv	7a7438b648	space for synxtax	2018-04-17 15:40:57 -07:00
Liv	7f01dded79	add handler to refused domain change connections	2018-04-17 15:40:55 -07:00
Liv	6f020a7ec8	return tablet to home on change domain	2018-04-17 15:40:54 -07:00
Thijs Wenker	e6f0bfbf4c	get proper checkbox value from the allow light selection menu option	2018-04-18 00:10:49 +02: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
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
SamGondelman	9b07880aab	migrate materials from userData to materialData	2018-04-09 12:49:03 -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
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 Back	3f2a49d243	fix list of tablet IDs ray cast checks in edit.js	2018-03-17 10:59:18 -07:00
John Conklin II	1e1836c009	Merge pull request #12502 from elisa-lj11/2dimages-update ... Image entity has correct orientation and is collisionless	2018-03-01 09:57:08 -08:00
Elisa Lupin-Jimenez	b56c78d36c	image has correct orientation and is collisionless	2018-02-26 14:44:46 -08:00
Liv Erickson	269d8312e2	wrap selection print in wantDebug to avoid spamming logs in HMD	2018-02-22 13:03:16 -08:00
Seth Alves	c534e3a6e4	Merge pull request #12356 from ctrlaltdavid/21742 ... Handle tablet entities and overlays not being available	2018-02-22 08:48:13 -08:00
SamGondelman	324eefc914	remove fresnel, add unlit, fix overlays, cleanup	2018-02-14 17:02:07 -08:00
SamGondelman	4500ed17e7	merge from master	2018-02-13 13:58:39 -08:00
Elisa Lupin-Jimenez	a61021f46c	Merge pull request #12272 from elisa-lj11/2d-images ... 2d images (JPG and PNG) are now supported as (quasi) entities	2018-02-13 11:44:02 -08:00
David Rowe	b1f49be790	Merge branch 'master' into 21742 ... # Conflicts: # scripts/system/libraries/entitySelectionTool.js	2018-02-13 10:04:32 +13:00
SamGondelman	84cd0e1529	wip live material swapping on model entities, model overlays, avatars, ... and albedo swap on shape entities	2018-02-09 12:00:08 -08:00
David Rowe	adb6f66a05	Handle tablet entities and overlays not being available	2018-02-08 09:51:48 +13:00
SamGondelman	4d4294dd6a	Merge remote-tracking branch 'upstream/master' into decals	2018-02-02 16:50:01 -08:00
SamGondelman	d7f4b033e8	wip finish adding material entity	2018-02-02 16:49:33 -08:00
Elisa Lupin-Jimenez	e2bf8ad231	reverted to S3 for model URL	2018-02-02 15:36:28 -08:00
Elisa Lupin-Jimenez	d20ff0955c	qml doesn't work, .js might not work on osx	2018-02-02 11:26:21 -08:00
Elisa Lupin-Jimenez	73fde4333e	new local reference to image model	2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez	d7a847930d	added image icon	2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez	f71d9e4d6a	snapshot referenced locally, won't work on OS	2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez	bd7204e6ef	image entity now has grabbable and dynamic options	2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez	d390e20139	removed extraneous commenting and image class	2018-02-02 10:27:42 -08:00