Commit graph

17808 commits

Author SHA1 Message Date
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
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
Brad Hefta-Gaub
8ee26923da Merge pull request #3600 from birarda/master
some dead code removal
2014-10-15 20:23:59 -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
ZappoMan
952a604d77 added some more rendering stats 2014-10-15 16:49:09 -07:00
Stephen Birarda
fcd73858b8 remove Faceplus as a face tracker option 2014-10-15 15:13:52 -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
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
Stephen Birarda
50f27d3e16 handle verification of username signature during connection 2014-10-14 18:02:22 -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
Stephen Birarda
e9bcc90166 handle remaining conversions for AccountManager passing QNetworkReply 2014-10-14 16:16:54 -07:00
Stephen Birarda
46fb7fb4a9 return QNetworkReply for AccountManager callbacks 2014-10-14 16:12:04 -07:00
Stephen Birarda
c4b0dc9dcc initial handling of username signature in domain-server 2014-10-14 16:03:35 -07:00
Stephen Birarda
970f2c7fad have DSAI generate a username signature upon request, when it has private key 2014-10-14 15:15:16 -07:00
Stephen Birarda
22b599b8cc repair for persisting of Account to file after keypair generation 2014-10-14 14:21:18 -07:00
Stephen Birarda
bac6961235 fix node auth url to be HTTPS 2014-10-14 14:01:41 -07:00
Stephen Birarda
f8c89d0790 upload the generated public key to data-web, add getter for private key 2014-10-14 13:51:41 -07:00
Ryan Huffman
a05e2ea168 Add entityCameraTools.js 2014-10-14 13:15:28 -07:00
Ryan Huffman
c332d94ae3 Add handle size based on distance in edit tools 2014-10-14 13:04:15 -07:00
Stephen Birarda
7ce806b746 fire off generation of key-pair in conjunction with login, store private key 2014-10-14 12:12:32 -07:00
Andrzej Kapolka
ff368f9848 Merge pull request #3592 from samcake/temp0
Rendering resolution can be different than the native window resolution
2014-10-14 11:56:50 -07:00