Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 18:33:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
52788 commits 76 branches 59 tags 1.2 GiB
Commit graph

442 commits

Author SHA1 Message Date
Brad Davis
85c80f3be8 Merge remote-tracking branch 'upstream/master' into smarter_textures 
Conflicts:
	libraries/gpu/src/gpu/Texture.cpp
 2017-03-22 14:25:23 -07:00
Chris Collins
05c40d2930 Merge pull request #9933 from mittens/hotfix/obj-texture-fix 
Fixed the texture assignment for the OBJ loader
 2017-03-22 13:19:01 -07:00
Brad Davis
a3828ce45c Fixing comment 2017-03-21 13:42:24 -07:00
Atlante45
73dd2abdaf Delete old sitting points code 2017-03-20 17:29:44 -07:00
Brad Davis
e482eac437 Merge remote-tracking branch 'upstream/master' into smarter_textures 2017-03-20 16:22:13 -07:00
Seth Alves
b945d9c4cb fix a bug that caused obj models with no material to randomly use the materials of other things in the view 2017-03-18 14:34:19 -07:00
trent
f1e81c34a3 Fixed the texture assignment for the OBJ loader (it wasn't doing anything with the spceular texture) 2017-03-17 14:34:17 -04:00
Brad Davis
813e3a1bca Fix issue with scaling prior to KTX serialization 2017-03-17 08:05:52 -07:00
Seth Alves
0e8d62c11e delete dead code 2017-03-16 15:24:39 -07:00
Seth Alves
7afe091c52 quiet warnings 2017-03-14 19:47:30 -07:00
Seth Alves
0785172398 quiet warnings 2017-03-14 19:01:13 -07:00
Seth Alves
08ad56d254 quiet warnings 2017-03-14 18:05:53 -07:00
Seth Alves
40b87171a9 quiet warnings 2017-03-14 17:49:39 -07:00
Seth Alves
5b28f3a3c4 cleanups 2017-03-14 10:08:34 -07:00
Seth Alves
4a1be69be4 writeOBJToString 2017-03-14 07:11:38 -07:00
Seth Alves
e8a9ff867d merge from upstream 2017-03-13 17:57:01 -07:00
ZappoMan
32add6635d checkpoint on reducing raypicking recalcs 2017-03-04 23:33:17 -08:00
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
Seth Alves
91e542a7a7 ModelScriptingInterface::meshToOBJ takes a list of MeshProxys instead of just one 2017-01-31 21:26:49 -08:00
Seth Alves
bb3155ee61 obj file is now produced in /tmp 2017-01-31 14:29:42 -08:00
Seth Alves
541692c5ca start on scripting interface to allow saving polyvox meshes to obj files 2017-01-28 15:38:18 -08:00
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -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