Atlante45
9a7ca8b132
Fix header
2014-10-20 17:23:58 -07:00
Atlante45
ee4c7c25bf
Header fix
2014-10-20 16:50:49 -07:00
Atlante45
588b106f5e
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
2014-10-20 15:38:31 -07:00
Atlante45
6f9557fe67
Do not destroy script reverb settings
2014-10-20 15:06:02 -07:00
Atlante45
997f1db835
handle JSON for audioEffectOptions args
2014-10-20 13:37:49 -07:00
Atlante45
ce949b7350
Coding Standard default values
2014-10-20 12:11:29 -07:00
Andrzej Kapolka
662189159d
Fix for Xcode warning.
2014-10-20 12:09:33 -07:00
Atlante45
85d56824a0
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
2014-10-20 11:51:39 -07:00
Atlante45
37b47b52d3
Stream reverb settings from mixer to interface
2014-10-20 11:49:57 -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
7a97634a78
Merge pull request #3616 from ZappoMan/fixSVOs
...
fix SVOs to render again
2014-10-20 08:33:42 -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
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
Atlante45
86b87770c2
Merge branch 'master' of https://github.com/highfidelity/hifi into reverb
2014-10-17 16:50:19 -07:00
Brad Hefta-Gaub
023d47918f
Merge pull request #3620 from birarda/domain-tunnel
...
repairs to domain change reset to correctly clear nodes
2014-10-17 16:05:28 -07:00
Andrzej Kapolka
1e6aee1872
Basic heightfield conversion.
2014-10-17 15:23:54 -07:00
Stephen Birarda
7cb8cbfdd4
repairs to domain change reset to clear nodes
2014-10-17 14:49:25 -07:00
Stephen Birarda
e72b86059e
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel
2014-10-17 14:48:43 -07:00
ZappoMan
e29188bacd
fix SVOs to render again
2014-10-17 11:01:25 -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
Andrzej Kapolka
131486c8f7
More progress on voxelizing heightfields.
2014-10-16 18:53:42 -07:00
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
Andrzej Kapolka
fc6f0afb93
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-10-16 15:03:29 -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
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
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
Andrzej Kapolka
2a08755123
Clear terrain under dual contour surface edit.
2014-10-15 15:06:43 -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
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
