Ryan Huffman
|
35f9d49c06
|
Fix DrawOverlay3D::getOpaquePipeline invalid signature
|
2015-06-19 10:47:25 -07:00 |
|
Ryan Huffman
|
665baff665
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate
Conflicts:
interface/src/ui/overlays/Circle3DOverlay.cpp
libraries/render-utils/src/RenderDeferredTask.cpp
libraries/render-utils/src/RenderDeferredTask.h
|
2015-06-19 10:07:57 -07:00 |
|
Ryan Huffman
|
690e2e38f2
|
Move circle3d and text overlays to batches
|
2015-06-19 09:45:13 -07:00 |
|
Sam Gateau
|
5a2d2485c0
|
Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque
|
2015-06-19 16:30:48 +02:00 |
|
Sam Gateau
|
31633eca10
|
IMproving the probe system and cleaning the engine script
|
2015-06-19 10:41:40 +02:00 |
|
Sam Gateau
|
fb42613344
|
Fixing transparency that i just broke
|
2015-06-18 20:25:51 +02:00 |
|
samcake
|
89fe1c47be
|
preping for debug the jobs
|
2015-06-18 13:02:06 +02:00 |
|
Sam Gateau
|
5c547037f2
|
Migrating the overaly 3d rendering in their own job and their own shader
|
2015-06-17 15:54:20 +02:00 |
|
Sam Gateau
|
d1ac3148f0
|
migrating the transparent pipeline
|
2015-06-16 17:33:53 +02:00 |
|
Sam Gateau
|
9be87758fd
|
Improving the design of the Jobs and varying
|
2015-06-16 15:00:47 +02:00 |
|
Ryan Huffman
|
81d003bdb8
|
Add post-scale to view matrix when in mirror mode
|
2015-06-12 13:05:10 -07:00 |
|
Ryan Huffman
|
ad77374732
|
Fix setting of _renderMode
|
2015-06-12 13:03:33 -07:00 |
|
Sam Gateau
|
7685fe2229
|
Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool
|
2015-06-11 06:40:21 -07:00 |
|
Sam Gateau
|
470e24820d
|
Back to clean state, just added the Material Key
|
2015-06-10 00:31:36 -07:00 |
|
Sam Gateau
|
7de4c2eff7
|
first take on the materialKey
|
2015-06-09 12:17:10 -07:00 |
|
samcake
|
d9b7a42f60
|
FIxing merge
|
2015-06-08 19:06:04 +02:00 |
|
samcake
|
5e351c0328
|
FIxing the transparent rendering on Mac
|
2015-06-08 18:36:12 +02:00 |
|
Sam Gateau
|
3196c5ca77
|
better highlights blending
|
2015-06-08 05:41:36 -07:00 |
|
Sam Gateau
|
de61f4ea0b
|
Gettting th ehighlight on transparent to work
|
2015-06-08 02:52:13 -07:00 |
|
Sam Gateau
|
8d3a3221b0
|
shuffling the rendering steps to get to render transparent and light it correctly
|
2015-06-06 09:50:56 -07:00 |
|
Sam Gateau
|
eea7ddf491
|
Trying to get Ubuntu to build
|
2015-06-02 19:27:32 -07:00 |
|
Sam Gateau
|
903837ab4f
|
exposing some controls on the engine to js for debugging
|
2015-06-02 15:57:37 -07:00 |
|
Sam Gateau
|
bd7c22e715
|
Trying to transfer the rnedering from displaySide to RenderDeferredTask
|
2015-06-01 17:31:00 -07:00 |
|
Sam Gateau
|
c8e30ef39e
|
On to a full rendered pipeline
|
2015-06-01 12:35:54 -07:00 |
|
Sam Gateau
|
f04f3bda72
|
Introducing the RenderDeferredTask class which moves the current rendering pipeline into the render::ENgine scheme
|
2015-05-29 15:44:14 -07:00 |
|