Commit graph

105 commits

Author SHA1 Message Date
Nissim Hadar
46b494c802 Removed the Stage functionality - it is now implemented as a script. 2018-01-08 14:34:46 -08:00
Nissim Hadar
87e896ab20 Zone inheritance ready for testing. 2017-12-29 15:13:46 -08:00
Nissim Hadar
0e76d481a1 Completed the use of radio-buttons to hide disabled sections. 2017-12-29 08:28:31 -08:00
Nissim Hadar
a6f3401d0e Removed background combo. 2017-12-29 08:15:34 -08:00
Nissim Hadar
64644fc980 WIP - skybox inheritance 2017-12-28 14:31:59 -08:00
Nissim Hadar
8bb4d1431c WIP - copy skylight URL to ambient URL. 2017-12-28 09:35:40 -08:00
Nissim Hadar
4ffd896ced WIP - adding AmbientLightPropertyGroup 2017-12-26 11:15:33 -08:00
Nissim Hadar
58c6f8e9c4 Radio buttons now work correctly. 2017-12-20 19:17:18 -08:00
LaShonda Hopper
eb8438a9e8 [Case 7049] Addresses code review feedback.
Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
2017-12-04 18:25:51 -05:00
LaShonda Hopper
82dd13a82c [Case 7049] Fixes superfluous fields issue with Particle Effects (details below).
When creating or selecting an object entityProperties.html's properties-list is
updated to have and entity type specific class.  This class is used within
edit-style.css to specify rules for the Properties Tab when a certain type of
entity is currently selected.

This resolves the issue with duplicate/misleading color fields for Particle
Effects by adding .ParticleEffectMenu rules to edit-style.css to control the
visible sections.

When the Properties Tab is in the ParticleEffectMenu mode only the following
sections are shown (listed as ordered):
    General Section
    Collision Section
    Physical Section
    Spatial Section
    Behavior Section

Changes Committed:
    modified:   scripts/system/html/css/edit-style.css
    modified:   scripts/system/html/js/entityProperties.js
2017-12-01 15:59:52 -05:00
LaShonda Hopper
6469dbddc1 [Case 7049] ESLint: Fixes unknown/undefined symbol errors (details below).
* Fixes the following:
    * 1775:5  error  'augmentSpinButtons' is not defined    no-undef
    * 1777:5  error  'setUpKeyboardControl' is not defined  no-undef

ESLint Issue Count is now 0.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
2017-11-30 19:43:40 -05:00
LaShonda Hopper
991143655f [Case 7049] ESLint: Fixes indent and max-len errors.
Issues dropped from 26 to 2.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
2017-11-30 19:41:20 -05:00
LaShonda Hopper
391fc6022e [Case 7049] ESLint: Ignore camelcase error for lines where it's needed.
Issues reduced from 28 to 26.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
2017-11-30 19:26:46 -05:00
LaShonda Hopper
ca65297489 [Case 7049] ESLint: Fixes various minor errors (details below).
* Fixes some equality checks.
* Fixes some spacing issues.
* Fixes some comment style issues.
* Detected issues reduced from 50 to 28.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
2017-11-30 19:24:20 -05:00
LaShonda Hopper
618978c959 [Case 7049] ESLint: Fixes unused var errors (details below).
* Fixes the following errors:
    * 590:13   error  'elJSONEditor' is assigned a value but never used                 no-unused-vars
    * 592:13   error  'elColorSections' is assigned a value but never used              no-unused-vars
    * 641:13   error  'elHyperlinkSections' is assigned a value but never used          no-unused-vars
    * 653:13   error  'elTextBackgroundColor' is assigned a value but never used        no-unused-vars
    * 670:13   error  'elZoneKeyLightDirectionZ' is assigned a value but never used     no-unused-vars
    * 695:13   error  'elZoneHazeAttenuateKeyLight' is assigned a value but never used  no-unused-vars
    * 696:13   error  'elZoneHazeKeyLightRange' is assigned a value but never used      no-unused-vars
    * 697:13   error  'elZoneHazeKeyLightAltitude' is assigned a value but never used   no-unused-vars
* This reduces eslint errors from 67 to 50

* Removes instances of stale commented code found when removing the above related items.
* Removes allSections array which doesn't appear to be actively used save registering _certain_ sections.
    * Removed registered section vars which weren't actually in use aside from being registered.

Changes Committed:
	modified:   scripts/system/html/js/entityProperties.js
2017-11-30 19:09:58 -05:00
LaShonda Hopper
834fe2f5d5 [Case 7049] JSHint Run: Fixes majority of noted lint issues (details below).
* 3 JSHint issues remain as of this commit, 3 instances of the same error.
    * Error: Functions declared within loops referencing an outer scoped
             variable may lead to confusing semantics.
        * scripts/system/html/js/entityProperties.js: line 469, col 27
        * scripts/system/html/js/entityProperties.js: line 1634, col 30
        * scripts/system/html/js/entityProperties.js: line 1641, col 32

Tested and prior fix to remove duplicate color fields for entity types is
preserved for non-particle entity types.

Changes Committed:
	modified:   scripts/system/html/js/entityProperties.js
