Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 11:33:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
17848 commits 25 branches 0 tags 1.1 GiB
Commit graph

5574 commits

Author SHA1 Message Date
Atlante45
5d146a00e7 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 
Conflicts:
	interface/CMakeLists.txt
 2014-10-16 15:21:34 -07:00
Stephen Birarda
5759b5b787 Merge pull request #3608 from birarda/master 
use OPENSSL_free to free DER public and private key buffers
 2014-10-16 15:15:12 -07:00
Stephen Birarda
1fb2dd4460 use OPENSSL_free to free DER private and public key buffers 2014-10-16 15:13:45 -07:00
Leonardo Murillo
10674ebec4 Merge pull request #3607 from birarda/master 
fix for key deletes in generateRSAKeyPair
 2014-10-16 15:53:38 -06:00
Stephen Birarda
f9e9a743fb fix error handled instances of key deletes 2014-10-16 14:49:12 -07:00
Stephen Birarda
f00a4aead6 fix for key deletes in generateRSAKeyPair 2014-10-16 14:44:17 -07:00
samcake
a6b9fe34b5 Merge pull request #3606 from ZappoMan/groupMaterialsRendering 
More Model::render() improvements
 2014-10-16 14:42:37 -07:00
ZappoMan
d1f263ecc5 group materials together when rendering models 2014-10-16 14:05:35 -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
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
ZappoMan
bf77adc4bc add support for LOD occulsion for too small meshes in Model::render() 2014-10-16 00:30:24 -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
952a604d77 added some more rendering stats 2014-10-15 16:49:09 -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
05728681a5 add a check to warn if OpenSSL is OS X system version 2014-10-15 09:49:03 -07:00
ZappoMan
770bc919bb added some rendering stats to OctreeRenderer 2014-10-15 09:22:31 -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
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
Atlante45
f09dc1aeac remove deprecated _engine member from ScriptEngine 2014-10-14 15:17:31 -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
Atlante45
4a3f72ab0b Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-14 15:13:50 -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
Stephen Birarda
7ce806b746 fire off generation of key-pair in conjunction with login, store private key 2014-10-14 12:12:32 -07:00
Stephen Birarda
69402e275c use DER format for generated keys in RSAKeypairGenerator 2014-10-14 11:51:58 -07:00
Stephen Birarda
912512936e add RSAKeypairGenerator to generate a 2048-bit keypair 2014-10-14 11:36:40 -07:00
Stephen Birarda
14d4dd1f4b add a private key string to DataServerAccountInfo 2014-10-14 10:43:13 -07:00
Stephen Birarda
cca8b68d2e update location and profile paths for new format 2014-10-14 10:40:58 -07:00
AndrewMeadows
240280b9ac Merge pull request #3591 from ey6es/metavoxels 
Basic metavoxel scripting commands.
 2014-10-14 09:47:24 -07:00
AndrewMeadows
3483497fab Merge pull request #3575 from Atlante45/attenuation_zones 
Audio zones and attenuation coefficients
 2014-10-14 09:39:06 -07:00
Stephen Birarda
20f97792bf Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-14 09:26:11 -07:00
NextPrior
a0a5530641 Initial reverb implementation 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Audio.cpp
	interface/src/Audio.h
	libraries/script-engine/src/ScriptEngine.cpp
 2014-10-13 18:13:51 -07:00
Andrzej Kapolka
fcbdf04c19 Apply alpha restrictions when we apply the edit. 2014-10-13 16:01:38 -07:00
Andrzej Kapolka
60576bdcbd Basic metavoxel scripting bits. 2014-10-13 15:05:16 -07:00
AndrewMeadows
d90d30ad9f Merge pull request #3585 from ZappoMan/editToolsImprovements 
various edit tool fixes
 2014-10-13 10:12:47 -07:00
Andrzej Kapolka
1d4d36444f Bumped the metavoxel version number. 2014-10-10 17:34:16 -07:00
Andrzej Kapolka
60da0f1567 Allow drawing cursor on dual contour surface, wired up material paint tool. 2014-10-10 17:18:52 -07:00
ZappoMan
82a9429414 add boundingBox.dimensions to entity properties 2014-10-10 17:10:27 -07:00
Stephen Birarda
21114d5f56 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-10 14:30:43 -07:00
Atlante45
9a928a3d55 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-10 11:28:58 -07:00
ZappoMan
db881c0dc8 add boundBox gettable property to EntityItemProperties 2014-10-10 10:32:18 -07:00