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
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
Nissim Hadar
7cb9514feb
Converted 'Glare Angle' control to a slider.
2017-11-08 16:50:44 -08:00
Nissim Hadar
5a56ea5894
Merge branch 'master' into hazeUIFix
2017-11-08 16:44:59 -08:00
Nissim Hadar
5c7ebc0af3
Converted 'Glare Angle' control to a slider.
2017-11-08 16:44:05 -08:00
Nissim Hadar
2920c6f9a9
Merge branch 'master' into hazeUIFix
2017-11-08 15:42:20 -08:00
Nissim Hadar
c1b5d00993
Converted 'Background Blend' control to a slider.
2017-11-08 15:41:24 -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
Nissim Hadar
650df24761
Improved Haze UI in Create menu
2017-11-06 14:27:02 -08: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
f3147fc24f
Merge branch 'master' into hazeZone
2017-10-30 21:41:23 -07:00
Brad Hefta-Gaub
c1a808e726
Merge pull request #11703 from AndrewMeadows/circles-and-quads
...
fix Circles and quads
2017-10-30 18:03:32 -07:00
Nissim Hadar
6391282680
Swapped location of keylight attenuation and the blending factor.
2017-10-30 12:05:23 -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
Andrew Meadows
5ed58d5e5d
enable Quad in ShapeEntityItem properties
2017-10-26 22:59:25 -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
Zach Fox
aa48215933
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2
2017-10-19 10:54:31 -07:00
Sam Gateau
4d7accabdf
Merge pull request #11439 from NissimHadar/hazeZone
...
Adding haze component to the zone entity.
2017-10-18 16:14:28 -07:00
Zach Fox
6c7096b0d7
Fix login button injection on individual item page
2017-10-18 14:53:39 -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
Zach Fox
17a0dd2a76
Elide long usernames in injected code
2017-10-13 13:32:55 -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
d0deaa631c
Trying to pretty-up.
2017-10-12 07:54:03 -07:00
Nissim Hadar
00609c9547
Name correction.
2017-10-12 07:37:44 -07:00
Nissim Hadar
30fdf9d08e
Merge branch 'master' into hazeZone
2017-10-11 22:12:52 -07:00
Nissim Hadar
a21995db24
Added checkbox for altitude effect.
2017-10-11 22:10:58 -07:00
Nissim Hadar
3ec8faa1b9
Added checkbox for altitude effect of haze.
2017-10-11 20:47:39 -07:00
Nissim Hadar
96fd3123e8
Changed haze altitude to ceiling.
2017-10-11 20:36:24 -07:00
Nissim Hadar
2f4ddd84f8
Renamed haze colours and moved checkbox for glare.
2017-10-11 19:32:09 -07:00
Nissim Hadar
748f97364b
Moved Bakground Blend to end of Haze fields.
2017-10-11 19:20:46 -07:00
Nissim Hadar
832f9fb6e3
Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED.
2017-10-11 19:10:51 -07:00
Nissim Hadar
ea6b9ed28e
Removed ...ALTITUDE_MODE from combo.
2017-10-11 18:58:59 -07:00
Zach Fox
8d0d9a159f
Bugfixes
2017-10-10 10:38:19 -07:00
Daniela
a46ef56af9
Merge with hifi:master. Packet Headers version were increased.
2017-10-10 17:26:33 +01:00
