Zach Fox
6e4b9c1723
Merge pull request #15774 from PrestonB1123/iconChanges
...
New Top Bar Icons
2019-06-26 11:01:12 -07:00
Preston Bezos
f0dd28e71a
removed extra line
2019-06-26 09:54:43 -07:00
Preston Bezos
bd3fe8a092
fixed conflict and spacing
2019-06-26 09:12:32 -07:00
Sam Gateau
48f9c33bdd
Merge pull request #15822 from samcake/yellow
...
BUGZ-664: Introduce scaling of rendering for forward renderer
2019-06-25 14:27:17 -07:00
Andrew Meadows
20376c9542
Merge pull request #15823 from ctrlaltdavid/DOC-79
...
DOC-79: Entities JSDoc Update
2019-06-25 14:18:13 -07:00
Sam Gateau
768dd051aa
Add sanity check for viewport resolution scale to avoid negative value
2019-06-25 11:54:50 -07:00
Zach Fox
b7a3d82f0f
DEV-170: Increase the speed of the animation when clicking between tabs in Settings
2019-06-25 11:30:25 -07:00
Preston Bezos
1481c7424f
changed ptt muted icon
2019-06-25 11:02:44 -07:00
Preston Bezos
5686f51171
fixed hmd settings buttons spacing
2019-06-25 09:19:30 -07:00
Sam Gateau
b0ebcc745d
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-24 15:36:28 -07:00
Zach Fox
3e2e020731
BUGZ-746: About tab: Better CPU/GPU info reporting; New copied info (including OS version)
2019-06-24 12:48:13 -07:00
David Rowe
b2b7a6ae99
Merge branch 'master' into DOC-79
2019-06-22 12:11:22 +12:00
Sam Gateau
7bf2c5fc8e
Simplify the setting name
2019-06-21 16:22:01 -07:00
Sam Gateau
aa160c4d0f
Improving presentation of stats & debug information
2019-06-21 16:17:28 -07:00
Sam Gateau
35d7211aca
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-21 11:38:33 -07:00
Sam Gateau
a856fdb3ca
getting rid of the resolution Scale on the display plugin
2019-06-21 10:36:25 -07:00
amer cerkic
67e42148ef
Merge branch 'master' of https://github.com/highfidelity/hifi
2019-06-21 09:43:33 -07:00
Sam Gateau
69bb9ac0b6
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-20 22:23:15 -07:00
Sam Gateau
22cd631a04
Merge And Modifying the Graphics settings and the dev menu
2019-06-20 17:48:36 -07:00
Anthony Thibault
64a77d07e0
Merge pull request #15814 from hyperlogic/bug-fix/twitchy-finger-fix
...
Disable handTouch.js to prevent finger twitching
2019-06-20 17:03:39 -07:00
Anthony J. Thibault
3a6d8dc383
Disable handTouch.js to prevent finger twitching
...
This PR disables handTouch.js.
handTouch.js allows the fingers to animate on the surface of an object.
However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them.
We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality.
Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range.
This can cause the fingers to bend incorrectly for a moment.
Also, three new items were added to the Developer > Show Animation Stats panel.
* Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls.
* Flow: displays if flow is active of disabled.
* Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled.
https://highfidelity.atlassian.net/browse/BUGZ-154
2019-06-20 15:52:36 -07:00
amer cerkic
1218f7e014
moved audioclient stop to dtor
2019-06-20 15:10:21 -07:00
Andrew Meadows
cd9b450475
re-expose mic and camera to disable crash
2019-06-20 15:03:15 -07:00
Sam Gateau
b5e4a47375
Proper allocation of the resource in forward and starting to remove the ui as we have it
2019-06-19 17:33:26 -07:00
Sam Gateau
b2631e89e9
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-19 17:11:20 -07:00
Sam Gateau
8f04eaae1d
Merge branch 'master' of github.com:highfidelity/hifi into wall
2019-06-19 16:53:04 -07:00
Sam Gateau
53094ef70c
One more pass of clean up on the platform api, returning the complete description in a single call, adding the version of the OS and deprecating legacy PlatformInfo calls
2019-06-19 16:52:33 -07:00
jennaingersoll
150ae31a88
Merge pull request #15748 from ctrlaltdavid/DOC-85
...
DOC-85: Revise new MyAvatar signals' JSDoc
2019-06-19 15:16:46 -07:00
RebeccaStankus
30dd667b17
Changed qml import method
2019-06-19 10:40:32 -07:00
RebeccaStankus
feaea12b24
Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles
2019-06-19 10:14:04 -07:00
Sam Gateau
1ae06f01b0
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-18 17:41:56 -07:00
David Rowe
72fdbc0aa8
Entity information and manipulation
2019-06-19 10:18:48 +12:00
Zach Fox
18f703ee43
BUGZ-732: Enable text selection by mouse in Profile/Display Name field
2019-06-18 14:11:14 -07:00
Zach Fox
9b1c7b39bb
Merge pull request #15790 from zfox23/SUI/aboutTab
...
Implement an "About" tab in the Settings app
2019-06-18 13:16:30 -07:00
Zach Fox
f6822f17a9
Add computer description
2019-06-18 12:43:45 -07:00
Zach Fox
bd02a5eafd
Better text formatting
2019-06-18 12:29:52 -07:00
Zach Fox
4670c11397
Tighten up the graphics on level 3
2019-06-18 12:26:03 -07:00
Zach Fox
ec4fc672b6
Better design; Interface version
2019-06-18 12:09:37 -07:00
Sam Gateau
f30eb919c7
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-18 11:24:04 -07:00
Zach Fox
34def0fd6b
DEV-145: About screen for platform info
2019-06-18 11:09:15 -07:00
Anthony Thibault
10dae7e4d9
Merge pull request #15783 from hyperlogic/feature/anim-debug-draw-improvement
...
Improvement to Developer > Avatar > Draw Animation
2019-06-18 10:50:46 -07:00
RebeccaStankus
cd508a5475
Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles
2019-06-18 09:10:41 -07:00
RebeccaStankus
5a49ac9a22
moved files
2019-06-17 16:45:54 -07:00
Zach Fox
32aec78ea2
Merge pull request #15782 from zfox23/SUI/resizeSignal
...
BUGZ-699: Make PSFListModel fetch early when making container bigger
2019-06-17 15:27:21 -07:00
Zach Fox
9cb4ad61ee
BUGZ-699: Make PSFListModel fetch early when making container bigger
2019-06-17 15:06:20 -07:00
Anthony J. Thibault
4b5d5062b1
Improvement to Developer > Avatar > Draw Animation
...
This feature was added to help diagnose the root cause of a rarely occurring finger twitching bug.
Also, some asserts were added to AnimClip to also help catch a rarely occurring crash.
2019-06-17 14:50:19 -07:00
Shannon Romano
7c3147fa2c
Merge pull request #15778 from zfox23/SUI/scrollbars
...
DEV-142 & DEV-140: Scrollbars in Your Profile and Settings
2019-06-17 14:38:10 -07:00
Preston Bezos
538b15dd57
caught a couple of edge cases for mic states
2019-06-17 13:20:25 -07:00
Preston Bezos
7879dbf687
changed width of ptt muted icon
2019-06-17 13:13:43 -07:00
Zach Fox
1d2ed1985f
DEV-142 & DEV-140: Scrollbars in Your Profile and Settings
2019-06-17 12:35:45 -07:00
