Brad Davis
4dd853ddbc
Cleanup from master
2019-02-12 15:14:50 -08:00
Brad Davis
db121957d2
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-12 15:00:03 -08:00
Shannon Romano
ee83c69d3e
Merge pull request #14899 from samcake/brownBis
...
Case 21146: Adding support for MSAA textures and framebuffer to gpu lib and backends.
2019-02-12 13:54:09 -08:00
John Conklin II
1761df7ccd
Merge pull request #14875 from jherico/feature/quest_custom_plugins
...
Case 20882: Support custom display / input plugin lists and small tweaks
2019-02-12 12:52:07 -08:00
Sam Gateau
a10cf9b620
Merge pull request #14883 from amerhifi/feature/quest
...
case:21032 Fixing Lifecycle of the android app
2019-02-12 12:32:38 -08:00
Brad Davis
a6f23f48d6
Merge branch 'feature/quest_custom_plugins' into feature/quest
2019-02-12 09:53:12 -08:00
Sam Gateau
0c2c581c64
Add the gles backend MS texture ad framebuffer support
2019-02-11 22:52:35 -08:00
Sam Gateau
afb6c838eb
REverting all the changes from the brown branch not used
2019-02-11 20:13:37 -08:00
Sam Gateau
9ad783135c
Bringing back brownBis to just msaa support
2019-02-11 19:42:05 -08:00
Sam Gateau
8a4f7fe2b6
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2019-02-11 18:57:33 -08:00
Jeff Clinton
123c2301da
Merge pull request #14858 from SamGondelman/fst
...
Case 21046: Fix Subsurface Scattering and ResourceCache "extra" bug
2019-02-11 17:40:44 -08:00
Brad Davis
b896e2577b
Fix QML file selectors
2019-02-11 16:17:06 -08:00
SamGondelman
d96b0534ab
fix resource texture crash
2019-02-11 16:12:13 -08:00
SamGondelman
4202685a4b
Merge remote-tracking branch 'upstream/master' into fst
2019-02-11 16:07:36 -08:00
Brad Davis
e534270f9a
Merge remote-tracking branch 'upstream/master' into feature/quest_custom_plugins
2019-02-11 15:41:32 -08:00
raveenajain
cfc13de39d
Merge branch 'master' of https://github.com/highfidelity/hifi into glb_files
2019-02-11 10:25:46 -08:00
amerhifi
e6366eaf02
consolidated the OculusAcitivity into OCulusMobilieAcitivity to reduce amount of back and forth between super and base as well as remove reduntant calls to native. Moved setcontentView on the native callback becuase it was blocking QtActivity from finishing its initialization
2019-02-11 09:46:06 -08:00
SamGondelman
20841a0eea
fix skybox loading I think and pull in sabrina's ktx caching fix
2019-02-09 16:42:34 -08:00
Brad Hefta-Gaub
a23f436a9f
Merge pull request #14880 from kencooke/audio-meter-improvements
...
Case 21091: Improved audio metering
2019-02-08 19:08:31 -08:00
raveenajain
709f784fea
:}
2019-02-08 16:51:18 -08:00
raveenajain
43a1c78402
Merge branch 'master' into glb_files
2019-02-08 15:59:01 -08:00
Anthony Thibault
88bb2c9bda
Merge pull request #14884 from hyperlogic/bug-fix/pack-all-traits-in-client-traits-handler
...
Pack all non-instanced avatar traits
2019-02-08 15:40:50 -08:00
Shannon Romano
bd33855820
Merge pull request #14786 from raveenajain/gltf_update
...
Case 20866: gltf color attribute
2019-02-08 15:27:41 -08:00
Shannon Romano
48db974aec
Merge pull request #14843 from raveenajain/gltf_embedded
...
Case 20937: gltf embedded data
2019-02-08 15:27:07 -08:00
Anthony Thibault
e6cdfe3377
Merge pull request #14827 from luiscuenca/FixShapeInfoAssertion
...
Case 14722: Fix assertion when trying to create multisphere shapeInfo with empty data (80.0/master)
2019-02-08 15:10:44 -08:00
Roxanne Skelly
74f8615fb7
Merge pull request #14876 from roxanneskelly/QmlMarketplace
...
Case 20653: QmlMarketplace - disable links if 3dhtml surfaces are not available
2019-02-08 15:04:35 -08:00
Sabrina Shanman
baf72eaae0
Merge pull request #14802 from sabrina-shanman/hfm_prep_joints
...
Case 20887: Move FST joint property handling to the model preparation step
2019-02-08 15:02:23 -08:00
John Conklin II
95aadeafb0
Merge pull request #14868 from SamGondelman/color
...
Case 21070: Fix black albedo coloring
2019-02-08 14:42:19 -08:00
John Conklin II
ab8ef2db08
Merge pull request #14862 from SamGondelman/backface
...
Case 21047: Render backfaces of triangles on Procedural Entities
2019-02-08 14:41:10 -08:00
John Conklin II
78f0a3feaa
Merge pull request #14739 from SamGondelman/animations
...
Case 20398: Fix animation URL change
2019-02-08 14:40:24 -08:00
Roxanne Skelly
93665fa501
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-02-08 14:21:29 -08:00
John Conklin II
851b968501
Merge pull request #14737 from SamGondelman/zone
...
Case 19291: Fix zone bugs
2019-02-08 14:07:26 -08:00
Anthony Thibault
d012d07519
Merge pull request #14865 from hyperlogic/feature/anim-optimizations
...
Animation System Optimizations
2019-02-08 12:44:10 -08:00
Sam Gateau
f9e827afa5
Merge branch 'master' of github.com:highfidelity/hifi into brown
2019-02-08 12:04:59 -08:00
Shannon Romano
a78b83c1dd
Merge pull request #14874 from sabrina-shanman/bug_no-normal-textures
...
(case 21076) Fix missing normal textures on models (RC80)
2019-02-08 11:19:22 -08:00
Anthony Thibault
5b7d7b8833
Pack all non-instanced traits
...
Previously this code only would pack the skeletonModelURL trait. Which is technically not a bug, because there it is the only non-instanced trait.
But, we plan to add new traits in the future. So, lets fix this now.
2019-02-08 08:53:43 -08:00
Roxanne Skelly
e6b2c890d0
Case21085 - Changing domains with scripting APIs not working
...
AccountManager was earlier changed to support QUrlQuery for
query strings in it's 'send.' Unfortunately, QUrlQuery isn't
a scriptable property type so using AM was failing from scripts
2019-02-07 22:21:05 -08:00
Sam Gateau
48d671c6c3
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2019-02-07 18:54:19 -08:00
Ken Cooke
d014dc2d14
Add audio meter ballistics for less display jitter (10ms attack, 300ms release)
2019-02-07 15:35:20 -08:00
Ken Cooke
2617febbcd
Replace ad-hoc audio meter with meter calibrated in dBFS
2019-02-07 15:31:13 -08:00
Brad Davis
d3301803d3
Support custom display / input plugin lists and small tweaks
2019-02-07 15:15:26 -08:00
raveenajain
446176d3a5
update to parse glb files
2019-02-07 15:08:04 -08:00
Jeff Clinton
54109deab9
Merge pull request #14825 from SamGondelman/fall
...
Case 20829: Always fall when flying is not allowed
2019-02-07 14:39:46 -08:00
John Conklin II
dda310c0b9
Merge pull request #14835 from SamGondelman/textures
...
Case 20944: Fix Model textures property
2019-02-07 14:19:01 -08:00
Brad Davis
070fb25b80
Cleaning up differnces from master
2019-02-07 13:33:28 -08:00
Anthony Thibault
f8608464fa
warning fixes
2019-02-07 11:33:44 -08:00
sabrina-shanman
ef529ed309
Do not use continues in logic checking if we should calculate mesh tangents
2019-02-07 11:27:08 -08:00
sabrina-shanman
985f6dcb75
Fix normal textures not being visible
2019-02-07 11:22:33 -08:00
danteruiz
95d30e5cbf
Merge branch 'master' of github.com:highfidelity/hifi into feature/quest
2019-02-07 10:41:44 -08:00
SamGondelman
7fe0e5909e
fix black albedo coloring
2019-02-07 10:14:10 -08:00
