Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 15:14:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75851 commits 71 branches 56 tags 1.2 GiB
Commit graph

75851 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Ryan Huffman
71669af696
Merge pull request #14896 from huffman/fix/particle-effect-url 
Case 20502: Fix not being able to type text into particle url field
 2019-02-11 16:32:26 -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
Sam Gateau
51e7c6a83b
Merge pull request #14878 from raveenajain/glb_files 
Case 20966: glb files
 2019-02-11 16:08:33 -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
Ryan Huffman
16b48046c6 Fix not being able to type text into particle url field 2019-02-11 15:27:30 -08:00
John Conklin II
6410879e33
Merge pull request #14879 from mattr1x/add-metrics-to-prebuild 
Add prebuild metrics logging for CI system
 2019-02-11 14:47:04 -08:00
Sam Gateau
54e36f0825
Merge pull request #14892 from NissimHadar/21111-simplifyRecursiveScripts 
Case 21111: simplify recursive scripts
 2019-02-11 12:02:12 -08:00
raveenajain
cfc13de39d Merge branch 'master' of https://github.com/highfidelity/hifi into glb_files 2019-02-11 10:25:46 -08:00
NissimHadar
d3e0aa5d8c Make sure only top-level recursive script runs recursively. 2019-02-10 20:32:38 -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
NissimHadar
b2fb7a737b Ready for testing. 2019-02-09 13:21:36 -08:00
NissimHadar
dff98f462f Removed unnecessary of spaces. 2019-02-09 13:13:13 -08:00
Brad Hefta-Gaub
8faff57033
Merge pull request #14830 from thoys/fix/create/zoneShapeVisualizersIgnorePickray 
MS20909: ignore pickRay for zone shape visualizers
 2019-02-08 19:12:58 -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
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
Anthony Thibault
d012d07519
Merge pull request #14865 from hyperlogic/feature/anim-optimizations 
Animation System Optimizations
 2019-02-08 12:44:10 -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
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
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
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