Commit graph

17965 commits

Author SHA1 Message Date
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
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
Andrzej Kapolka
fba383f6d3 Render voxel cursor on heightfields, too. 2014-10-14 15:21:45 -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
Andrzej Kapolka
394bf2b4ee Basic sculpt tool, refactored common material bits in tools. 2014-10-14 14:37:32 -07:00
Stephen Birarda
22b599b8cc repair for persisting of Account to file after keypair generation 2014-10-14 14:21:18 -07:00
Atlante45
b227014510 Stupid mistake 2014-10-14 14:14:59 -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
Atlante45
2edc2eed6d Changed arrows style 2014-10-14 12:31:17 -07:00
Atlante45
02b4b220b9 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-14 12:16:20 -07:00
Atlante45
edea8da18f Move array rows 2014-10-14 12:13:34 -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
Stephen Birarda
e10475f2e2 Merge pull request #3594 from birarda/master
fix the security link in domain-server page
2014-10-14 11:54:20 -07:00
Stephen Birarda
7e116346cb fix the security link in domain-server page 2014-10-14 11:53:07 -07:00
Stephen Birarda
5c465198c5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-14 11:52:06 -07:00
Stephen Birarda
69402e275c use DER format for generated keys in RSAKeypairGenerator 2014-10-14 11:51:58 -07:00
Stephen Birarda
5f67194564 fix member variable order in Joystick class 2014-10-14 11:39:28 -07:00
Stephen Birarda
d0f91c5c2e remove old mechanism for octree payments 2014-10-14 11:38:50 -07:00
Stephen Birarda
912512936e add RSAKeypairGenerator to generate a 2048-bit keypair 2014-10-14 11:36:40 -07:00
David Rowe
a619d0460d Show chat alerts in icon tray only if not already seen 2014-10-14 11:08:24 -07:00