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

308 commits

Author SHA1 Message Date
Seth Alves
3db148f3dc fix obj model meshes 2015-10-08 11:13:52 -07:00
samcake
dd2aa36a11 FIx the shiny objects by actually using the specular map as it should be... 2015-10-06 23:10:03 -07:00
samcake
1788b7b019 Fix the bug created by the previous fix 2015-10-06 10:53:38 -07:00
samcake
429d82e650 Fixing review comments 2015-10-06 09:54:37 -07:00
samcake
1799322c67 Fix typos introduce in previous commit about the Quad to triangle indexing and remove dead code in model.cpp 2015-10-04 18:46:35 -07:00
samcake
55f5ab3732 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-04 18:31:56 -07:00
samcake
48416262a1 Migrated the FBXReader mesh code to use excusively the Model::mesh and use them directly for rendering in the ModelPartPayload, fixed a bug in the indexBUffer offset value used in drawIndexed and drawIndexedInstanced 2015-10-04 18:31:19 -07:00
samcake
edaa8f998a Migrating to the new mesh for rendering and having problems with multi part mesh 2015-10-02 18:12:16 -07:00
samcake
edb485cb0f working on getting the Model payload to use model::Mesh 2015-10-02 12:24:41 -07:00
Anthony J. Thibault
fc7b6dee84 Merge branch 'master' into transmit-joint-translation 2015-10-02 11:40:33 -07:00
samcake
b8ea83099a Debuggging 2015-10-01 21:13:22 -07:00
samcake
4478ca79ca Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-01 19:55:14 -07:00
Seth Alves
44e4f4dc63 merge from upstraem 2015-10-01 14:55:56 -07:00
Anthony J. Thibault
8bfd38ce7c FBXReader: When the animation has no animation curve use the joint's default position. 2015-10-01 14:15:02 -07:00
Seth Alves
d0a1e206ca Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation 2015-09-29 13:55:13 -07:00
samcake
840f92bd06 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-09-29 10:54:09 -07:00
samcake
a9f6c93a2c merging 2015-09-29 10:53:56 -07:00
samcake
103e1c76b3 Member initialization respecting the standard 2015-09-29 09:26:29 -07:00
samcake
1e9c19d535 Clean the Material FBX code and how we use the factor components for diffuse and specular 2015-09-28 17:46:48 -07:00
samcake
2a487a79a3 Getting something done today 2015-09-28 17:24:31 -07:00
Seth Alves
a8b135b5ca fix material colors for OBJ models 2015-09-28 17:02:00 -07:00
Seth Alves
8f02ffb76a git rid of if branch with same code in either branch 2015-09-28 15:32:53 -07:00
samcake
95ea874d43 Minor fixes to the way the specular color is interpreted 2015-09-28 12:43:15 -07:00
Seth Alves
50dd8eba45 Relay joint translations across network. Apply animation's root-joint translation to avatar. 2015-09-26 11:40:39 -07:00
Seth Alves
27688fa55b get obj models to be visible again. textures don't work 2015-09-23 14:46:57 -07:00
samcake
d7d332acd4 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 
t :wq
 2015-09-23 09:51:31 -07:00
samcake
518f5fe17c Starting to clean the mesh part of the RenderItem.... 2015-09-22 18:21:36 -07:00
Brad Hefta-Gaub
e99ad75a28 more warnings fixes 2015-09-22 18:01:39 -07:00
Brad Hefta-Gaub
7536fed09a more warning fixes 2015-09-22 17:22:09 -07:00
samcake
4513b64b00 fixing review comments 2015-09-21 22:42:24 -07:00
samcake
910038cf82 Merging 2015-09-21 17:47:23 -07:00
Brad Hefta-Gaub
ea141aae92 Merge pull request #5865 from jherico/bart 
Instancing work, second pass
 2015-09-21 16:51:08 -07:00
samcake
dfe17e5708 Fix issues from review 2015-09-21 16:12:17 -07:00
Bradley Austin Davis
e024d23366 Instancing work, second pass 2015-09-21 13:27:02 -07:00
Brad Hefta-Gaub
dc9c774eb5 merge model part quads and triangles together to reduce the number of draw calls 2015-09-21 13:09:43 -07:00
samcake
6a714f405c Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map 2015-09-21 00:53:48 -07:00
samcake
a41c20a1b7 Fixing buggy hash map look up and cleaning of name 2015-09-20 14:17:55 -07:00
Sam Gateau
3f2609e52a merging 2015-09-14 09:59:04 -07:00
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -07:00
Sam Gateau
c37cdce750 Merging back with master 2015-09-10 17:53:50 -07:00
Howard Stearns
74c92af8e0 Merge pull request #5741 from AndrewMeadows/brokenCapsules 
fix for bad bounding capsules for avatars
 2015-09-09 09:33:57 -07:00
Andrew Meadows
281e4f21fc fix avatar bounding capsule calculations 2015-09-08 15:03:12 -07:00
Stephen Birarda
b8bf9a1104 fix OBJReader loading with URL 2015-09-08 14:51:51 -07:00
Anthony J. Thibault
5882ec02d0 Merge branch 'master' into ajt/new-anim-system 2015-09-04 11:05:29 -07:00
Andrew Meadows
16dfc39f5f fix collision shape of avatars 2015-09-03 18:22:35 -07:00
Anthony J. Thibault
de31b92fd5 Merge branch 'master' into ajt/new-anim-system 2015-09-02 17:53:56 -07:00
Anthony J. Thibault
99586f259c Renamed bindTransformIsValid to bindTransformFoundInCluster 2015-09-02 13:44:34 -07:00
Andrew Meadows
4a7a384c65 avoid bad joints when computing bounding capsule 2015-09-01 14:12:14 -07:00
Sam Gateau
4e944645fe more cleaning for showing a cleaner pr 2015-08-28 16:58:36 -07:00
Sam Gateau
b845fcaff9 Cleanup 2015-08-28 16:38:07 -07:00