2017-11-30 18:42:59 -05:00
LaShonda Hopper
3152d5808e Minor: Replace tabs with spaces noticed when browsing file.
Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
2017-11-30 15:14:47 -05:00
LaShonda Hopper
532fc2ca5b [Case 7049] Remove duplicate color fields for shapes (details below).
There are 2 types or styles of color picker controls.
    * color-control1: Composed of only a color picker
    * color-control2: Composed of a color picker and rgb fields.  The color can be
      manipulated by either.

Previously for shapes, the Properties tab utilized both types of color controls.
Color-control1 was displayed within the quick properties section; whereas, color-control2 was
displayed farther down within the more detailed sections of Properties tab.

This commit removes the duplication of the fields, opting to utilize color-control2 within
the quick properties portion of the Properties tab.

Changes Committed:
    modified:   scripts/system/html/entityProperties.html
    modified:   scripts/system/html/js/entityProperties.js
2017-11-30 15:14:47 -05:00
Nissim Hadar
f629357ded Removed Keylight attenuation from .js (as well as .html). 2017-11-11 18:58:12 -08:00
Nissim Hadar
66c31caf4b Refactoring of the haze 2017-10-27 09:08:58 -07:00
ZappoMan
226b974ce8 DPI is not a decimal 2017-10-25 11:59:29 -07:00
Nissim
935180bf09 Fixed my bloody stupid mistake... 2017-10-17 15:02:05 -07:00
Nissim
a641d6de66 Variable rename. 2017-10-17 09:18:29 -07:00
Nissim
1b42572f99 Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone
# Conflicts:
#	scripts/system/html/js/entityProperties.js
2017-10-16 14:29:56 -07:00
Nissim
fd2b0da76d First version. 2017-10-16 12:20:31 -07:00
Nissim Hadar
9c9dfc7211 Replace light blend with glare. 2017-10-13 13:36:46 -07:00
Nissim Hadar
c76229934c Changed blend-in colour and blend-out colour to colour and glare colour 2017-10-13 12:21:00 -07:00
Nissim Hadar
dc45c7af75 Implemented radio-buttons. 2017-10-12 11:18:18 -07:00
Nissim Hadar
a21995db24 Added checkbox for altitude effect. 2017-10-11 22:10:58 -07:00
Nissim Hadar
96fd3123e8 Changed haze altitude to ceiling. 2017-10-11 20:36:24 -07:00
Nissim Hadar
7d5a887f43 Refactoring. 2017-10-09 17:25:19 -07:00
Nissim Hadar
bfdd489682 Fixed color selector bug. 2017-10-06 13:18:12 -07:00
Nissim Hadar
320c888ce4 Added checkbox to allow separate control of keylight attenuation. 2017-10-05 20:31:45 -07:00
Nissim Hadar
f261477aa2 Adding sun attenuation. 2017-10-05 17:55:24 -07:00
Nissim Hadar
e15699192d Added blend angle and altitude reference base. 2017-10-05 14:18:03 -07:00
Nissim Hadar
2e2364e03f WIP - adding haze blend out colour 2017-10-05 13:20:21 -07:00
Nissim Hadar
cbaae2c79b WIP - haze colour. 2017-10-05 12:59:56 -07:00
Nissim Hadar
395d9cbd6b WIP - haze colour. 2017-10-05 12:13:37 -07:00
Nissim Hadar
512b469dc6 Added haze colour selector. 2017-10-05 11:31:49 -07:00
Nissim Hadar
595530161a WIP - adding background blend.
Haze altitude works.
2017-10-05 09:28:55 -07:00
Nissim Hadar
4d8a1db895 Merge branch 'master' into hazeZone
# Conflicts:
#	libraries/entities-renderer/src/RenderableModelEntityItem.cpp
2017-09-27 17:50:51 -07:00
Seth Alves
ce3e5eb1a3 set grabbable and other checkboxes correctly if userData is blank or malformed. near-trigger blocks near-grab 2017-09-26 18:56:27 -07:00
Nissim Hadar
27af4685e7 Added range and altitude to UI. 2017-09-25 09:32:52 -07:00
Nissim Hadar
6cbf087708 First version with combo for Haze Mode. 2017-09-24 15:08:22 -07:00
Nissim Hadar
5e1d470553 WIP 2017-09-22 09:48:22 -07:00
Thijs Wenker
af4bc59307 clone local avatar entities 2017-09-14 23:31:51 +02:00
Menithal
dc5e374485 Merge remote-tracking branch 'upstream/master' into 21484 2017-08-17 22:28:43 +03:00
Andrew Meadows
71ba6ba10a Merge pull request #10807 from jmo7/21356
21356 - Reorder Edit.js
2017-08-08 15:15:37 -07:00
Menithal
982d4a451f Updated Protocol to add allowTranslation
There still is a bug for the value no actually updating
2017-08-08 23:47:37 +03:00
Seth Alves
184c3d855d Merge pull request #11061 from TurnMeUp-OG/21470
Fix tablet focus issue when property menu is open and field is selected
2017-08-01 15:10:26 -07:00