Atlante45
|
5166d833a7
|
Make array size a constexpr
|
2015-06-18 15:23:53 +02:00 |
|
Atlante45
|
30fbd37645
|
Transmit normal to text rendering shader
|
2015-06-18 15:23:52 +02:00 |
|
Atlante45
|
8a3a7e5b7f
|
Reorder triangle strip
|
2015-06-18 15:23:50 +02:00 |
|
Atlante45
|
70a020c7e3
|
BevelRect use triangle strips
|
2015-06-18 15:23:49 +02:00 |
|
Atlante45
|
d7b9a1b032
|
Cleanup TextRenderer3D methods args
|
2015-06-18 15:23:49 +02:00 |
|
Atlante45
|
ca98b378df
|
Adjust sdf frag shader alpha correctly
|
2015-06-18 15:22:49 +02:00 |
|
Atlante45
|
bdaf8a8a32
|
Fix bevel quads
|
2015-06-18 15:22:48 +02:00 |
|
ZappoMan
|
58ee5217e3
|
fix some warnings
|
2015-06-17 14:08:02 -07:00 |
|
ZappoMan
|
e9bf553254
|
CR feedback
|
2015-06-17 09:59:38 -07:00 |
|
ZappoMan
|
af5a910f58
|
Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix
|
2015-06-17 09:36:16 -07:00 |
|
ZappoMan
|
8162c37013
|
cleanup
|
2015-06-17 09:33:15 -07:00 |
|
ZappoMan
|
0e18c75b0b
|
cleanup
|
2015-06-17 09:23:12 -07:00 |
|
ZappoMan
|
ea98581d22
|
reorganize files to cleanup headers
|
2015-06-17 09:18:00 -07:00 |
|
Sam Gateau
|
3176c8e93c
|
polish before PR
|
2015-06-17 17:09:33 +02:00 |
|
samcake
|
febc3333cd
|
Solving the rendering of textured overlay3d
|
2015-06-17 16:50:35 +02:00 |
|
samcake
|
d703748ec3
|
trying to solve the rendering of overlay3d
|
2015-06-17 16:44:02 +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 |
|
ZappoMan
|
6f0ae96f56
|
fix warning
|
2015-06-16 16:01:01 -07:00 |
|
ZappoMan
|
5abd608ccc
|
fix typo
|
2015-06-16 15:55:37 -07:00 |
|
ZappoMan
|
1beb95cfe7
|
fix FPS while still maintaining ray picking
|
2015-06-16 15:38:16 -07:00 |
|
ZappoMan
|
1c3b484466
|
fix detailed ray picking against models
|
2015-06-15 12:48:51 -07:00 |
|
Philip Rosedale
|
c834937472
|
Merge pull request #5122 from huffman/fix-rear-view-mirror
Fix rear view mirror
|
2015-06-12 15:49:38 -07:00 |
|
Philip Rosedale
|
b628df45bc
|
Merge pull request #5121 from ZappoMan/attemptRevertOverlaysBork2
REVERT recent changes to overlays that seem to be breaking stuff
|
2015-06-12 13:50:53 -07:00 |
|
Ryan Huffman
|
81d003bdb8
|
Add post-scale to view matrix when in mirror mode
|
2015-06-12 13:05:10 -07:00 |
|
Ryan Huffman
|
66a65e3675
|
Update model to select clockwise backface culling program when in mirror mode
|
2015-06-12 13:04:02 -07:00 |
|
Ryan Huffman
|
ad77374732
|
Fix setting of _renderMode
|
2015-06-12 13:03:33 -07:00 |
|
ZappoMan
|
0cdc2b53fe
|
Revert "Merge pull request #5106 from jherico/render_cursor"
This reverts commit 4d18bd7cec , reversing
changes made to 24fda9a733 .
|
2015-06-12 12:57:24 -07:00 |
|
ZappoMan
|
becd9646f2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cullingBugs
|
2015-06-12 11:43:08 -07:00 |
|
ZappoMan
|
7d7db65fd1
|
fix avatar mesh boxes not staying in sync with avatar position
|
2015-06-12 11:42:38 -07:00 |
|
Brad Hefta-Gaub
|
a5b28660ad
|
Merge pull request #5113 from Atlante45/debug
Fix text entities wrapping
|
2015-06-12 11:23:31 -07:00 |
|
Atlante45
|
30ae78e3b6
|
Rename getRowHeight
|
2015-06-12 19:50:32 +02:00 |
|
Atlante45
|
26dd067982
|
Advance with _leading on y
|
2015-06-12 19:44:40 +02:00 |
|
Atlante45
|
f3d3bd7bec
|
Remove _rowHeight
|
2015-06-12 19:44:15 +02:00 |
|
Clément Brisset
|
e4511e37f5
|
Merge pull request #5111 from ZappoMan/cullingBugs
hack to fix culling bugs for some subMesh parts in the windmill scene
|
2015-06-12 18:53:46 +02:00 |
|
ZappoMan
|
c17ae593f0
|
CR feedback
|
2015-06-12 09:04:16 -07:00 |
|
Atlante45
|
565bf8bcb2
|
Fix text entities wrapping
|
2015-06-12 15:41:37 +02:00 |
|
ZappoMan
|
2fc0233096
|
hack to fix culling bugs for some subMesh parts in the windmill scene
|
2015-06-11 20:50:31 -07:00 |
|
ZappoMan
|
feb3f68a00
|
hack to fix culling bugs for some subMesh parts in the windmill scene
|
2015-06-11 20:49:19 -07:00 |
|
Brad Davis
|
b7cd1ea72a
|
Merge remote-tracking branch 'upstream/master' into render_cursor
|
2015-06-11 15:04:56 -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 |
|
Brad Davis
|
fa27550df4
|
Merge remote-tracking branch 'upstream/master' into render_cursor
|
2015-06-11 02:21:02 -07:00 |
|
ZappoMan
|
e06422825a
|
mostly getting attachments working again
|
2015-06-10 15:46:54 -07:00 |
|
Sam Gateau
|
1f62fb4b6f
|
Adding standard vertex and pixel shaders for drawing texture in applicationOverlay
|
2015-06-10 15:24:29 -07:00 |
|
ZappoMan
|
aa05d9f67c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments
|
2015-06-10 08:53:33 -07:00 |
|
Brad Davis
|
94c414e4e8
|
Add unit quad, commonly used in compositing the overlays
|
2015-06-10 08:12:58 -07:00 |
|
Sam Gateau
|
dd84bf010b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
|
2015-06-10 00:32:22 -07:00 |
|
Sam Gateau
|
470e24820d
|
Back to clean state, just added the Material Key
|
2015-06-10 00:31:36 -07:00 |
|
ZappoMan
|
2c6ebcb06a
|
remove a bunch of cruft from Model
|
2015-06-09 12:57:14 -07:00 |
|
ZappoMan
|
ba0cecb356
|
remove attachments from Model - only supported at avatar layer
|
2015-06-09 12:32:37 -07:00 |
|
Sam Gateau
|
7de4c2eff7
|
first take on the materialKey
|
2015-06-09 12:17:10 -07:00 |
|