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
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
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
Daniela
ef49aa0b71
Refactor to comply with code standard.
2017-11-29 18:54:08 +00:00
Dante Ruiz
982fad5050
fix laser interaction on HUD in HMD mode
2017-11-29 10:42:35 -08:00
Daniela
8985acd8b6
YAW ROLL PITCH tool now represents angles in a usefull way. Refactoring.
2017-11-29 13:00:36 +00:00
Daniela
68d5d600b7
YAW ROLL PITCH tool gizmos + functionality
2017-11-28 23:16:34 +00:00
Daniela
eb0d925091
YAW ROLL PITCH tool gizmos + functionality
2017-11-28 22:55:09 +00:00
Daniela
123f898f80
Merge branch 'master' of https://github.com/highfidelity/hifi into Gizmos
2017-11-28 15:38:30 +00:00
SamGondelman
d4a4c8902a
fix reticle depth at different scales and x button click on mouse press
2017-11-27 17:46:19 -08:00
SamGondelman
52039e022b
merge from master, get rid of resolution in RayPick
2017-11-27 13:11:35 -08:00
Alexander Ivash
da06b2656f
7991 Change Instances of Edit Mode to Create Mode
2017-11-27 22:47:42 +03: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
Dante Ruiz
9622fef149
fix controllerDispatcher time step
2017-11-21 09:48:19 -08:00
Dante Ruiz
5bb23ef1df
Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval
2017-11-21 09:30:41 -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
SamGondelman
393ad0079c
home button is circle instead of sphere, fixed positioning, fix lasers on tablet
2017-11-17 15:24:21 -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
SamGondelman
42d047c572
merge with master
2017-11-17 11:52:34 -08:00
SamGondelman
e38b0ab6b8
make web overlays match web entities more, remove resolution
2017-11-17 11:50:24 -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
Dante Ruiz
cabe3819a3
fixing crash
2017-11-17 10:20:34 -08:00
Dante Ruiz
e8da66514c
Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval
2017-11-17 08:49:59 -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
c82798673f
change controllerDispatcher to setTimeOut update
2017-11-16 10:42:28 -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
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
John Conklin II
8592f3fd4d
Merge pull request #11764 from luiscuenca/case7587
...
7587 Lasers resize with avatar
2017-11-15 09:31:45 -08: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
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
SamGondelman
2fb1981c4a
merge with master
2017-11-13 14:34:39 -08:00
Dante Ruiz
7613bddefa
fixing some issues with hud module
2017-11-13 14:26:34 -08:00
Dante Ruiz
5852224a31
clean up code and finialize changes
2017-11-13 13:37:53 -08:00
Zach Fox
641c4656c4
Fix bug with disappearing certificate info
2017-11-13 10:53:16 -08:00
Nissim Hadar
f629357ded
Removed Keylight attenuation from .js (as well as .html).
2017-11-11 18:58:12 -08:00
Dante Ruiz
43c6d71236
fix stylus module
2017-11-10 17:28:55 -08:00
luiscuenca
262dc091ce
7589 Fix notifications shrink with avatar
2017-11-10 17:22:41 -07:00
Sam Gateau
f857b37d2e
Merge pull request #11758 from NissimHadar/hazeUIFix
...
Improved Haze UI in Create menu
2017-11-10 11:58:06 -08:00
luiscuenca
7dfdc8da59
Redesign and clean of unused lineWidths
2017-11-09 17:50:38 -07:00
Dante Ruiz
ef55e3181d
moveing controllerDispatchaer pointers to pointerUtils.js
2017-11-09 16:48:52 -08:00
David Rowe
ad661cb345
Don't remove entities from list when try to delete locked entity
2017-11-10 10:50:07 +13:00
David Rowe
c53c356842
Display "no preview available" for ATP images in particles UI
2017-11-10 10:23:35 +13:00
Dante Ruiz
86439eff07
fixing merge conflict
2017-11-09 13:07:55 -08:00
SamGondelman
5a78c9ebfe
integrated stylus into pointer system, need to update controller module
2017-11-09 11:59:17 -08:00
Clément Brisset
40baca6ee1
Merge pull request #11756 from ctrlaltdavid/21592
...
Fix import from URL adding multiple copies of imported entities
2017-11-08 18:01:48 -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
Luis Cuenca
6fb47eef85
Merge branch 'master' into case7587
2017-11-07 17:19:39 -07:00
luiscuenca
332cb48a41
Lasers and teleport scale with avatar
2017-11-07 16:57:55 -07:00
Seth Alves
0edf056b78
Merge pull request #11755 from MidnightRift/patch-1
...
Fix controllerDispatcherUtils file path
2017-11-07 13:22:18 -08:00
Seth Alves
e22926eb89
Merge pull request #11762 from ctrlaltdavid/21594
...
Speed up entity list update after deleting entities
2017-11-07 09:34:47 -08:00
Seth Alves
ce7d0c324b
Merge pull request #11761 from ctrlaltdavid/21593
...
Don't move or rotate entities if Alt or Meta keys are pressed
2017-11-07 09:33:21 -08:00
Seth Alves
e9c0e53aa6
Merge pull request #11760 from druiz17/far-grab-parent
...
Far grab rolls up parent tree when grabbing and add offset to LaserPointer::lockEndUUID
2017-11-07 08:53:13 -08:00
David Rowe
fadbf09cdd
Avoid potentially slow entity list refresh upon deleting entities
2017-11-07 18:10:10 +13:00
Dante Ruiz
bdd31b63ed
update functions call names to match pointer API changes
2017-11-06 17:23:40 -08:00
Dante Ruiz
3e9eaa727b
Merge branch 'ui' of github.com:SamGondelman/hifi into ui
2017-11-06 16:39:10 -08:00
David Rowe
60319e8d53
Don't move or rotate entities if Alt or Meta keys are pressed
2017-11-07 13:35:31 +13:00
