Ryan Huffman
|
1371f775ee
|
Add mutex lock around access to Model::_calculatedMeshPartOffset
|
2015-06-19 16:51:13 -07:00 |
|
Ryan Huffman
|
a7f291154b
|
Add lock around recalculateMeshPartOffsets call
|
2015-06-19 16:28:58 -07:00 |
|
Ryan Huffman
|
1734d5e584
|
Fix recalculateMeshBoxes being called outside of mutex
|
2015-06-19 15:05:55 -07:00 |
|
samcake
|
cc65ad3ffb
|
IMproving the JOb interface
|
2015-06-17 15:52:11 +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 |
|
Sam Gateau
|
d1ac3148f0
|
migrating the transparent pipeline
|
2015-06-16 17:33:53 +02: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 |
|
Ryan Huffman
|
66a65e3675
|
Update model to select clockwise backface culling program when in mirror mode
|
2015-06-12 13:04:02 -07:00 |
|
ZappoMan
|
7d7db65fd1
|
fix avatar mesh boxes not staying in sync with avatar position
|
2015-06-12 11:42:38 -07:00 |
|
ZappoMan
|
c17ae593f0
|
CR feedback
|
2015-06-12 09:04:16 -07: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 |
|
ZappoMan
|
e06422825a
|
mostly getting attachments working again
|
2015-06-10 15:46:54 -07:00 |
|
ZappoMan
|
aa05d9f67c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments
|
2015-06-10 08:53:33 -07:00 |
|
Sam Gateau
|
dd84bf010b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
|
2015-06-10 00:32:22 -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 |
|
Brad Hefta-Gaub
|
759a4a323b
|
Merge pull request #5087 from Atlante45/debug
Reduce debug on domain connection
|
2015-06-09 07:54:21 -07:00 |
|
Atlante45
|
90c9a82aeb
|
Remove unnecesary debug
|
2015-06-09 15:27:08 +02:00 |
|
Seth Alves
|
fb7a0e7219
|
back out previous change, fix error where translucent is used instead of translucentMesh
|
2015-06-08 22:41:59 -07:00 |
|
Seth Alves
|
983ae5b2f0
|
quiet compiler, fix some whitespace
|
2015-06-08 21:19:37 -07:00 |
|
samcake
|
5e351c0328
|
FIxing the transparent rendering on Mac
|
2015-06-08 18:36:12 +02:00 |
|
Sam Gateau
|
054809d570
|
clean code for PR
|
2015-06-08 05:51:23 -07: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 |
|
Ryan Huffman
|
b22ed34825
|
Merge pull request #5051 from ZappoMan/team-teaching-optimize-offset
TEAM TEACHING - improvements to avatar part clipping
|
2015-06-05 09:26:45 -07:00 |
|
ZappoMan
|
d60810e221
|
CR feedback
|
2015-06-05 09:10:38 -07:00 |
|
Clément Brisset
|
5f16b8752b
|
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
Conflicts:
libraries/entities-renderer/src/RenderableEntityItem.cpp
libraries/render-utils/src/Model.cpp
|
2015-06-05 13:28:42 +01:00 |
|
Sam Gateau
|
aa5e6fa1b0
|
merging
|
2015-06-05 00:41:29 -07:00 |
|
Sam Gateau
|
3a93409080
|
Merging the day after the flight back to france, getting all the fixes
|
2015-06-04 23:02:05 -07:00 |
|
ZappoMan
|
5146e51d9f
|
improvements to avatar part clipping
|
2015-06-04 16:44:46 -07:00 |
|
Ryan Huffman
|
cafc5b7a7c
|
Merge pull request #5049 from ZappoMan/team-teaching-optimize-offset
TEAM TEACHING - avatar changing model URLs
|
2015-06-04 14:29:44 -07:00 |
|
Brad Hefta-Gaub
|
5e6771d91a
|
Merge pull request #5048 from huffman/entity-visible
Team Teaching - Update entity payload items to not render when entity.visible == false
|
2015-06-04 14:12:49 -07:00 |
|
ZappoMan
|
56ac987c9b
|
handle url reloading at the model level, this addresses avatars changing their models
|
2015-06-04 13:40:43 -07:00 |
|
Ryan Huffman
|
a62b55fcb2
|
Update entity payload items to correctly hide when not visible
|
2015-06-04 13:25:40 -07:00 |
|
ZappoMan
|
3593afea3b
|
optimize part offset calculation
|
2015-06-04 11:37:02 -07:00 |
|
Atlante45
|
94ba84a84c
|
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
|
2015-06-04 18:48:15 +02:00 |
|
Atlante45
|
93b44e6846
|
Collect stats on translucent/opaque mesh parts
|
2015-06-04 18:46:47 +02:00 |
|
Brad Hefta-Gaub
|
50f44c801a
|
Merge pull request #5045 from Atlante45/fix_world_box
Team Teaching - Temporary fix for models index offset
|
2015-06-04 09:16:31 -07:00 |
|
Atlante45
|
8e21d9c14b
|
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
|
2015-06-04 18:11:17 +02:00 |
|
Atlante45
|
31d257db09
|
Temporary fix for models index offset
|
2015-06-04 17:58:44 +02:00 |
|
ZappoMan
|
c4756f4816
|
remove dead code
|
2015-06-04 08:49:26 -07:00 |
|
Atlante45
|
a4340b17e9
|
Remove deprecated render stats
|
2015-06-04 14:47:04 +02:00 |
|
Sam Gateau
|
fabe8f1a7a
|
Fixing the skinned mesh rendering issue
|
2015-06-03 23:18:24 -07:00 |
|
Sam Gateau
|
dfa8cb5c80
|
Fixing the skinned mesh rendering issue
|
2015-06-03 23:11:14 -07:00 |
|