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
11848e6952
Merge pull request #14885 from NissimHadar/21095-FixFailureOnUbuntuProductionBuild
...
Case 21095: Do not include nitpick in Ubuntu production builds.
2019-02-08 15:33:40 -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
b46fb7cfe7
Merge pull request #14860 from thoys/fix/create/entityListUnderscoreFirstSorting
...
Case 19385: local compare in entity list sorting
2019-02-08 14:56:32 -08:00
Howard Stearns
175fbecdc6
Merge pull request #14837 from SimonWalton-HiFi/display-name-suffixes
...
Assign lowest available suffix when display-names collide
2019-02-08 14:54:43 -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
f9b86725fd
Merge pull request #14816 from SamGondelman/avatar
...
Case 20924: Cleaning up Avatar findRayIntersection
2019-02-08 14:40:45 -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
Dante Ruiz
3a263dfff5
Merge pull request #14877 from danteruiz/remove-missed-webengine-references
...
Case 21079: move missed QtWebEngine references to +webengine directory
2019-02-08 14:17:34 -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
amerhifi
e8a35c63c7
moved asset loading to the permissions screen, added the onNotifyAppLoaded signal connect function as well as binding to the qtread with the ui thread.
2019-02-08 13:45:53 -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
NissimHadar
6598f83d39
Removed debug code.
2019-02-08 11:22:39 -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
SamGondelman
f7a487a020
move materialcache et al to material-networking library
2019-02-08 10:28:07 -08:00
NissimHadar
4727123e5f
Do not include nitpick in production builds.
2019-02-08 10:25:18 -08:00
danteruiz
76a56c679a
making requested changes
2019-02-08 10:03:05 -08:00
Shannon Romano
8ecaf958f6
Merge pull request #14882 from NissimHadar/21084-fixNitpickCMake
...
DNM Case 21084 - removed unneeded copying of SSL DLL's.
2019-02-08 09:09:11 -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
amerhifi
8848d0210a
stuff
2019-02-08 00:27:25 -08:00
amerhifi
dade8e9e7a
moving all the qtactivity code to OculusActivity due to lost reference when switching from MAin to Quest
2019-02-07 23:22:15 -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
NissimHadar
80392b1724
Removed unneeded copying of SSL DLL's.
2019-02-07 18:21:24 -08:00
Sam Gateau
466da1bd05
Merge pull request #14783 from NissimHadar/20816-installOnAndroid
...
Case 20816: install on android (Mac and Windows installers)
2019-02-07 17:02:40 -08:00
Matt Hardcastle
79bf26ee27
Add prebuild metrics logging for CI system
...
Metric about the times various parts of the build take are great to
have. This change takes us a step in that direction by adding metrics to
the prebuild step of the build process. These metrics are off by
default; use the `--ci-build` option of `prebuild.py` to enable them.
2019-02-07 16:37:54 -08:00
Ken Cooke
5681a996a1
Fix meter color gradient, to encourage proper mic levels.
...
High levels are now yellow, actual digital clipping sets red indicator light.
2019-02-07 16:33:41 -08:00
Ken Cooke
b04a59af1b
Calibrate meter to encourage hotter mic levels
2019-02-07 16:31:25 -08:00
Ken Cooke
d2abf1a56d
Add "clipping" indicator to audio level meter
2019-02-07 15:52:29 -08:00
Ken Cooke
52aa20b4d5
Add "gated" indicator to audio level meter
2019-02-07 15:47:56 -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
Roxanne Skelly
4bbb030ad7
Show only free items when running from the oculus store
2019-02-07 15:34:44 -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
danteruiz
d71fb2a100
moved missed QtWebEngine references to +webengines
2019-02-07 14:57:25 -08:00
NissimHadar
cf83124968
Improved instructions.
2019-02-07 14:57:25 -08:00
NissimHadar
c168d31e07
Added missing ".
2019-02-07 14:52:59 -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
NissimHadar
bab306fd30
Added instruction to add Python to path.
2019-02-07 14:38:53 -08:00
SamGondelman
c217f8d80f
remove overlay picks from stats qml
2019-02-07 14:25:07 -08:00
