Commit graph

61964 commits

Author SHA1 Message Date
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
b7a959255d [Case 7049] Remove basic color section from non-shape Properties tab.
Changes Committed:
    modified:   scripts/system/html/css/edit-style.css
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
Zach Fox
7490744fb7
Merge pull request #11882 from howard-stearns/the-lost-ECDSA
The lost ecdsa
2017-11-29 15:46:22 -08:00
howard-stearns
57ec73bb13 spacing 2017-11-29 14:37:20 -08:00
howard-stearns
115bc27557 back to stable, rather than staging 2017-11-29 13:39:58 -08:00
howard-stearns
fb038c17ee for now, point this PR at staging so that it can be tested as built by
jenkins
2017-11-29 09:54:34 -08:00
howard-stearns
55589312f1 new padding/initialization that matters on linux server 2017-11-29 09:53:48 -08:00
howard-stearns
281b4cfd88 Merge branch 'master' of https://github.com/highfidelity/hifi into the-lost-ECDSA 2017-11-28 16:59:44 -08:00
Anthony Thibault
16ca1a9ec6
Merge pull request #11888 from hyperlogic/bug-fix/vive-no-head
Head tracking bug fix for vive HMD users
2017-11-28 16:30:26 -08:00
David Back
1904daf623
Merge pull request #11869 from dback2/mirrorissues
prevent spectator cam from updating secondary cam aspect ratio when it's in use by mirrors
2017-11-28 14:05:47 -08:00
Anthony J. Thibault
8364700b7a Head tracking bug fix for vive HMD users 2017-11-28 12:19:16 -08:00
Brad Hefta-Gaub
e6c6e5f239
Merge pull request #11883 from birarda/feat/kick-on-fingerprint
add option to kick logged in users by fingerprint too
2017-11-28 08:29:46 -08:00
Stephen Birarda
e2082c0bcf apply machine fingerprint permissions if username absent 2017-11-27 19:02:40 -08:00
Stephen Birarda
8978254037 kick logged in by fingerprint/ip if enabled in DS settings 2017-11-27 18:23:14 -08:00
MiladNazeri
83d13717fe
Merge pull request #11752 from Menithal/21539
21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected
2017-11-27 16:02:01 -08:00
Brad Hefta-Gaub
6d6ac0a5a9
Merge pull request #11873 from sethalves/fix-wearable-domain-change-crash
avoid a crash during domain change while wearing something
2017-11-27 13:01:48 -08:00
howard-stearns
1575119327 PR feedback 2017-11-27 10:46:57 -08:00
howard-stearns
2e919682a0 Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet 2017-11-27 10:02:53 -08:00
Brad Hefta-Gaub
068b93fc30
Merge pull request #11838 from druiz17/fix-grabbing
fixing setting incorrect parent when grabbing entities
2017-11-27 08:27:42 -08:00
Menithal
693da50a68 21539: Fixed None Checkmark being on Desktop mode 2017-11-27 07:59:04 +02:00
Menithal
5d52b9936b 21539: Updated Logic to match request 2017-11-27 07:42:18 +02:00
Menithal
ba1cd74ffe 21539: Moved Desktop HMD to None 2017-11-26 21:58:16 +02:00
Seth Alves
56e299c205
Merge pull request #11875 from samcake/orange
Fix the spot light direction
2017-11-23 11:11:31 -08:00
Sam Gateau
9a31a3dc95 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-11-22 23:29:55 -08:00
Sam Gateau
9c53ab719a Merge branch 'orange' of https://github.com/samcake/hifi into orange 2017-11-22 23:29:25 -08:00
howard-stearns
a6b437a79f get rid of "error" warning because the key wasn't broken into 64 char
lines
2017-11-22 16:55:57 -08:00
Seth Alves
9ccc416e80 avoid a crash during domain change 2017-11-22 16:34:56 -08:00
howard-stearns
abf41300dd refactor 2017-11-22 16:29:56 -08:00
howard-stearns
899999a4c6 fix up dynamic ownership challenge 2017-11-22 15:58:30 -08:00
Clément Brisset
e20555bf38
Merge pull request #11870 from Atlante45/feat/update-default-perms
Add tmpRezCertified to default perms
2017-11-22 14:57:22 -08:00
Atlante45
b398e235a2 Add tmpRezCertified to default perms 2017-11-22 13:40:44 -08:00
David Back
1aeadcbc64 prevent spectator cam from updating secondary cam aspect ratio when its in use by mirrors 2017-11-22 11:38:52 -08:00
Zach Fox
fada02a76c
Merge pull request #11864 from zfox23/commerce_newHelpText
New Help questions/answers/link
2017-11-22 12:53:16 -05:00
howard-stearns
16d6d8a361 Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet 2017-11-21 16:28:29 -08:00
howard-stearns
ca80c9b764 Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet 2017-11-21 16:28:08 -08:00
Sam Gateau
8389137caa
Merge pull request #11834 from highfidelity/pointers
UI Pointer Optimization
2017-11-21 16:01:52 -08:00
Zach Fox
d2ebfbf064 New Help questions/answers/link 2017-11-21 18:55:48 -05:00
Brad Hefta-Gaub
c66a500fcf
Merge pull request #11861 from druiz17/fix-modal
Fix replace content dialog not closing
2017-11-21 15:43:20 -08:00
samcake
a0e40efdc8 Fixing all the changes of interface name coming from upstream 2017-11-21 14:55:58 -08:00
Dante Ruiz
767b0fa4af remove unused variable warning 2017-11-21 14:45:55 -08:00
samcake
ebd701a1ab Merging with master 2017-11-21 14:40:37 -08:00
samcake
84ff40c717 Merging with master 2017-11-21 14:12:47 -08:00