Commit graph

80617 commits

Author SHA1 Message Date
Shannon Romano
e1dac580b6
Merge pull request #16121 from luiscuenca/audioPosesSyncFix
BUGZ-1234: Mitigate the effect of audio noise on talking animations
2019-09-09 10:37:07 -07:00
Shannon Romano
ca190f9932
Merge pull request #16143 from dooglifeSF/Sitting_emote_variants
Sitting emote variants, revisions on stand emote agree anims, point bug fix
2019-09-09 10:12:56 -07:00
Shannon Romano
4017a4f937
Merge pull request #16156 from sethalves/wtf-audio-devices
BUGZ-1434: use existing audio settings on startup
2019-09-09 10:09:34 -07:00
Matt Hardcastle
7e5026a365
Merge pull request #16141 from MattHardcastle/bad-status-code
Error bad status while downloading launcher
2019-09-09 08:56:00 -07:00
Shannon Romano
c7db287458
Merge pull request #16146 from AndrewMeadows/ess-with-simulation
BUGZ-1385: allow entity-script-server to move entities kinematically
2019-09-09 07:51:28 -07:00
Seth Alves
4eb88fb396 use existing audio settings on startup 2019-09-07 15:55:31 -07:00
Matt Hardcastle
3074ff96e0
Merge pull request #16150 from MattHardcastle/add-signing-2.0-rebase
Add signing 2.0 rebase
2019-09-07 09:09:11 -07:00
Andrew Meadows
7a5cb0d555 fix typo 2019-09-06 17:23:38 -07:00
Andrew Meadows
e97d3df637 bump version number 2019-09-06 17:23:38 -07:00
Andrew Meadows
e546ef23a8 don't bid for sim ownership of kinematic unless grabbed 2019-09-06 17:23:38 -07:00
Andrew Meadows
227b99859d fix api for checking EntityItem grab status 2019-09-06 17:23:38 -07:00
Andrew Meadows
580b6a3b2c small optimization: check before lock 2019-09-06 17:23:38 -07:00
Andrew Meadows
0a8c640ab5 give entity-script-server a simulation 2019-09-06 17:23:38 -07:00
Andrew Meadows
6e35c8b804 cleanup 2019-09-06 17:23:38 -07:00
Shannon Romano
e6a2905c35
Merge pull request #16153 from MattHardcastle/revert-url-encode
Revert "Percent decode URL from Thunder"
2019-09-06 17:08:57 -07:00
Matt Hardcastle
dba61180be Revert "Percent decode URL from Thunder"
This reverts commit 4e6198d784.

