309 commits

Author	SHA1	Message	Date
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
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
Elisa Lupin-Jimenez	42151b8fd4	creating new image entity opens image property options	2018-02-02 10:14:27 -08:00
Elisa Lupin-Jimenez	308e481e63	switch to image property list not working	2018-02-02 10:11:37 -08:00
Elisa Lupin-Jimenez	ceb621a521	reverted protocol change for images	2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez	dc5f29aa58	entity item properties hooked up for image	2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez	fc0e87d5ea	more infrastructure links	2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez	fdca8ab93e	added image button to edit.js, working on connecting to cpp	2018-02-02 10:08:39 -08:00
David Back	db56246cd6	more fixes, clean up, updates	2018-02-01 17:30:56 -08:00
David Back	09bcee7c2e	Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab	2018-01-31 11:03:11 -08:00
Atlante45	bc819c698e	Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back	2018-01-30 16:09:30 -08:00
David Back	3bbe821aba	Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab	2018-01-30 14:08:27 -08:00
Liv Erickson	3aa12eb7df	pass in deletedIDs so can delete children depth > 1	2018-01-29 17:51:26 -08:00
Dante Ruiz	08511a2a2e	fix new model path	2018-01-29 15:27:55 -08:00
David Back	c722b4b04d	Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab	2018-01-19 18:20:49 -08:00
David Back	c4359de859	entity edit tools wip update	2018-01-19 18:20:36 -08:00
David Rowe	85bda1da8e	Add Window browseChanged signal as replacement for openFileChanged	2018-01-17 09:57:20 +13:00
Nissim Hadar	e94982a470	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2018-01-09 10:10:27 -08:00
Liv Erickson	d1e176ee9d	Update menu to reflect non-grabbable entity types, include particles	2018-01-08 11:31:09 -08:00
Liv Erickson	4e582975b6	cleanup	2018-01-05 18:03:20 -08:00
Liv Erickson	f563b8ca2e	Make zones and lights not default grabbable	2018-01-05 17:49:43 -08:00
Nissim Hadar	87e896ab20	Zone inheritance ready for testing.	2017-12-29 15:13:46 -08:00