Commit graph

401 commits

Author SHA1 Message Date
Liv Erickson
62de08f324 fix issue with top icon changing 2018-02-07 10:16:27 -08:00
LaShonda Hopper
4da7a1e65a [Case 4315] ESLint pass on entityProperties.js.
Re-ran after changes and issue count was 0.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
2018-01-23 13:48:47 -05:00
LaShonda Hopper
72ed5f6d91 [Case 4315] Fixes OK button hard to use within HMD mode (details below).
* Shape Color picker dynamically updates entity color.
    * This removes the OK button which was hard to interact with in HMD mode.  The user no
      longer needs to click the OK button to submit changes to the color; rather the color
      of the entity updates as the user manipulates the color wheel and/or slider.

 Known Issue/TODO(s):

* Color Picker's Color Preview area has a bug where the original/starting color preview
is black as opposed to reflecting the entity's color upon clicking the color picker.
    * Color preview restore color functionality isn't working.  Clicking the initial
color preview doesn't restore the color.

* In HMD Mode: While interacting with the picker the user is able to control scrolling
  navigation for the edit menu.  For example, when moving up or down to change the hue
  the edit menu behind the picker will scroll up and down correlatively.
* In HMD Mode: When the picker is dismissed (user clicks outside the picker), the RGB
  fields for the color still receive input.

Tested in Desktop & HMD Modes.

Changes Committed:
    modified:   scripts/system/html/js/entityProperties.js
2018-01-23 13:40:31 -05:00
Nissim Hadar
46b494c802 Removed the Stage functionality - it is now implemented as a script. 2018-01-08 14:34:46 -08:00
Nissim Hadar
e797a77262 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
# Conflicts:
#	interface/resources/qml/js/Utils.jsc
2018-01-04 15:58:08 -08:00
Zach Fox
47a209dc4c Make things slightly better? 2018-01-02 13:11:00 -08:00
Zach Fox
25e76c668b Fix marketplacesInject.js for local Metaverse 2018-01-02 12:22:40 -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
8ee5f642a9 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
2017-12-22 15:41:59 -08:00
Nissim Hadar
2eb74647f0 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2017-12-22 08:05:46 -08:00
Zach Fox
618e5c9032 Commerce Data Tracking: Iteration 3 (Purchases) 2017-12-21 15:46:01 -08:00
Nissim Hadar
58c6f8e9c4 Radio buttons now work correctly. 2017-12-20 19:17:18 -08:00
Zach Fox
5da49d156e Commerce: Fix the behavior of the 'cancel' button in Wallet Setup 2017-12-19 16:26:58 -08:00
Zach Fox
ed5da4f83b Fix bug preventing 'get' buttons from working in marketplace 2017-12-19 15:07:50 -08:00
David Kelly
4fc69f8067
Merge pull request #11988 from davidkelly/dk/soldOut
Handle sold out items a bit better
2017-12-19 07:43:57 -07:00
Zach Fox
74a5f0881f Fix broken Buy buttons on Marketplace 2017-12-14 11:56:36 -08:00
David Kelly
a49ee46f54 Handle sold out items a bit better 2017-12-14 11:52:56 -07:00
Seth Alves
a6a45bc359
Merge pull request #11936 from ElderOrb/FB10108
10108 marketplace category cannot scroll
2017-12-08 07:02:15 -08:00
Brad Hefta-Gaub
b91909011a
Merge pull request #11914 from 1P-Cusack/FogBugz/Case_7049
[Case 7049]: Remove unused fields and checkboxes from Edit.js
2017-12-07 09:18:26 -08:00
Alexander Ivash
c007c6d00f 10108 marketplace category cannot scroll 2017-12-06 02:47:19 +03: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
Alexander Ivash
48b50e33dd 9461 Keyboard for create appear then disappears immediately (HMD) 2017-12-01 20:29:35 +03: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
Alexander Ivash
78d89d886f 9264 dismiss keyboard after user finished typing in marketplace search bar and hit search or return key 2017-11-16 00:13:46 +03:00
Nissim Hadar
f629357ded Removed Keylight attenuation from .js (as well as .html). 2017-11-11 18:58:12 -08:00
Zach Fox
33b6a13a4d Revert 11728 and fix marketplace JS injection - should revisit 2017-11-08 15:21:36 -08:00
David Rowe
fadbf09cdd Avoid potentially slow entity list refresh upon deleting entities 2017-11-07 18:10:10 +13:00
howard-stearns
76e06a6214 Update to stable-v-staging metaverse switching, to handle marketplace
injection.
2017-11-01 15:28:28 -07:00
Zach Fox
82816b5551
Merge pull request #11720 from zfox23/commerce_getToBuy
Change 'GET' to 'BUY' when hovering over costed items
2017-11-01 09:49:39 -07:00
Zach Fox
f9a410de87 Change 'GET' to 'BUY' when hovering over costed items 2017-10-31 14:53:37 -07:00
Nissim Hadar
fb6c5b98d6 Merge branch 'master' into hazeZone 2017-10-27 15:40:03 -07:00
Nissim Hadar
66c31caf4b Refactoring of the haze 2017-10-27 09:08:58 -07:00
Zach Fox
3e95484c4c Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting 2017-10-26 13:58:50 -07:00
ZappoMan
226b974ce8 DPI is not a decimal 2017-10-25 11:59:29 -07:00
Zach Fox
7998984d8e Missed tons of spots! 2017-10-24 14:30:47 -07:00
Ryan Huffman
894e91ea23 Merge pull request #10702 from CraftsmanMG/master
Fingerpaint  PR
2017-10-19 13:13:59 -07:00
Daniela
832e30ad1c Edited Packet headers. 2017-10-19 19:53:47 +01:00