Commit graph

62430 commits

Author SHA1 Message Date
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
luiscuenca
83e370d9de add shared pointer 2017-11-30 17:40:49 -07:00
Nissim Hadar
c63571a710 Debugging the image comparison. 2017-11-30 16:27:28 -08: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
Zach Fox
24e5994f20 The nuclear option is a bad option. 2017-11-30 15:55:09 -08:00
luiscuenca
5d1f2a04c1 restate deleted lines 2017-11-30 16:43:38 -07: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
Zach Fox
009d3a18a3 Call reset() on Ledger and Wallet before creating new wallet 2017-11-30 15:40:20 -08:00
luiscuenca
98e8361690 Fix and rebuild 2017-11-30 16:07:43 -07:00
Dante Ruiz
eaa049863d Merge branch 'RC60' of github.com:highfidelity/hifi into fix-equipping 2017-11-30 14:49:24 -08:00
Dante Ruiz
db374b8c6d fixing adjusting equipped entities 2017-11-30 14:49:06 -08:00
luiscuenca
9cd2dc921a back to for loop 2017-11-30 15:31:29 -07:00
luiscuenca
0729579266 fix for loop 2017-11-30 15:21:43 -07:00
luiscuenca
58e829dbda Delete leftover line 2017-11-30 15:11:38 -07:00
luiscuenca
e02e810399 Audio Handler fix 2017-11-30 15:06:02 -07:00
Nissim Hadar
0842e09570 Debugging the image comparison. 2017-11-30 13:59:02 -08:00
Nissim Hadar
2e8fe40da8 Recursive test evaluations. 2017-11-30 13:07:54 -08: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
Dante Ruiz
6fd8fb1e5b Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval 2017-11-30 11:52:41 -08:00
Dante Ruiz
785eedfb1c
Merge pull request #11896 from druiz17/fix-hud-hmd-rc60
fix laser interaction on HUD in HMD mode
2017-11-30 11:48:39 -08:00
Bradley Austin Davis
59aea9c401
Merge pull request #11862 from jherico/android_nov
Make buildable APK from Gradle
2017-11-30 11:23:29 -08:00
Andrew Meadows
05fbf8e511 workaround for zero-size objects in priority formula 2017-11-30 11:04:51 -08:00
Andrew Meadows
eb120b1bc1 use correct timestamp of avatar's outgoin data 2017-11-30 11:03:27 -08:00
Zach Fox
b0dda3de33 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sameInfoDontRefresh 2017-11-30 10:49:20 -08:00
vladest
74c002d1f5 Merge conflicts. Return back web console messages. For flickable in web engine core its enougth to add timestamp to touch events 2017-11-30 12:52:26 +01:00
vladest
a3d406d8d1 Merge branch 'master' into fix_tablet_scrollbars 2017-11-30 11:40:50 +01:00
vladest
dfeefe53b8 Make scroll bar handle centered on shaft. Width chaned on par with entities list html view 2017-11-30 11:40:02 +01:00
David Rowe
f5b12a0a9d Fix typo 2017-11-30 19:16:51 +13:00
David Rowe
a01d118c57 Documentation review 2017-11-30 16:03:57 +13:00
luiscuenca
b890a29b3a Clean console log 2017-11-29 19:05:01 -07:00
Howard Stearns
be083664fb
Merge pull request #11901 from howard-stearns/merge-ECDSA-to-rc60
Merge pull request #11882 from howard-stearns/the-lost-ECDSA
2017-11-29 17:45:05 -08:00
luiscuenca
b817143e2e Fixes on web and QML audio sync 2017-11-29 18:16:21 -07:00
Zach Fox
39afb4ab6a Merge pull request #11882 from howard-stearns/the-lost-ECDSA
The lost ecdsa
2017-11-29 15:53:52 -08: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
David Rowe
4269cc4004 Camera API JSDoc fixes 2017-11-30 09:28:45 +13:00
Nissim Hadar
4afc8f9759 Added print() code to the produced script. 2017-11-29 12:12:13 -08:00
Daniela
07c0610533 Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos 2017-11-29 18:59:35 +00:00
Dante Ruiz
82fb58ed96 remove debug statement 2017-11-29 10:58:10 -08:00
Daniela
ef49aa0b71 Refactor to comply with code standard. 2017-11-29 18:54:08 +00:00
Dante Ruiz
eba8a6e17b Merge branch 'master' of github.com:highfidelity/hifi into fix-vive-head-pose 2017-11-29 10:50:37 -08:00
Dante Ruiz
982fad5050 fix laser interaction on HUD in HMD mode 2017-11-29 10:42:35 -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