Commit graph

17940 commits

Author SHA1 Message Date
ZappoMan
ffb7bcf9d3 wire up different culling options to debug menus 2014-10-16 09:32:24 -07:00
Brad Hefta-Gaub
ec647ca488 Merge pull request #3603 from huffman/entity-tools
Camera easing for entity edit tools
2014-10-16 09:23:15 -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
Atlante45
0ae4392d0a missing 's' 2014-10-15 17:11:24 -07:00
Atlante45
3f67f6fae7 hide panels if only advanced settings 2014-10-15 17:09:10 -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
Atlante45
ad48009ecd Switch buffers back to advanced 2014-10-15 17:08:45 -07:00
ZappoMan
952a604d77 added some more rendering stats 2014-10-15 16:49:09 -07:00
Atlante45
0cf4483c5a factor text-align and font-size 2014-10-15 15:52:59 -07:00
Atlante45
0688379b74 changed buttons class names 2014-10-15 15:15:19 -07:00
Stephen Birarda
fcd73858b8 remove Faceplus as a face tracker option 2014-10-15 15:13:52 -07:00
Andrzej Kapolka
2a08755123 Clear terrain under dual contour surface edit. 2014-10-15 15:06:43 -07:00
Stephen Birarda
a2b3ba2551 remove the Doxyfile, not used for documentation 2014-10-15 14:57:54 -07:00
Stephen Birarda
449ce065d7 remove hifi.podspec, currently unused 2014-10-15 14:56:44 -07:00
Stephen Birarda
72f0bc61a2 remove some extra spaces 2014-10-15 14:54:28 -07:00
ZappoMan
8a83511942 first cut at separating opaque from transparent meshes 2014-10-15 14:40:42 -07:00
Stephen Birarda
56ad97db17 remove mmintrin include that isn't needed anymore 2014-10-15 14:26:03 -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
Stephen Birarda
cbbf11e28f add missing indentation for OpenSSL warnings 2014-10-15 13:31:44 -07:00
samcake
3d13792a9d Merge pull request #3599 from ZappoMan/frustumCullModelParts
Frustum cull model parts
2014-10-15 11:56:00 -07:00
Stephen Birarda
e4b19545b0 generate a new keypair if one isn't found in settings 2014-10-15 10:36:21 -07:00
Stephen Birarda
9a3ba972e1 preload the public keys for allowed users to allow immediate connection 2014-10-15 10:21:11 -07:00
ZappoMan
46cb780aa5 view cull mesh parts 2014-10-15 10:08:21 -07:00
Stephen Birarda
1613b16a93 remove another extra space 2014-10-15 09:51:52 -07:00
Stephen Birarda
3800389eb4 fix a bad equality check on QJsonObject 2014-10-15 09:51:40 -07:00
Stephen Birarda
05728681a5 add a check to warn if OpenSSL is OS X system version 2014-10-15 09:49:03 -07:00
Ryan Huffman
643f28eb3f Add rotation and upDown handle resizing to entity edit tools 2014-10-15 09:29:30 -07:00
Ryan Huffman
17209ae0d1 Add easing to edit camera 2014-10-15 09:28:42 -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
ZappoMan
770bc919bb added some rendering stats to OctreeRenderer 2014-10-15 09:22:31 -07:00
Stephen Birarda
4d8e44afd1 remove an extra space 2014-10-15 09:19:02 -07:00
AndrewMeadows
42734fef22 Merge pull request #3597 from ZappoMan/fixcrash
fix possible buffer overrun asserts
2014-10-15 08:55:49 -07:00
Andrzej Kapolka
3006950b83 Comment fix. 2014-10-14 18:24:44 -07:00
Stephen Birarda
50f27d3e16 handle verification of username signature during connection 2014-10-14 18:02:22 -07:00
Atlante45
5ab46bdd11 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-14 17:30:17 -07:00
ZappoMan
64fecba011 removed some unneeded scaling to AABox and AACube debug 2014-10-14 17:17:30 -07:00
ZappoMan
e235af1331 add debeg streaming to Extents 2014-10-14 17:16:49 -07:00
ZappoMan
f04c2b6e6f fix possible buffer overrun asserts 2014-10-14 17:14:12 -07:00
Stephen Birarda
e3ba8cddbb store returned public keys in domain-server 2014-10-14 16:35:07 -07:00
Brad Hefta-Gaub
102d02d396 Merge pull request #3596 from huffman/entity-tools
Camera functionality for entity edit tools
2014-10-14 16:28:17 -07:00
Stephen Birarda
13f43dfc70 fix for remaining AccountManager converted callbacks 2014-10-14 16:20:17 -07:00