Seth Alves
|
858d15d0ba
|
obj reader sort-of works
|
2015-03-06 13:15:53 -08:00 |
|
Clément Brisset
|
da6db93508
|
Merge pull request #4375 from ctrlaltdavid/20370
More parentheses to address Xcode compiler warnings
|
2015-03-04 10:06:54 -08:00 |
|
David Rowe
|
4c959e8d82
|
More parentheses to address Xcode compiler warnings
|
2015-03-04 09:17:19 -08:00 |
|
samcake
|
6b1f42df83
|
Merge pull request #4366 from ZappoMan/removeMetavoxels
remove metavoxels
|
2015-03-03 15:50:53 -08:00 |
|
Brad Hefta-Gaub
|
b118912708
|
Merge pull request #4361 from samcake/temp0
evolve the Transform stack away from the legacy GL to the brand new shader way
|
2015-03-03 11:43:01 -08:00 |
|
Brad Hefta-Gaub
|
29340b6586
|
Merge pull request #4369 from ctrlaltdavid/20370
CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361
|
2015-03-03 11:17:31 -08:00 |
|
Sam Gateau
|
598b791aee
|
FIxing the compilation issue for linux
|
2015-03-03 11:01:47 -08:00 |
|
ZappoMan
|
5c3c94a618
|
remove metavoxels
|
2015-03-02 17:21:43 -08:00 |
|
Sam Gateau
|
5ab3cbb7ec
|
Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated
|
2015-02-27 17:11:16 -08:00 |
|
Sam Gateau
|
ea88cbd75f
|
Merge with upstream master
|
2015-02-27 13:19:50 -08:00 |
|
Brad Hefta-Gaub
|
08dc883b0e
|
Merge pull request #4351 from huffman/update-light-properties
Update light properties (primarily for editEntities.js)
|
2015-02-27 10:54:19 -08:00 |
|
Philip Rosedale
|
35205fbbf3
|
Merge pull request #4347 from samcake/temp1
Introducing the SunSkyStage
|
2015-02-27 10:37:02 -08:00 |
|
Sam Gateau
|
c7eeebe52c
|
and fixing a bug with shadowing of lightmapped surface
|
2015-02-26 18:07:43 -08:00 |
|
Ryan Huffman
|
dc2b670fa8
|
Remove extraneous comments
|
2015-02-26 14:46:05 -08:00 |
|
Sam Gateau
|
d8ebb0c5b9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-02-26 14:19:23 -08:00 |
|
David Rowe
|
21f12c1d6c
|
Use cache ID when rendering talk bubble sphere
|
2015-02-26 13:50:43 -08:00 |
|
Ryan Huffman
|
e42b708b56
|
Update deferredLightingEffect::add*Light methods
|
2015-02-26 11:03:47 -08:00 |
|
Virendra Singh
|
b3fdb19cad
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20305
Conflicts:
BUILD.md
BUILD_WIN.md
|
2015-02-26 22:16:35 +05:30 |
|
Sam Gateau
|
65a3e3618a
|
Trying to setup correctly the projection matrix for all the different cases...
|
2015-02-23 17:06:46 -08:00 |
|
Sam Gateau
|
04a39275ef
|
Trying to setup correctly the projection matrix for all the different cases...
|
2015-02-23 16:47:43 -08:00 |
|
Sam Gateau
|
687c76a6f8
|
trying to ge the shadow to render correctly
|
2015-02-23 13:12:29 -08:00 |
|
Sam Gateau
|
ffaea07130
|
trying to ge the shadow to render correctly
|
2015-02-23 07:04:14 -08:00 |
|
Sam Gateau
|
90bff36fd3
|
trying to ge the shadow to render correctly
|
2015-02-22 18:48:48 -08:00 |
|
Stephen Birarda
|
5e264f8241
|
add GLEW as dependency external project
|
2015-02-20 13:47:38 -08:00 |
|
Sam Gateau
|
4e2d2bc188
|
Fixing the remaining issue with the avatar rendering path
|
2015-02-20 12:05:06 -08:00 |
|
Sam Gateau
|
ded78816b5
|
Fixing the remaining issue with the avatar rendering path
|
2015-02-20 11:26:08 -08:00 |
|
Sam Gateau
|
d08142d37d
|
replacing glTRansform by gpu/Transform features
|
2015-02-19 15:12:13 -08:00 |
|
Sam Gateau
|
7e04f8a491
|
Model almost working with Transform
|
2015-02-19 09:52:58 -08:00 |
|
Sam Gateau
|
6070bf8a37
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-02-18 16:02:18 -08:00 |
|
Sam Gateau
|
11060ed273
|
trying to tackle the unenderstood transform value not going through corectly?
|
2015-02-18 16:00:37 -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 |
|
Seth Alves
|
ef2d386c75
|
attempt to load Courier if the requested font-family fails to load
|
2015-02-17 15:12:24 -08:00 |
|
Seth Alves
|
9fcb7591e6
|
don't crash if font load fails
|
2015-02-17 14:52:20 -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 |
|
Sam Gateau
|
d8aa0e0138
|
replacing the glTransform pipeline for model rendering
|
2015-02-17 09:44:03 -08:00 |
|
Sam Gateau
|
23354da828
|
replacing the glTransform pipeline for model rendering
|
2015-02-16 22:08:21 -08:00 |
|
Sam Gateau
|
cc3cc4f96f
|
replacing the glTransform pipeline for model rendering
|
2015-02-16 09:31: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
|
fa6f6a6b71
|
use external project glm in render-utils
|
2015-02-13 10:34:19 -08:00 |
|
Sam Gateau
|
bc2faca9bc
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-02-13 01:33:21 -08:00 |
|
Sam Gateau
|
e2e61c64b1
|
Support include path to shaders from the hifi libraries to cmake
|
2015-02-13 01:30:04 -08:00 |
|
Andrew Meadows
|
7304585103
|
Merge pull request #4271 from huffman/fix-overlays-text-size
Fix overlays text size
|
2015-02-12 09:35:37 -08:00 |
|
Andrew Meadows
|
357dd963f3
|
Merge pull request #4273 from ZappoMan/bugfix
fix the quad color being broken after rendering text
|
2015-02-12 09:00:16 -08:00 |
|
ZappoMan
|
7a45b1bc96
|
fix the quad color being broken after rendering text
|
2015-02-11 15:50:04 -08:00 |
|
Ryan Huffman
|
341e31a074
|
Remove extraneous initialized check
|
2015-02-11 13:08:11 -08:00 |
|
Ryan Huffman
|
51ff897ee5
|
Update Font to not setup GL until first draw
|
2015-02-11 12:59:12 -08:00 |
|
Brad Hefta-Gaub
|
9a7ed8055f
|
Merge pull request #4267 from samcake/master
Fix performance bug for NetworkGeometry::isLoadedWithTextures() and glTransform removal
|
2015-02-11 09:45:29 -08:00 |
|