If Thunder is properly configured this wouldn't be required.
2019-09-06 15:11:44 -07:00
dooglifeSF
932093bead Merge branch 'master' into Sitting_emote_variants 2019-09-06 15:06:52 -07:00
Matt Hardcastle
d8fec15842 Error bad status while downloading launcher 2019-09-06 14:25:51 -07:00
dooglifeSF
422ad52a87 Add one more sitting emote: clap03, touch up two of the standing clap anims, adjust frame ranges 2019-09-06 13:57:33 -07:00
Sam Gateau
f909bc4cde
Merge pull request #16149 from samcake/yellow
BUGZ-1360: Avoid bad normal values leading to black pixels in Forward
2019-09-06 13:33:19 -07:00
Shannon Romano
42ad7d5efb
Merge pull request #16147 from MattHardcastle/updater-to-resource
Support updater in Contents/{MacOS,Resources}
2019-09-06 12:49:31 -07:00
Sam Gateau
9c14838443 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-06 12:41:11 -07:00
Zach Fox
adb266e065
Merge pull request #16148 from MiladNazeri/bugz-1395/persistent-emoji-after-shutdown
Bugz 1395/persistent emoji after shutdown
2019-09-06 11:42:30 -07:00
milad
bb0b51116a cr1 2019-09-06 11:29:29 -07:00
dante ruiz
768ac08d11 Add entitlements for Launcher and Interface 2019-09-06 11:20:16 -07:00
dante ruiz
c2e0e6a976 Change Launcher config.json location
Launcher `config.json` can not be inside Interface's app bundle, as it
will break signing.
2019-09-06 11:20:06 -07:00
dante ruiz
f80fb39447 Lowercase interface
Launcher expects a lower-cased "Interface". This ensures that it's
created lower-cased on case sensitive filesystems.
2019-09-06 11:19:54 -07:00
Anthony Thibault
2857086861
Merge pull request #16136 from hyperlogic/feature/3x3-blend
Directional Blending Support
2019-09-06 11:10:56 -07:00
milad
b352d53083 removed space made on accident 2019-09-06 11:00:14 -07:00
Sam Gateau
bc0f719b71 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-06 10:58:35 -07:00
Sam Gateau
85c18f1033 Adding a clamp to 0 to the computed y coordinate while unpacking the normal map 2019-09-06 10:57:54 -07:00
milad
1d8bbc3529 removed startup time var 2019-09-06 10:55:35 -07:00
milad
1576a29916 toggled flag for discconecting from wearable signal 2019-09-06 10:53:17 -07:00
milad
120c678557 added a wearable check for avimojis on startup 2019-09-06 10:51:12 -07:00
Matt Hardcastle
b239ad1ae3 Support updater in Contents/{MacOS,Resources}
Codesigning fails when binaries are in the `Resources` directory. This
change moves updater and ensures HQLauncher can handle the updater at
both paths.
2019-09-06 10:37:24 -07:00
Shannon Romano
db0c2da516
Merge pull request #16142 from MattHardcastle/launcher-urldecode
Percent decode URL from Thunder
2019-09-06 10:34:52 -07:00
Sam Gateau
acf51ad217
Merge pull request #16137 from jherico/fix/bugz-1398
BUGZ-1398: Tablet access to local HTML
2019-09-06 09:59:22 -07:00
Anthony J. Thibault
aa848df227 warning fixes 2019-09-05 17:43:07 -07:00
dooglifeSF
b5d2675a05 Merge branch 'master' into Sitting_emote_variants 2019-09-05 16:45:24 -07:00
dooglifeSF
5061aca487 Update sitting_emote_raisehand03_all.fbx 2019-09-05 16:44:13 -07:00
Shannon Romano
5d316a9fd6
Merge pull request #16140 from jherico/fix/webrtc_debug_build
Fix webrtc link errors in debug builds
2019-09-05 16:09:26 -07:00
Matt Hardcastle
4e6198d784 Percent decode URL from Thunder
URLs from Thunder's API may be percent encoded.
2019-09-05 16:01:16 -07:00
dooglifeSF
9cfa4753d9 sitting emote acknowledge and dismiss added, also went through emote_agree set and pushed them per Josh feedback. Fixed point glitch stand/sit 2019-09-05 15:31:07 -07:00
Anthony J. Thibault
c35640f739 Warning fixes and small bug fix to anim stats 2019-09-05 14:54:19 -07:00
Shannon Romano
19c7502998
Merge pull request #16138 from MattHardcastle/check-zip-size
Check macOS Launcher's zip size before unzipping
2019-09-05 14:43:57 -07:00
Shannon Romano
b3c7ca6e8f
Merge pull request #16127 from amerhifi/master
case DEV-492:  Ensure launcher cannot be pinned
2019-09-05 14:29:38 -07:00
Brad Davis
7c84d897ba Fix webrtc link errors in debug builds 2019-09-05 14:16:52 -07:00
amerhifi
9e69b79e2a adding the space back 2019-09-05 13:41:51 -07:00
amerhifi
2a3b99daa6 removing flags 2019-09-05 13:40:29 -07:00
Matt Hardcastle
43237e1409 Check macOS Launcher's zip size before unzipping
The Launcher can download an error page rather than the full Launcher.
When this happens, the error page file is passed directly to unzip,
which promptly fails with the following message:

  End-of-central-directory signature not found.  Either this file is not
  a zipfile, or it constitutes one disk of a multi-part archive.  In the
  latter case the central directory and zipfile comment will be found on
  the last disk(s) of this archive.
  unzip:  cannot find zipfile directory in one of NewHQLauncher.zip or
          NewHQLauncher.zip.zip, and cannot find NewHQLauncher.zip.ZIP, period.

This change improves the error message by checking the size of the
Launcher download and failing if the Launcher is smaller than the
smallest Launcher we've released. The smallest Launcher we've had is
308KB, so I picked 250KB as the limit because it's a nice rounder number
below that.
2019-09-05 12:35:24 -07:00