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
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
samcake
84ff40c717
Merging with master
2017-11-21 14:12:47 -08:00
Dante Ruiz
56972d1547
Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing
2017-11-21 13:09:45 -08:00
Howard Stearns
4018b99118
Merge pull request #11848 from zfox23/commerce_flipTheSwitch
...
Turn Commerce on by default!
2017-11-20 16:18:53 -08:00
Dante Ruiz
a201312dcf
re-added fix that when into master that this branch breaks
2017-11-20 13:10:35 -08:00
Dante Ruiz
76935c1457
fixing merge conflict
2017-11-20 09:51:10 -08:00
Brad Hefta-Gaub
1de6ecec30
Merge pull request #11830 from ElderOrb/FB8244
...
8244 Rename captionColorOverride to captionColor
2017-11-18 14:28:32 -08:00
Brad Hefta-Gaub
95f59b0ab8
Merge pull request #11844 from druiz17/stylus-near-grab
...
allow near grabbing of entities while stylus module is running.
2017-11-17 17:33:54 -08:00
SamGondelman
033f658fff
Merge remote-tracking branch 'upstream/master' into pointers
2017-11-17 16:10:20 -08:00
Brad Hefta-Gaub
ed4ec3208d
Merge pull request #11797 from luiscuenca/case7589
...
Fix notifications shrink with avatar
2017-11-17 15:27:46 -08:00
Zach Fox
f47f259816
Turn Commerce on by default
2017-11-17 15:12:49 -08:00
luiscuenca
df51d66f60
no double scaling and comments
2017-11-17 13:40:22 -07:00
Dante Ruiz
8f6c781014
Merge pull request #11831 from misslivirose/feat/scale-emit-hands
...
Emit avatar scale changed signal when scaled with hand controllers
2017-11-17 11:55:31 -08:00
luiscuenca
bbf5e3b023
simplifications and comments
2017-11-17 12:45:36 -07:00
Dante Ruiz
4bbf2ff482
near grab entity while stylus is showing
2017-11-17 11:32:02 -08:00
Andrew Meadows
98001b64d9
Merge pull request #11788 from ctrlaltdavid/21579-a
...
Particles emitter fixes
2017-11-17 11:31:12 -08:00
Andrew Meadows
6a784794c9
Merge pull request #11789 from ctrlaltdavid/21599
...
Don't remove entities from list when try to delete locked entity
2017-11-17 11:26:00 -08:00
SamGondelman
61c7ccde6e
cleanup
2017-11-17 10:45:39 -08:00
SamGondelman
b252c81d84
fix home button hover overlay dimensions
2017-11-16 15:34:42 -08:00
Dante Ruiz
b66153b9cb
fixing setting incorrect parent
2017-11-16 15:07:00 -08:00
Dante Ruiz
f6a74cc80e
fixing merge conflicts
2017-11-16 10:04:36 -08:00
SamGondelman
ac7242102c
Merge remote-tracking branch 'upstream/pointers' into ui
2017-11-16 09:47:29 -08:00
SamGondelman
e3aa79990b
merge with master
2017-11-16 09:45:32 -08:00
Liv Erickson
dda32f1987
Emit scale changed signal when scaled with hand controllers
2017-11-16 09:26:42 -08:00
Dante Ruiz
94ac8e52d5
Merge pull request #11822 from druiz17/fix-tablet-3d-person
...
fixing tablet in 3d person
2017-11-16 08:55:27 -08:00
Alexander Ivash
c5d2f598d7
8244 Rename captionColorOverride to captionColor
2017-11-16 15:46:49 +03:00
SamGondelman
3274c41aeb
Merge remote-tracking branch 'upstream/pointers' into ui
2017-11-15 17:45:45 -08:00
Sam Gateau
3f5b21ec22
Merge pull request #11559 from Zvork/bloom
...
Bloom
2017-11-15 15:11:31 -08:00
SamGondelman
7eb22b372f
merge with master
2017-11-15 14:35:30 -08:00
Dante Ruiz
9564b7567b
fixing tablet in 3d person
2017-11-15 13:39:21 -08: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
Sam Gateau
2c51e516eb
Merge pull request #11744 from Zvork/shadow
...
Shadow caster culling fix
2017-11-15 09:49:39 -08:00
John Conklin II
8592f3fd4d
Merge pull request #11764 from luiscuenca/case7587
...
7587 Lasers resize with avatar
2017-11-15 09:31:45 -08:00
Olivier Prat
f47a3e7d2c
Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake
2017-11-15 09:42:57 +01:00
Olivier Prat
bf46ccefaf
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
2017-11-15 08:59:36 +01:00
Zach Fox
d6c244d1d5
Remove incorrect logic
2017-11-14 14:54:03 -08:00
Zach Fox
f5994375cf
Remove Marketplace's dependency on Edit.js for rez
2017-11-14 14:29:49 -08:00
Dante Ruiz
b026cfc42f
make sure teleport pointers are deleted
2017-11-14 14:09:08 -08:00
luiscuenca
26e401a069
fix broken HMD notifications
2017-11-14 14:22:53 -07:00
Dante Ruiz
54075d4c9a
make hud laser relative to camera
2017-11-14 13:09:16 -08:00
Dante Ruiz
8779d52ad3
making requested changes
2017-11-14 13:04:09 -08:00
Olivier Prat
5102c8e1b1
Merged with master
2017-11-14 21:56:00 +01:00
Dante Ruiz
416a47cfc7
adding controller haptic feedback to tablet onPress
2017-11-14 09:34:17 -08:00
Dante Ruiz
b779c33a1b
fixed lockEndUUID offset for scripts
2017-11-13 16:42:16 -08:00
Dante Ruiz
6173c33b51
fixing merge conflict
2017-11-13 15:02:25 -08:00
Dante Ruiz
132b33dbe7
disable stylus pointer when not being used
2017-11-13 14:53:54 -08:00
SamGondelman
60db24f2d3
merge with master
2017-11-13 14:36:24 -08:00
