David Rowe
|
0cf3f6e953
|
Fix texture count and size getting stuck on 0
|
2016-09-13 13:03:06 +12:00 |
|
David Rowe
|
fe8b3b4d0d
|
Merge branch 'master' into 21040
|
2016-09-13 09:12:47 +12:00 |
|
David Rowe
|
68499f49ad
|
Fix count of textures
|
2016-09-10 10:15:13 +12:00 |
|
Anthony J. Thibault
|
9122a33fff
|
only raise the webEntity virtual keyboard in HMD mode
|
2016-09-02 16:53:40 -07:00 |
|
Brad Hefta-Gaub
|
8ec5798b7a
|
Merge pull request #8548 from samcake/blue
Exposing GPU & Batch running time to Engine gpu jobs
|
2016-09-02 09:31:09 -07:00 |
|
Brad Hefta-Gaub
|
e3bad8e8f4
|
Merge pull request #8556 from ZappoMan/renderStats
add support for renderInfo properties to model entities
|
2016-09-02 09:04:56 -07:00 |
|
Stephen Birarda
|
65c1edfb1c
|
add missing link from render-utils to entities
|
2016-08-31 16:57:52 -07:00 |
|
Brad Hefta-Gaub
|
e1845e2c3f
|
add support for renderInfo properties to model entities
|
2016-08-31 15:00:21 -07:00 |
|
Stephen Birarda
|
7c2fea4598
|
remove glew/oglplus requirement for android interface
|
2016-08-31 11:03:53 -07:00 |
|
samcake
|
af68a2550e
|
Remve dead code
|
2016-08-30 14:53:37 -07:00 |
|
samcake
|
faef8a9930
|
Adding the timing for GPU support with a simpelr JobConfig
|
2016-08-30 12:22:21 -07:00 |
|
Brad Hefta-Gaub
|
9801ff075a
|
Merge pull request #8433 from samcake/hdr
Fix Screen Space ambient occlusion which was broken since a while
|
2016-08-25 16:57:24 -07:00 |
|
Brad Hefta-Gaub
|
10c465f591
|
Merge pull request #8525 from hyperlogic/bug-fix/web-entity-rendering
Improved web entity rendering
|
2016-08-25 16:49:00 -07:00 |
|
samcake
|
8cc65ea965
|
Adrressing review issues
|
2016-08-25 16:31:42 -07:00 |
|
samcake
|
09a70740a8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-08-25 15:21:41 -07:00 |
|
samcake
|
9669234f9c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-08-25 12:36:01 -07:00 |
|
Anthony J. Thibault
|
e82f6a90af
|
Improved web entity rendering
* fading now works properly
* web browsers are now fully opaque.
|
2016-08-25 11:04:23 -07:00 |
|
Andrew Meadows
|
c337cc92e5
|
remove crufty comment
|
2016-08-25 08:51:53 -07:00 |
|
Andrew Meadows
|
b95cb566cd
|
fix collision mesh for non-trivial registration
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
19cd4648ad
|
scale collision render mesh correctly
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
2f16aca114
|
remove cruft and fix typo in rebase
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
68dd66daec
|
create collision render geometry only when needed
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
b0a0293e6e
|
move compoundResource out of Model class
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
fe4198530f
|
don't render raw compound collision geometry
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
329c5432ed
|
_showCollisionHull --> _showCollisionGeometry
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
481d6990a3
|
trigger collision shape render mesh creation
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
26f5d3cfaa
|
fix render geometry for collision shapes
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
6b0ae654ba
|
cleanup logic around creating RenderItems
|
2016-08-24 22:26:56 -07:00 |
|
Andrew Meadows
|
d8fa0d1dd1
|
segregateMeshGroups() --> createRenderItems()
|
2016-08-24 22:25:45 -07:00 |
|
Andrew Meadows
|
726928c14c
|
creae collision Geometry from mesh
|
2016-08-24 22:25:45 -07:00 |
|
Brad Davis
|
c5628b615c
|
Make sure we start fade in once an item becomes ready
|
2016-08-24 16:05:22 -07:00 |
|
samcake
|
4da712fbdf
|
Fixing bad include not respecting filename case (for linux)
|
2016-08-22 10:36:43 -07:00 |
|
samcake
|
44c6637160
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-08-22 10:32:06 -07:00 |
|
sam
|
1e84f9dc90
|
back to noise seeded in image space
|
2016-08-21 23:37:24 -07:00 |
|
sam
|
4097fcb0f6
|
fixing the blurring issue
|
2016-08-21 00:27:43 -07:00 |
|
Seth Alves
|
9bcda1bb45
|
merge from upstream
|
2016-08-20 15:25:04 -07:00 |
|
samcake
|
9cdd079213
|
And again
|
2016-08-19 18:22:14 -07:00 |
|
samcake
|
6a076bcee4
|
PRoviding a fix for the macOS build
|
2016-08-19 11:09:12 -07:00 |
|
samcake
|
a4945fe45c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-08-19 10:00:40 -07:00 |
|
Brad Hefta-Gaub
|
1cec7b2db0
|
Merge pull request #8429 from SamGondelman/loadingFade2
Don't do fade effect once physics kick in
|
2016-08-18 12:46:24 -07:00 |
|
samcake
|
b5296410c3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
|
2016-08-18 10:20:33 -07:00 |
|
Seth Alves
|
87dbfa7e47
|
add -Wsuggest-override to compile flags and deal with fallout
|
2016-08-18 09:51:41 -07:00 |
|
samcake
|
8d12a23efb
|
Merge pull request #8325 from jherico/deferred_batches_threaded
Threaded rendering
|
2016-08-15 09:59:44 -07:00 |
|
Brad Davis
|
fdbbd70eed
|
Merge pull request #8422 from sethalves/sidestep-linux-gcc-bug
sidestep linux gcc linker? bug
|
2016-08-13 12:08:05 -07:00 |
|
Brad Davis
|
574737fbb5
|
More GPU api fixes, protect Buffer::flush
|
2016-08-12 22:29:04 -07:00 |
|
Brad Davis
|
6d7edd38cc
|
Rename clearViewTransform
|
2016-08-12 22:28:59 -07:00 |
|
Brad Davis
|
cbe1f6dbf5
|
Allow the lighting framebuffer to use the camera correction to stabilize lights in the HMD
|
2016-08-12 22:28:32 -07:00 |
|
Brad Davis
|
894d29bb29
|
Fixing flicking in instance based objects
|
2016-08-12 22:28:24 -07:00 |
|
Brad Davis
|
adcfd55cc0
|
Batch replay reprojection
|
2016-08-12 22:28:23 -07:00 |
|
samcake
|
b90e0cfd89
|
Fixing the stereo issue
|
2016-08-12 19:18:05 -07:00 |
|