Sam Gateau
8d0b7a81f5
one more
2019-06-24 17:01:11 -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
cccc241553
Actually fix the bug
2019-06-21 16:19:09 -07:00
Sam Gateau
aa160c4d0f
Improving presentation of stats & debug information
2019-06-21 16:17:28 -07:00
Zach Fox
8044b33d65
This also works
2019-06-21 13:44:31 -07:00
Zach Fox
5067fd4cd2
OK this is definitely working
2019-06-21 13:41:11 -07:00
Zach Fox
21454f6256
Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers
2019-06-21 09:44:54 -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
Shannon Romano
334e7414a7
Merge pull request #15811 from RebeccaStankus/migrateEditFiles
...
Emergency fix to restore create in non-launcher builds
2019-06-20 17:19:39 -07:00
Zach Fox
3334e06cf4
This fixes it!
2019-06-20 16:52:46 -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
Zach Fox
d546550c3f
test this
2019-06-20 15:49:40 -07:00
RebeccaStankus
e7cec0f11f
Fixed dialogs imports
2019-06-20 15:07:39 -07:00
Zach Fox
d49205be74
Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers
2019-06-20 09:45:49 -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
Shannon Romano
3d72370d1a
Merge pull request #15792 from MiladNazeri/nametagFixes
...
Bugz-504: more stable nametag updates
2019-06-19 14:07:19 -07:00
Zach Fox
8fdfdbaae4
Another attempt, still not working
2019-06-19 13:31:21 -07:00
RebeccaStankus
f5fa44dc21
Revert "Changed icons path to be relative"
...
This reverts commit e277070423
2019-06-19 12:06:34 -07:00
RebeccaStankus
e277070423
Changed icons path to be relative
2019-06-19 11:17:52 -07:00
RebeccaStankus
30dd667b17
Changed qml import method
2019-06-19 10:40:32 -07:00
Milad Nazeri
61e4155eda
cr-r1
2019-06-19 07:30:28 -07:00
Zach Fox
7a4aa1e98c
BUGZ-657; BUGZ-713: Add a copy of the system library JS files because lots of system scripts depend on them being in the default scripts location
2019-06-18 17:13:38 -07:00
Milad Nazeri
422c70f300
fixed cache and extra line
2019-06-18 14:35:00 -07:00
Milad Nazeri
6196c6b746
more stable nametag updates
2019-06-18 14:32:11 -07:00
RebeccaStankus
3b53e34c95
fixing paths
2019-06-18 11:35:00 -07:00
Sam Gateau
f30eb919c7
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-18 11:24:04 -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
Preston Bezos
1801dc9d90
gave previous status a default value
2019-06-17 15:18:16 -07:00
Sam Gateau
e5a772a9b8
Introducing the HUD layer rendering pass into it s own task and file
2019-06-14 17:54:15 -07:00
Sam Gateau
12f8c7486b
getting rescaling to work for forward yop
2019-06-14 00:48:07 -07:00
Sam Gateau
4ba34f9a85
Merge branch 'master' of github.com:highfidelity/hifi into yellow
2019-06-13 17:42:52 -07:00
Sam Gateau
5288314d02
Drafting ways to rescale in forward
2019-06-13 17:42:32 -07:00
RebeccaStankus
772bad58ca
Increased bottom margin on muted overlay
2019-06-13 15:55:49 -07:00
Shannon Romano
b4f708f4ad
Merge pull request #15755 from samcake/nut
...
BUGZ-637: Detecting the problematic GPU on MAC not running properly Deferred render method right now
2019-06-13 14:32:36 -07:00
Zach Fox
1a0002db0c
BUGZ-676: Remove references to interstitial from SUI version of progress.js
2019-06-13 13:06:40 -07:00
Sam Gateau
b132a42e89
fixing the scroll view
2019-06-12 22:42:05 -07:00
Preston Bezos
e32d6e96ce
code was backwards
2019-06-12 16:12:24 -07:00
Preston Bezos
2eeec3518d
one last fix
2019-06-12 16:03:03 -07:00
Preston Bezos
3cd3f1a508
one last fix
2019-06-12 15:56:27 -07:00
Preston Bezos
8dcf6e6a03
removed a dead line of code, made a couple formating changes
2019-06-12 15:47:19 -07:00
Preston Bezos
29d795af5b
hopefully good now
2019-06-12 15:36:20 -07:00
Preston Bezos
8fa80f8935
fixed some formatting problems
2019-06-12 14:57:37 -07:00
Preston Bezos
038747e645
Merge branch 'master' of github.com:highfidelity/hifi into moreToolbarTinkering
2019-06-12 14:55:37 -07:00
Preston Bezos
34e9acc0b5
better fix for the toolbar remnant
2019-06-12 14:31:43 -07:00
Zach Fox
5077ae1bd7
Merge pull request #15745 from PrestonB1123/hudRemnant
...
BUGZ-355: Persistent UI Element
2019-06-12 10:40:37 -07:00
Preston Bezos
6c0bbfae76
hopefully good now
2019-06-12 10:02:33 -07:00
Preston Bezos
266c08227f
turned an else into an else if
2019-06-12 09:29:43 -07:00
