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

144 commits

Author SHA1 Message Date
Seth Alves
ab8784f1b4 add comment about character capsule being hard-coded 2015-03-09 13:51:08 -07:00
Seth Alves
0833fc588b coding standard 2015-03-09 06:56:35 -07:00
Seth Alves
3604fd639a formatting 2015-03-08 20:03:10 -07:00
Seth Alves
804d4a0963 coding standard 2015-03-07 20:31:37 -08:00
Seth Alves
05e0fe3536 object display correctly now? 2015-03-07 11:28:30 -08:00
Seth Alves
f807384dfe build a joint and caclulate extents. obj models now show up, though not correctly. 2015-03-07 07:55:04 -08:00
Seth Alves
591edc0527 _mesh instance variable doesn't appear to be in use. 2015-03-07 07:51:47 -08:00
Seth Alves
6e79fc8b68 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-06 18:46:13 -08:00
ZappoMan
ffab6ffe48 tweaks to hacks for detecting mixamo files 2015-03-06 15:11:02 -08:00
Seth Alves
858d15d0ba obj reader sort-of works 2015-03-06 13:15:53 -08:00
Stephen Birarda
44f8e599e2 test the possibility that zlib is no longer required 2015-02-19 15:29:28 -08:00
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
Stephen Birarda
c110fcbfad merge with upstream/master 2015-02-17 17:34:48 -08:00
Stephen Birarda
e99012efbb updates to build guides to remove soxr 2015-02-17 10:33:12 -08:00
Andrew Meadows
53855c89e9 Merge pull request #4289 from birarda/dependencies 
add gverb and glm as cmake external projects
 2015-02-17 10:00:29 -08:00
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -08:00
Brad Hefta-Gaub
1827d9f3cd Merge pull request #4256 from samcake/temp1 
Getting rid of glLIghts and replacing by the model::Light
 2015-02-13 10:49:53 -08:00
Stephen Birarda
26b93731f8 use glm as external project in fbx library 2015-02-13 10:28:06 -08:00
Andrew Meadows
123d73783b remove warning about unused variable 2015-02-11 08:42:36 -08:00
Andrew Meadows
e6a6946027 merge upstream/master into andrew/thermonuclear 2015-02-09 12:44:52 -08:00
Sam Gateau
ace6dc4faf Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-08 23:23:06 -08:00
Brad Hefta-Gaub
12ab841191 Merge pull request #4248 from samcake/temp0 
Remove unneeded texture memory once loaded to GPU and Lightmap control in FBX
 2015-02-06 16:52:40 -08:00
Sam Gateau
469ee29f0b Merge branch 'temp0' of https://github.com/samcake/hifi into temp1 2015-02-06 16:30:47 -08:00
Sam Gateau
d4566bb1d7 Adding support for hifi_global light intensity & COlor and use it to adjust the lighmap parameters 2015-02-06 15:51:57 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Sam Gateau
6ad484e13f Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-03 17:26:27 -08:00
Sam Gateau
5719e277dd FIx the lightmap not displaying when using the texcoord0 2015-02-03 16:10:31 -08:00
Sam Gateau
d8d0a28d0f FInd a solution for lightmap without 2nd uvset 2015-02-03 14:34:11 -08:00
Andrew Meadows
28a3c3f469 separate new shape types from legacy 2015-02-03 08:34:06 -08:00
Atlante45
d68b59d4c7 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-28 13:13:58 -08:00
Sam Gateau
dc01611f26 Initiailize the jont indices to -1 in FBXGemoetry to avoid problems until the skeleton data is actually loaded 2015-01-28 10:22:37 -08:00
Atlante45
bbf6ae7b01 Move Faceshift constants to their own file in shared 2015-01-23 12:11:08 -08:00
Brad Hefta-Gaub
b3b43b4c14 Merge pull request #4093 from samcake/temp0 
Factorize the shader code for deferred lighting
 2015-01-13 17:11:17 -08:00
Sam Gateau
e639c5a549 playing with the ambient lighting 2015-01-11 11:33:21 -08:00
chris
8bb69d0a90 Update std::string instances to QString 2015-01-09 16:22:52 -08:00
ZappoMan
27d8ccb51e more voxelEctomy 2014-12-30 19:58:04 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
Sam Gateau
4c670ac17a merging with upstream master and origin temp0 2014-12-22 10:38:11 -08:00
Sam Gateau
967c6dbc4b Add the Model library 2014-12-19 16:19:06 -08:00
Stephen Birarda
114e3bb2ff rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
Stephen Birarda
b326ab9839 remove quotes from library links for debug/optimized 2014-12-18 09:38:48 -08:00
Stephen Birarda
d38c78f2c3 remove bubbling of linked libraries, cmake does it 2014-12-18 09:34:04 -08:00
Andrzej Kapolka
d402f767c1 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-10 15:23:27 -08:00
Andrzej Kapolka
c57fd15bc9 Rather than loading the entire FBX file into a byte array, read it straight 
from the QNetworkReply.
 2014-12-10 15:22:48 -08:00
Sam Gateau
8617c319d4 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-09 17:30:26 -08:00
ZappoMan
a6b86da47a basics of triangle picking working for models 2014-12-05 11:31:27 -08:00
Sam Gateau
5bca90163f Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-05 10:12:21 -08:00
Sam Gateau
563cd6f7e3 watch your language... 2014-12-05 10:10:21 -08:00
Philip Rosedale
0ad361fd60 Merge pull request #3902 from samcake/tot 
Adding detection of a "hifi" global light in a FBX file used to pass information
 2014-12-05 10:07:52 -08:00
Andrzej Kapolka
466d99bcbb Removed unused members. 2014-12-04 17:12:06 -08:00