Commit graph

79308 commits

Author SHA1 Message Date
Matt Hardcastle
3a5aa4194e Pin the macOS HQ Launcher target version to 10.9
This change pins HQ Launcher's target SDK to 10.9, which is the same as
the target SDK for Interface. Without this pinned value the target
version defaults to whatever the OS version is on the machine that
happened to build HQ Launcher.
2019-06-22 11:53:23 -07:00
Matt Hardcastle
73616b81f3 Fail on empty LAUNCHER_HMAC_SECRET
Priot to this change there was code that attempted to verify that
LAUNCHER_HMAC_SECRET was set to something. This code was broke though
and didn't catch the case correctly. This change fixes the check.
2019-06-22 11:53:23 -07:00
Zach Fox
8ee482f7ab
Merge pull request #15820 from zfox23/SUI/fixLasers
Actually fix BUGZ-657.
2019-06-21 16:43:53 -07:00
Zach Fox
cccc241553 Actually fix the bug 2019-06-21 16:19:09 -07:00
Sam Gateau
e0d0124caa
Merge pull request #15817 from SamGondelman/cube
BUGZ-734: Possible fix for black shape issue
2019-06-21 16:13:36 -07:00
Andy Howell
733f969e49
Merge pull request #15819 from huffman/feat/winlauncher-logging
Add status code and unzip logging to Windows launcher
2019-06-21 15:59:39 -07:00
Ryan Huffman
efdc3584a7 Add status code and unzip logging to Windows launcher 2019-06-21 15:46:59 -07:00
Shannon Romano
13615eb9ff
Merge pull request #15818 from sabrina-shanman/crash_scriptengine_thread
(BUGZ-619) Fix potential crash when ending script on main thread
2019-06-21 15:08:42 -07:00
MiladNazeri
11a0c671e5
Merge pull request #15795 from zfox23/SUI/fixLasers
BUGZ-657; BUGZ-713: Add a copy of the most default JS files because lots of system scripts depend on them being in the default scripts location
2019-06-21 15:01:24 -07:00
Shannon Romano
33c99da71e
Merge pull request #15816 from roxanneskelly/bugz761
BUGZ-761 Add locks to OctreeEditPacketSender to protect various members
2019-06-21 14:39:41 -07:00
sabrina-shanman
4fafa2135a Fix potential crash when ending script on main thread 2019-06-21 14:20:15 -07:00
Zach Fox
8044b33d65 This also works 2019-06-21 13:44:31 -07:00
Zach Fox
022a47d3ec Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers 2019-06-21 13:41:31 -07:00
Zach Fox
5067fd4cd2 OK this is definitely working 2019-06-21 13:41:11 -07:00
SamGondelman
8409119ad0 possible fix for black shape issue 2019-06-21 12:58:49 -07:00
Roxanne Skelly
001eae784a Add locks to OctreeEditPacketSender to protect various members 2019-06-21 11:42:27 -07:00
Shannon Romano
248acb29fd
Merge pull request #15810 from amerhifi/master
BUGS 665: Audio client crash on timer during shutdown
2019-06-21 11:26:37 -07:00
Zach Fox
21454f6256 Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers 2019-06-21 09:44:54 -07:00
amer cerkic
67e42148ef Merge branch 'master' of https://github.com/highfidelity/hifi 2019-06-21 09:43:33 -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
9f1768a230 Remove unnecessary files 2019-06-20 17:06:12 -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
Zach Fox
3334e06cf4 This fixes it! 2019-06-20 16:52:46 -07:00
Shannon Romano
30d8697b61
Merge pull request #15812 from huffman/feat/winlauncher-logging
Add extra logging to Windows launcher
2019-06-20 16:36:44 -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
Andy Howell
447f0ca55c
Merge pull request #15807 from AndrewMeadows/fix-crash-bugz512-redux
BUGZ-512: fix MacOS crash in FakeAudioInputStream on domain-change and shutdown
2019-06-20 15:42:33 -07:00
Ryan Huffman
b28763a017 Add extra logging to Windows launcher 2019-06-20 15:21:01 -07:00
amer cerkic
30e295d1a0 push to talk causes fun, removing tttt 2019-06-20 15:12:20 -07:00
amer cerkic
1218f7e014 moved audioclient stop to dtor 2019-06-20 15:10:21 -07:00
Andy Howell
4cc6eae478
Merge pull request #15809 from samcake/nut
BUGZ-776 : Detect AMD gpu on more than one possible token
2019-06-20 15:08:41 -07:00
RebeccaStankus
e7cec0f11f Fixed dialogs imports 2019-06-20 15:07:39 -07:00
Shannon Romano
6d3e129bcd
Merge pull request #15808 from danteruiz/launcher-logging
Add more detail logging to mac launcher
2019-06-20 15:06:54 -07:00
Andrew Meadows
cd9b450475 re-expose mic and camera to disable crash 2019-06-20 15:03:15 -07:00
Shannon Romano
7645fcfaa1
Merge pull request #15805 from SamGondelman/shared
BUGZ-777: Clean up SharedObject code
2019-06-20 14:35:58 -07:00
Sam Gateau
bde50aa21c Detect AMD gpu on more than one possible token... 2019-06-20 14:24:04 -07:00
dante ruiz
b42306739d remove comments 2019-06-20 14:00:50 -07:00
dante ruiz
5fed710035 enable log 2019-06-20 13:48:33 -07:00
dante ruiz
c0250275a1 extra logging 2019-06-20 13:01:07 -07:00
Zach Fox
d49205be74 Merge branch 'master' of github.com:highfidelity/hifi into SUI/fixLasers 2019-06-20 09:45:49 -07:00
Andrew Meadows
1ea0dba083 use weak_ptr for fade-out-finished lambda 2019-06-20 09:29:48 -07:00
Andrew Meadows
87d7a0a72f recover the Good Parts from first attempt to fix bugz-512 2019-06-20 09:29:48 -07:00
Sam Gateau
a66bd04810
Merge pull request #15803 from SamGondelman/setPipeline
BUGZ-703: Possible fix for do_setPipeline crash and other Mac fixes
2019-06-20 09:27:16 -07:00
Andrew Meadows
b23badf374
Merge pull request #15804 from samcake/wall
DEV-146, BUGZ-747: Add one call in PlatformInfo::getPlatform() returning the complete description of the platform
2019-06-20 09:07:19 -07:00
Shannon Romano
77d91fce33
Merge pull request #15802 from annabrewer/unreachable-code
Small warning fix
2019-06-19 18:06:34 -07:00
Shannon Romano
80b118560d
Merge pull request #15801 from SimonWalton-HiFi/recording-playback-null-url
A null recording clip should be considered an error
2019-06-19 17:58:46 -07:00
SamGondelman
50df5e0bc5 small cleanup to shared object etc. 2019-06-19 16:56:45 -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
SamGondelman
fb8cc27fef Merge remote-tracking branch 'upstream/master' into shared 2019-06-19 16:52:04 -07:00