Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-01 04:51:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
51360 commits 73 branches 59 tags 1.2 GiB
Commit graph

421 commits

Author SHA1 Message Date
samcake
c62108c3c8 Resolve merging conflict 2017-02-09 09:49:59 -08:00
Seth Alves
2ec4f118fd Merge pull request #9639 from hyperlogic/feature/tablet-pal 
Ported PAL to tablet
 2017-02-08 21:17:38 -08:00
Anthony J. Thibault
e25ad0f332 Fix debug assert in FBXReader. 2017-02-08 18:56:58 -08:00
Brad Hefta-Gaub
07cf87749f Merge branch 'master' of https://github.com/highfidelity/hifi into betterBots 2017-02-08 13:41:33 -08:00
Brad Hefta-Gaub
eedfc4fd38 fix various bot related bugs 2017-02-08 12:35:00 -08:00
samcake
2975f73fc9 merging 2017-02-07 13:13:21 -08:00
Andrew Meadows
8b1f569132 tweak max texture resolution thresholds 2017-02-06 12:13:31 -08:00
samcake
feb36b8dbf Merge branch 'purple' of https://github.com/samcake/hifi into blue 2017-02-06 11:56:45 -08:00
Andrew Meadows
8b2c720e29 sliding texture caps for models 2017-02-06 11:53:37 -08:00
Andrew Meadows
d65cbbb455 name change: maxSize to maxNumPixels 2017-02-06 11:53:37 -08:00
Andrew Meadows
b3ae6f9aec cap size of textures from FBX files 2017-02-06 11:53:37 -08:00
Andrew Meadows
24b1f3ddbc cleanup whitespace 2017-02-06 11:53:37 -08:00
samcake
e8cdee71ed avoid assertion on mac 2017-02-03 22:49:41 -08:00
Andrew Meadows
56911bdf1b sliding texture caps for models 2017-02-03 11:14:40 -08:00
Andrew Meadows
2f8823d103 name change: maxSize to maxNumPixels 2017-02-02 14:09:47 -08:00
Andrew Meadows
64dbfd0819 cap size of textures from FBX files 2017-02-02 13:38:08 -08:00
Andrew Meadows
b4cef787d9 cleanup whitespace 2017-02-02 13:38:08 -08:00
Brad Davis
67ce5040ec Fix bug in FBX parse changes 2017-01-16 10:09:47 -08:00
Brad Davis
29b160d685 Reduce temp qvariant creation and qvariant conversion 2017-01-12 16:17:03 -08:00
Brad Davis
2383592678 Improve FBX parsing performance by bulk loading of arrays 2017-01-12 16:17:02 -08:00
Brad Hefta-Gaub
dbbed462b4 cleanup naked qDebug() calls 2016-12-19 22:24:25 -08:00
Brad Davis
30a9961362 tracing polish 2016-12-16 14:02:27 -08:00
Ryan Huffman
7bb2755913 Add chrome tracing support 2016-12-16 01:14:01 -08:00
Anthony J. Thibault
68b103b46b Fix for missing fields in static initializer. 2016-12-01 15:21:49 -08:00
Anthony J. Thibault
e96676fea4 Support for the 3ds Max object offset feature 
FBXReader now supports the GeometricTranslation, GeometricRotation and GeometricScaling FBX fields.
These offsets are applied directly to the mesh vertices, as they are never animated and the rest of our
rendering and animation system would have difficulty supporting them otherwise.
 2016-11-30 18:28:55 -08:00
Seth Alves
43536e0046 in C, order of argument evaluation isn't defined 2016-10-28 15:48:54 -07:00
Anthony J. Thibault
1c6fbc08bf Speculative fix for crash in FBXReader.cpp 
I could not reproduce the issue, however looking at the stack trace shows that
the crash is due to indexing past the end of the FBXNode::properties QVariantList.
Guard against this from happening by checking the property length first.
 2016-10-17 13:22:17 -07:00
Seth Alves
4470338663 catagorize some qDebugs 2016-09-14 21:39:45 -07:00
SamGondelman
9d447d4dcc enabled qnetworkrequest redirects everywhere I could find them 2016-09-06 17:35:06 -07:00
Brad Hefta-Gaub
7397b884e7 support for fbx2016 format 2016-08-30 09:07:39 -07:00
Brad Davis
4c150efc11 Categorize some debug logging in FBX parsing 2016-08-11 12:09:56 -07:00
samcake
3ab56062d4 Address some warnings and syntax issues 2016-07-14 12:06:02 -07:00
samcake
307243da8b cleaning compilation warnings and tuning the FBX material mapping pass 2016-07-13 11:04:53 -07:00
Brad Hefta-Gaub
e32929dce2 added support for material map in FST file 2016-07-11 17:40:07 -07:00
samcake
a619a142ed Friday night build, working on getting the LUT generated on the GPU 2016-06-24 17:48:40 -07:00
samcake
3ec14fd746 MErging and still trying to understand the curvature isssue 2016-06-22 18:06:55 -07:00
samcake
0c882832bf Bringing the Scattering type to the pixels and having a different shading during the lighting pass (for global right now) 2016-06-20 17:58:35 -07:00
Brad Hefta-Gaub
262e0262fc Merge pull request #7889 from samcake/color 
add support for ambient occlusion texture and lightmap texture for fbx exported from Blender
 2016-06-08 17:38:45 -07:00
samcake
25eb569433 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-06-02 10:38:40 -07:00
Anthony J. Thibault
0035774eb2 Fix for models exported from Daz3D. 
The way post rotations were being applied was incorrect.
I guess we've never tried a model that used the Maya Rotate Axis property before...
 2016-06-02 10:07:09 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
samcake
c1fa096e78 adding texcoord 1 on all the material/model and go fetch occlusion map with this uv instead of texcoor0. this allow for separate transforms just for occlusoin map 2016-05-16 15:42:48 -07:00
samcake
5050456c32 Merge branch 'master' of https://github.com/highfidelity/hifi into color 2016-05-16 11:20:14 -07:00
Atlante45
0878d87ac7 remove some unnecessary dependencies 2016-05-14 14:50:02 -07:00
Brad Hefta-Gaub
b1d86c8881 Merge pull request #7898 from samcake/red 
Fix broken rendering for simple metallic material
 2016-05-13 17:22:36 -07:00
samcake
cdb9cb6519 Fixing the metallic simple material rendering black from obj 2016-05-13 16:33:14 -07:00
Brad Hefta-Gaub
c443138dd2 Merge pull request #7869 from zzmp/fix/fbx-access 
Check vector access in fbx reader
 2016-05-13 15:29:24 -07:00
samcake
815dcfd90e Merge branch 'red' of https://github.com/samcake/hifi into color 2016-05-13 11:01:52 -07:00
samcake
f569169662 Trying to support ambient occlusion map from blender 2016-05-13 11:01:15 -07:00
Zach Pomerantz
8db1f296de Check vector access in fbx reader 2016-05-11 15:17:59 -07:00