315 commits

Author	SHA1	Message	Date
Ryan Huffman	1894951f54	Add ignorePickIntersection to Create	2019-05-28 16:15:00 -07:00
unknown	22c2bfc075	fix material target parentIDChanged	2019-04-22 15:03:12 -07:00
Thijs Wenker	386d392144	The step arrows are actually clickable, they were missing multi-diff behavior before this change. < = >	2019-04-18 19:05:40 +02:00
Thijs Wenker	ef7c34eadd	addressed more CR feedback	2019-04-15 19:04:24 +02:00
Thijs Wenker	00a024fde2	fixing materialTargets, after the rebase	2019-04-12 20:06:32 +02:00
Thijs Wenker	c283c062c1	CR changes	2019-04-12 19:32:05 +02:00
Thijs Wenker	8b24cf51de	enhance the multi editing experience	2019-04-12 19:32:05 +02:00
Thijs Wenker	8e97c4f3f2	multi-editing support for properties	2019-04-12 19:30:12 +02:00
Thijs Wenker	71770e3f4e	move entity selection update code to its own function	2019-04-12 19:29:36 +02:00
Thijs Wenker	aef4f28194	unused variables / missing semi-colon	2019-04-12 19:26:03 +02:00
Shannon Romano	13fb3148a5	Merge pull request #15352 from dback2/materialTargetMasterFollowup ... Case 22082, 22101: PR 15325 follow up and PR 15351 RC82 > Master	2019-04-11 17:53:05 -07:00
Ryan Huffman	f2474b4d2b	Fix lack of ranges on numerical types in Create	2019-04-11 14:20:52 -07:00
unknown	1537d4351d	CR changes from PR 15325	2019-04-08 14:07:25 -07:00
unknown	b8b9035f9d	fix avatar/shape material targets, refresh material target when parent changes	2019-04-08 13:43:22 -07:00
Ryan Huffman	aff80dec26	Merge pull request #15325 from dback2/dynamicMaterialTargetProperties ... Case 20738: add dynamic multiselect for material target property	2019-04-05 17:55:26 -07:00
Shannon Romano	7e354a953b	Merge pull request #15276 from huffman/fix/new-properties-in-create ... Case 20739: Add new web and base properties to Create	2019-04-05 16:55:19 -07:00
unknown	f2aa155e1e	tweak style, add scrolling	2019-04-05 15:35:37 -07:00
unknown	4f4ec064e4	add dynamic multiselect for material targets	2019-04-05 15:35:37 -07:00
Ryan Huffman	9c4b3f017f	Remove min/max on web entity maxFPS ... Instead, let the C++ side enforce any limits. If we enforce a hard limit later on, we can get them via `Entities.getPropertyInfo`.	2019-04-05 15:08:48 -07:00
Sam Gondelman	414a39bd8a	Merge branch 'master' into particleShapes	2019-04-01 22:20:13 -07:00
Ryan Huffman	9abd0943ff	Add new web and other properties to Create	2019-03-27 16:29:04 -07:00
SamGondelman	3ff0770441	model emitters!	2019-03-20 21:25:14 -07:00
Thijs Wenker	19c51b25d1	don't ignore updates that originate from entityPropertiesTool itself	2019-03-20 00:18:21 +01:00
Thijs Wenker	aeb56ff22a	EntityList -> re-focus the rename field rather then re-selecting the text fully ... EntityProperties -> ignore selection updates when nothing is changed and window is focused	2019-03-14 01:26:06 +01:00
Shannon Romano	37727c8b60	Merge pull request #14938 from dback2/draggableNumberDisabled ... Case 20662: Entity Properties - fix disabling draggable numbers	2019-03-07 15:33:21 -08:00
Roxanne Skelly	fae6393663	Merge commit '743d1a58e2c4d07fa26f61b1512190263225fa42'	2019-03-05 15:11:25 -08:00
Roxanne Skelly	3ef02085ff	Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f'	2019-03-05 15:07:49 -08:00
Simon Walton	83c9381575	Convert avatarPriority to trivalued (inherit, crowd, hero) ... Also tweaks from original reviewer comments.	2019-03-01 17:25:46 -08:00
Simon Walton	8033e93eda	Add avatar-priority boolean to zone entities ... RC-79 version	2019-02-19 17:38:37 -08:00
David Back	e46b947913	properly disable draggable numbers, fix disable script and collision sound	2019-02-15 15:31:11 -08:00
Shannon Romano	453c081d9b	Merge pull request #14901 from huffman/fix/dropdown-close-on-click ... Case 19999: Update edit.js to auto close dropdowns when clicking outside	2019-02-14 14:48:03 -08:00
Ryan Huffman	fcfb1b7a4a	Update edit.js to auto close dropdowns when clicking outside	2019-02-12 10:06:25 -08:00
Ryan Huffman	16b48046c6	Fix not being able to type text into particle url field	2019-02-11 15:27:30 -08:00
Jeff Clinton	9d09c777d2	Merge pull request #14778 from thoys/fix/create/ignoreScriptedKeyEventsFromJSONEditor ... MS20501 [CreateApp/Properties] ignore scripted key events from the JSON Editors	2019-01-28 11:40:48 -08:00
Jeff Clinton	efb278b258	Merge pull request #14707 from thoys/fix/create/activeColorPickerDoesNotUpdateOnEntitySwitch ... fix for continuous color picker update loop	2019-01-25 10:38:14 -08:00
Thijs Wenker	992ce9f875	ignore scripted key events from the JSON Editors	2019-01-25 04:41:36 +01:00
David Back	ea5705907b	fix shape type and compound shape URL properties/tooltips	2019-01-22 18:22:13 -08:00
Thijs Wenker	6cabc86130	fix for continuous color picker update spam / only update color picker from properties when entity selection has changed	2019-01-14 18:54:28 +01:00
Thijs Wenker	24022f0ccc	add missing Text properties to Create App	2019-01-08 20:38:31 +01:00
John Conklin II	00a9367f14	Merge pull request #14662 from dback2/addGridEntitiesToCreate ... Add grid entities to create	2019-01-08 10:12:34 -08:00
Jamil Akram	4c6b14bf72	Merge pull request #14642 from dback2/propertyRangeAudit ... Entity property range/step audit	2019-01-08 09:42:59 -08:00
John Conklin II	ed4f2d9c10	Merge pull request #14439 from AndrewMeadows/shaped-zones ... Case 15518: shaped zones	2019-01-08 09:06:45 -08:00
David Back	d9e229d38e	remove add Grid entity button, fix color	2019-01-07 18:20:20 -08:00
David Back	e0e9a7de15	tabs	2019-01-07 18:20:20 -08:00
David Back	9013eee352	add grid entities to create - icons pending	2019-01-07 18:20:19 -08:00
David Back	3aa245036b	Merge branch 'master' into propertyRangeAudit	2019-01-07 15:36:18 -08:00
Thijs Wenker	7823b3d4a3	clarifying comments	2019-01-07 21:08:41 +01:00
Thijs Wenker	7d9cad3e8e	CreateApp - Fix active colorPicker to update on selection update	2019-01-07 20:35:09 +01:00
David Back	2f99729905	add rect case, fix step rounding	2019-01-07 11:31:04 -08:00
David Back	56007c8512	Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit	2019-01-07 10:50:45 -08:00