Commit graph

80632 commits

Author SHA1 Message Date
Zach Fox
e52d65a7bc BUGZ-1451: Update links in controller reference 2019-09-10 11:31:51 -07:00
Maia Hansen
3e8a91e3ec
Merge pull request #16161 from samcake/yellow
BUGZ-1321: Address race condition on accessing a resource of the OpenGLDisplayPlugin before it s garanteed to be allocated
2019-09-10 11:19:04 -07:00
Howard Stearns
c78087b1f1
Merge pull request #16163 from Atlante45/fix/challenge-timer-crash
BUGZ-1416: Always stop challenge timer from the right thread
2019-09-09 17:13:51 -07:00
Clement
3b734b2222 Always stop challenge timer from the right thread 2019-09-09 16:01:45 -07:00
Sam Gateau
a290723583 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-09 13:43:52 -07:00
Sam Gateau
3c34443f24 where possible (in OpenGLDisplayPLugin) remove the need for the eye specific function and keep it in the HMD display plugin for the case of the POinter drawcall 2019-09-09 13:43:32 -07:00
Sabrina Shanman
3c35433f86
Merge pull request #16159 from sabrina-shanman/oven_stall
(BUGZ-143) Fix Oven not finishing when Re-bake originals checked
2019-09-09 13:12:49 -07:00
Shannon Romano
826fb061a4
Merge pull request #16158 from luiscuenca/offsetRotationMMDFix
BUGZ-1394: Fix avatars with rotation offsets
2019-09-09 11:47:43 -07:00
Sam Gateau
760eac6f83 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-09 11:33:27 -07:00
Sam Gateau
3509a797a1 Avoiding to rely on the display plugin resource in the getHUDOperator to avoid a case of unallocated resource 2019-09-09 11:33:05 -07:00
Zach Fox
eb286d992e
Merge pull request #16160 from RebeccaStankus/emojiDoubleClickSound
Emoji app duplicates sound on opening from toolbar
2019-09-09 11:27:26 -07:00
sabrina-shanman
01b29c3aac Fix DomainBaker not finishing when Re-bake originals checked and
.baked.fbx present
2019-09-09 10:43:08 -07:00
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
RebeccaStankus
33b78bea4f Changed textField module sounds 2019-09-09 10:36:35 -07:00
luiscuenca
94e1707ab9
Fix avatars with rotation offsets 2019-09-09 10:33:51 -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
sabrina-shanman
0a97f2535b Fix missing return on handling TextureBaker error 2019-09-06 17:46:59 -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