Commit graph

30349 commits

Author SHA1 Message Date
Seth Alves
541d0ab4d6 work around menu-item name hash collision for Home 2018-12-03 17:33:04 -08:00
Jeff Clinton
0bca290de2
Merge pull request #14485 from sethalves/crash-on-exits
suppress 'No instance available' messages during shutdown.  try a dif…
2018-11-30 10:10:43 -08:00
Ken Cooke
88d935a28e Fix the audio injector "pitch" property 2018-11-29 08:12:14 -08:00
Ken Cooke
11252a8f56 Fix UBSAN warning (left-shift of negative integer) when peak limiter is called with implausibly large (or NaN) audio values 2018-11-28 16:48:34 -08:00
Seth Alves
0de011dd71
Merge pull request #14478 from danteruiz/ScriptEngine-Crashes
Fix script engine crashes when reloading scripts.
2018-11-28 12:04:52 -08:00
Shannon Romano
ff934a8f87
Merge pull request #14394 from sabrina-shanman/hfm_serializer
(case 20005) Create HFMSerializer interface for model loaders
2018-11-28 11:10:27 -08:00
Seth Alves
fac27553d7 suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient. 2018-11-27 17:02:48 -08:00
Seth Alves
8f21ade0c7 make cmake -DDISABLE_QML=1 work again 2018-11-27 12:41:40 -08:00
Sam Gateau
87730884ab
Merge pull request #14340 from Nex-Pro/patch-5
Change to English spelling of 'declination'
2018-11-27 10:53:28 -08:00
Dante Ruiz
c4a9ca3445 fix interface crashing when reloading scripts 2018-11-27 09:32:37 -08:00
sabrina-shanman
be511378cd Merge branch 'master' into hfm_serializer 2018-11-20 13:42:24 -08:00
birarda
23857ea8c2 ensure packets are added to loss list after timeout 2018-11-19 17:40:55 -08:00
Jeff Clinton
30051f75da
Merge pull request #14434 from sethalves/fix-throw-from-worker
catch QString exceptions that ModelCache can throw
2018-11-19 16:36:52 -08:00
Seth Alves
26a50e1820 don't log urls! 2018-11-19 15:38:12 -08:00
Seth Alves
cd177a4457 catch QString exceptions that ModelCache can throw 2018-11-19 15:25:14 -08:00
Jeff Clinton
484de06cf4
Merge pull request #14422 from SimonWalton-HiFi/entities-json-less-strict
Don't check for presence of particular keys in models json
2018-11-19 10:29:10 -08:00
Jeff Clinton
870619b19d
Merge pull request #14412 from amantley/avatarPipelineOffsets
Avatar Pipeline Joint Rotation Offsets Handling
2018-11-19 08:54:29 -08:00
Seth Alves
b72f462028
Merge pull request #14406 from danteruiz/master-disable-interstitial
disable interstitial for master
2018-11-16 20:13:50 -08:00
Simon Walton
3baebf55c5 Don't enforce key presence in models.json 2018-11-16 17:33:13 -08:00
Jason Najera
da3ea682ba
Merge pull request #14347 from r3tk0n/19550-oculus-store-v2
MS19550 - Don't show help for HMDs that aren't plugged in and active
2018-11-16 15:49:46 -08:00
Seth Alves
d19cdc62d7
Merge pull request #14135 from ElderOrb/FB18573
FB18573 - Other avatars' avatar entities may appear to be successfull…
2018-11-16 10:05:22 -08:00
r3tk0n
34224c4f16 Fix XBox One controller detection. 2018-11-15 14:08:21 -08:00
John Conklin II
60c538309a
Merge pull request #14411 from SamGondelman/fading
Fix for avatar flashing on fade out
2018-11-15 13:58:43 -08:00
John Conklin II
83660ab8e1
Merge pull request #14128 from Zvork/ao
Improved Ambient Occlusion
2018-11-15 13:57:13 -08:00
John Conklin II
8177d5bbcd
Merge pull request #14275 from Atlante45/fix/injector-crash
Rework audio data memory ownership model to fix injector crashes
2018-11-15 13:25:42 -08:00
amantley
3bf4a7844d moved the jointrotationoffsets to hfmModel.h from fbx.h 2018-11-15 10:56:17 -08:00
SamGondelman
597ff773e1 fix for avatar flashing 2018-11-15 10:52:22 -08:00
amantley
f9829c270d merged new fbx.h 2018-11-15 10:19:04 -08:00
amantley
c8cd65c3bd added getter for the orginal cluster bind matrix values in AnimSkeleton 2018-11-15 09:58:10 -08:00
Olivier Prat
0401858129 Cleaned up do_draw in GLESBackend 2018-11-15 18:34:41 +01:00
Olivier Prat
ed42c94772 Merge branch 'master' of http://github.com/highfidelity/hifi into ao 2018-11-15 17:55:29 +01:00
amantley
80ebde1036 started cleanup of pr 2018-11-14 17:27:45 -08:00
amantley
8256c652fc added the hook to put the copy of the mutated bind poses into tthe skeleton 2018-11-14 17:02:25 -08:00
Atlante45
31033ad685 Update TTS audio API use 2018-11-14 15:42:39 -08:00
Brad Davis
b7c567af08 Fix procedurals using the iGlobalTime input 2018-11-14 15:28:22 -08:00
Dante Ruiz
f17723c216 disable interstitial for master 2018-11-14 14:50:38 -08:00
Clement
d2a1bb4806 CR 2018-11-14 14:46:08 -08:00
Clement
7192aed131 Rework audio data memory ownership model 2018-11-14 14:45:18 -08:00
Seth Alves
1593c1185a revert PR-14238 "TypeError: Cannot read property 'buttons'" until we can adjust it. 2018-11-14 12:29:09 -08:00
John Conklin II
92a23ec0a9
Merge pull request #14294 from SimonWalton-HiFi/max-json-size
Allow for large Models.json file
2018-11-14 11:20:35 -08:00
sabrina-shanman
2d30902813 Fix OBJBaker not setting combineParts 2018-11-14 09:11:56 -08:00
Olivier Prat
85a3938cbe Switch to app for ambient occlusion debug script 2018-11-14 11:55:11 +01:00
Olivier Prat
45e0f65972 Merge branch 'ao' of http://github.com/Zvork/hifi into ao 2018-11-14 09:48:24 +01:00
Simon Walton
452c212c4f Add Paths entry parsing to json parser 2018-11-13 17:58:12 -08:00
Simon Walton
82e21e89e4 Merge remote-tracking branch 'upstream/master' into max-json-size 2018-11-13 17:26:20 -08:00
sabrina-shanman
e08bc7296f Merge branch 'master' into hfm_serializer 2018-11-13 15:41:49 -08:00
John Conklin II
79e67ad45f
Merge pull request #14238 from ElderOrb/FB19400
FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …
2018-11-13 15:07:21 -08:00
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police
Case 19409, Case 19468: Fading fixes and shader cleanup
2018-11-13 15:00:23 -08:00
Jeff Clinton
6c90d7ed11
Merge pull request #14343 from ElderOrb/FB19514
FB19514 - Interface crashes on attempt to apply new animation url via…
2018-11-13 14:59:50 -08:00
Simon Walton
167a8fdc04 Merge branch 'master' into max-json-size 2018-11-13 14:57:06 -08:00