David Rowe
7566b7e546
Add SpeechRecognizer.h and .cpp to Windows builds
2014-10-20 13:26:51 -07:00
AndrewMeadows
2569f70ac3
Merge pull request #3623 from ey6es/master
...
For FBX files with marked "skeleton" joints, only show those marked nodes in the upload dialog. Also added some more default node names to look for on upload.
2014-10-20 09:00:06 -07:00
AndrewMeadows
2e958599aa
Merge pull request #3621 from ey6es/metavoxels
...
Sculpt brush, very rough conversion of heightfield patches to dual contour surfaces on edit.
2014-10-20 08:55:01 -07:00
AndrewMeadows
f7c4804f33
Merge pull request #3613 from ctrlaltdavid/20112
...
CR for Job #20112 - chat alerts persist
2014-10-20 08:32:32 -07:00
Andrzej Kapolka
32c5f6e40e
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-17 18:28:16 -07:00
Andrzej Kapolka
da60a17b45
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-10-17 18:27:31 -07:00
Andrzej Kapolka
e98b99fe84
Merge pull request #3622 from birarda/domain-tunnel
...
work around double login issue by generating keypair on each launch
2014-10-17 18:05:45 -07:00
Andrzej Kapolka
c979ace924
Read the unit scale factor and include it in the offset scale.
2014-10-17 17:34:27 -07:00
Stephen Birarda
5882001311
Merge pull request #3619 from ZappoMan/modelOverlayRayPick
...
ray picking support for Model and 3D volume overlays
2014-10-17 17:03:37 -07:00
Andrzej Kapolka
1940fe67a0
Add jointEyeLeft/jointEyeRight/jointNeck to list of nodes we check for on
...
upload.
2014-10-17 16:57:15 -07:00
Stephen Birarda
5ecdb58e20
generate a new keypair on every interface launch
2014-10-17 16:55:50 -07:00
Andrzej Kapolka
1b9b0f9fc9
Look for and store the "Skeleton" type flag so that we can offer only skeleton
...
joints in the dropdown.
2014-10-17 16:51:55 -07:00
ZappoMan
61b53701f3
fix some comments
2014-10-17 16:07:08 -07:00
ZappoMan
70d718178d
make all volume3DOverlays handle proper ray picking against their rotated bounding box, make model overlays property ray pick as well
2014-10-17 13:36:37 -07:00
ZappoMan
fc507850be
Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles
2014-10-16 20:36:28 -07:00
Andrzej Kapolka
1fdfb51600
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-16 18:54:03 -07:00
Brad Hefta-Gaub
a46610a7c1
Merge pull request #3609 from ZappoMan/groupMaterialsRendering
...
small optimization to model rendering
2014-10-16 16:24:28 -07:00
Andrew Meadows
c44a592032
longer lengths for experimental hair
2014-10-16 16:21:59 -07:00
ZappoMan
47f5d499f6
small optimization
2014-10-16 15:26:01 -07:00
Andrzej Kapolka
fc6f0afb93
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-16 15:03:29 -07:00
samcake
a6b9fe34b5
Merge pull request #3606 from ZappoMan/groupMaterialsRendering
...
More Model::render() improvements
2014-10-16 14:42:37 -07:00
ZappoMan
148b880bb1
handle case of meshes with multiple parts with different materials better, don't mix them in with single material meshes
2014-10-16 14:32:07 -07:00
ZappoMan
d1f263ecc5
group materials together when rendering models
2014-10-16 14:05:35 -07:00
Andrzej Kapolka
459b9aba38
Gradual progress on converting heightfield portions to dual contour data.
2014-10-16 13:05:38 -07:00
Stephen Birarda
7bbaaf6b78
cleanup some username signature debug, fix interest list pull
2014-10-16 11:54:55 -07:00
AndrewMeadows
e75d2a167a
Merge pull request #3602 from ZappoMan/frustumCullModelParts
...
More Model::render() improvements
2014-10-16 11:04:57 -07:00
Brad Hefta-Gaub
866b3d40fc
Merge pull request #3604 from AndrewMeadows/inertia
...
experimental hair tuning
2014-10-16 10:53:31 -07:00
AndrewMeadows
4fbc589606
Merge pull request #3598 from birarda/domain-tunnel
...
initial pass at using keypairs for username verification for basic domain-server ACL
2014-10-16 10:49:03 -07:00
Andrew Meadows
8b54569480
experimental hair tuning submitted by Ryan
2014-10-16 10:20:12 -07:00
ZappoMan
ffb7bcf9d3
wire up different culling options to debug menus
2014-10-16 09:32:24 -07:00
ZappoMan
d238d06df5
build a cached lookup table for the shouldRenderMesh() LOD method
2014-10-16 01:00:32 -07:00
ZappoMan
bf77adc4bc
add support for LOD occulsion for too small meshes in Model::render()
2014-10-16 00:30:24 -07:00
Brad Hefta-Gaub
8ee26923da
Merge pull request #3600 from birarda/master
...
some dead code removal
2014-10-15 20:23:59 -07:00
ZappoMan
4c7ecba579
spelling change
2014-10-15 20:23:04 -07:00
ZappoMan
921a3fb8c0
switch QList<> to QVector<> and add some guards against out of range indices
2014-10-15 20:18:04 -07:00
samcake
01b64d78e3
Merge pull request #3601 from ZappoMan/frustumCullModelParts
...
Implement "segregation" of mesh groups
2014-10-15 18:09:48 -07:00
ZappoMan
56b4d58f18
implement mesh groups and pull out shader programs in renderMeshes() to outside the loop based on group
2014-10-15 17:08:47 -07:00
Stephen Birarda
fcd73858b8
remove Faceplus as a face tracker option
2014-10-15 15:13:52 -07:00
ZappoMan
8a83511942
first cut at separating opaque from transparent meshes
2014-10-15 14:40:42 -07:00
ZappoMan
c8db8855cc
move tallyAllTimerRecords out of conditional so they don't pile up
2014-10-15 14:23:29 -07:00
AndrewMeadows
8372975bad
Merge pull request #3582 from PhilipRosedale/master
...
'Ribbons' that are driven by audio loudness and tuned/draped for mask avatars
2014-10-15 14:08:20 -07:00
ZappoMan
3a6715c0bc
improve timing stats display
2014-10-15 14:00:56 -07:00
ZappoMan
46cb780aa5
view cull mesh parts
2014-10-15 10:08:21 -07:00
ZappoMan
eab96587fe
add stats for entity rendering details
2014-10-15 09:24:58 -07:00
ZappoMan
da4c179a9f
correctly track rendered entities
2014-10-15 09:23:59 -07:00
ZappoMan
8c37181635
add menu item for enable/disable culling of model parts
2014-10-15 09:23:27 -07:00
Andrzej Kapolka
3006950b83
Comment fix.
2014-10-14 18:24:44 -07:00
Stephen Birarda
e9bcc90166
handle remaining conversions for AccountManager passing QNetworkReply
2014-10-14 16:16:54 -07:00
Stephen Birarda
c4b0dc9dcc
initial handling of username signature in domain-server
2014-10-14 16:03:35 -07:00
Andrzej Kapolka
fba383f6d3
Render voxel cursor on heightfields, too.
2014-10-14 15:21:45 -07:00
