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 |
|
Thijs Wenker
|
48dc7ee938
|
New color/text entity properties
|
2019-01-05 01:56:28 +01:00 |
|
Andrew Meadows
|
a642af23b7
|
enable shapeType=ellipsoid and expose zone shapeType to UI
|
2019-01-04 12:37:23 -08:00 |
|
unknown
|
f8f13e974d
|
property range audit - add range info via macros accessible via API, tweak min/max/steps in entityProperties
|
2019-01-02 11:12:10 -08:00 |
|
Sam Gondelman
|
4c5ff0dc3e
|
Merge branch 'master' into NOverlays3
|
2018-12-07 14:26:59 -08:00 |
|
John Conklin II
|
2d52fffa4b
|
Merge pull request #14460 from huffman/fix/lifetime-slider-alt
Change lifetime back to a regular input field
|
2018-12-07 13:43:08 -08:00 |
|
Ryan Huffman
|
a42a771df5
|
Merge pull request #14540 from huffman/feat/hide-certified-urls
Add hiding of certified properties in Create
|
2018-12-07 13:42:23 -08:00 |
|
Thijs Wenker
|
3a259d8525
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/create/missingStartMiddleFinishTooltips2
# Conflicts:
# scripts/system/html/js/entityProperties.js
|
2018-12-07 20:24:21 +01:00 |
|
Ryan Huffman
|
bf844e0472
|
Add hiding of certified properties in Create
|
2018-12-07 11:05:52 -08:00 |
|
Ryan Huffman
|
f42c31ca36
|
Update number property to reuse numberdraggable emit function
|
2018-12-07 11:02:31 -08:00 |
|
Ryan Huffman
|
c9ab5c23ea
|
Add support for min/max/step/defaultValue on number field
|
2018-12-07 11:02:31 -08:00 |
|
Ryan Huffman
|
818339823c
|
Add new number type in Create
|
2018-12-07 11:02:31 -08:00 |
|
John Conklin II
|
55f59a720f
|
Merge pull request #14501 from thoys/fix/create/userDataErrorMessagePopupInfiniteLoopFix
MS19567 [CreateApp]: userData error message continues popup fix
|
2018-12-07 10:59:34 -08:00 |
|
John Conklin II
|
3a22299503
|
Merge pull request #14441 from dback2/preventDragDrop
Prevent dragging and dropping files onto Create windows
|
2018-12-07 10:58:42 -08:00 |
|
John Conklin II
|
88efaaa4c7
|
Merge pull request #14544 from huffman/fix/particle-property-layout
Improve Create properties for particles + materials
|
2018-12-06 16:45:44 -08:00 |
|
Thijs Wenker
|
4f2289b347
|
CR fixes
|
2018-12-06 23:42:37 +01:00 |
|
Thijs Wenker
|
2771e2862e
|
add missing material data json error clear on delete
|
2018-12-06 23:42:36 +01:00 |
|
Thijs Wenker
|
6d40bc9c2f
|
userData error message continues popup fix
|
2018-12-06 23:42:36 +01:00 |
|
David Back
|
6a11766dbf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into preventDragDrop
|
2018-12-06 14:02:42 -08:00 |
|
Thijs Wenker
|
d25b5f054b
|
Merge branch 'master' into fix/create/missingStartMiddleFinishTooltips
|
2018-12-06 20:48:42 +01:00 |
|
Sam Gondelman
|
d30dd4c26c
|
Merge branch 'master' into NOverlays3
|
2018-12-06 11:23:50 -08:00 |
|
Adam Smith
|
08d6e35d4d
|
Merge pull request #14372 from SamGondelman/decals
Case 19798: 3D projected Material Entities and materialRepeat option
|
2018-12-06 11:13:46 -08:00 |
|
Ryan Huffman
|
13c3b410d8
|
Merge pull request #14495 from dback2/draggableNumberFixes76-master
Draggable numbers - RC76 fixes to master
|
2018-12-06 09:47:38 -08:00 |
|