Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 23:52:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18098 commits 25 branches 0 tags 1.1 GiB
Commit graph

18098 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
c86f3965e8 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 11:01:42 -07:00
ZappoMan
e29188bacd fix SVOs to render again 2014-10-17 11:01:25 -07:00
Stephen Birarda
94da712af0 Merge pull request #3615 from birarda/master 
flip domain-server local connect conditional
 2014-10-17 10:56:05 -07:00
Stephen Birarda
9a842e2202 flip domain-server local connect conditional 2014-10-17 10:52:36 -07:00
Atlante45
9ee0138ccf Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 10:50:08 -07:00
ZappoMan
6fdd489715 more Particles to Entities migration 2014-10-17 10:25:52 -07:00
ZappoMan
a1ecad683a more Particles to Entities migration 2014-10-17 10:17:18 -07:00
ZappoMan
0ff6c491d4 more Particles to Entities migration 2014-10-17 10:11:47 -07:00
ZappoMan
25270efa42 more Particles to Entities migration 2014-10-17 10:01:08 -07:00
ZappoMan
aaa76f6071 more Particles to Entities migration 2014-10-17 09:59:03 -07:00
ZappoMan
597bfa33b9 more Particles to Entities migration 2014-10-17 09:53:53 -07:00
ZappoMan
e5b665cc30 more Particles to Entities migration 2014-10-17 09:50:15 -07:00
Leonardo Murillo
005f56c19b Merge pull request #3612 from birarda/master 
fix for pub key format returned to data-server
 2014-10-17 10:45:09 -06:00
Stephen Birarda
d00e11541e fix for pub key format returned to data-server 2014-10-17 09:39:04 -07:00
Atlante45
26b1e8fc29 grab reverb settings on mixer side 2014-10-16 22:46:40 -07:00
ZappoMan
c5c44e7cec more Particles to Entities migration 2014-10-16 21:13:34 -07:00
ZappoMan
7ca4c95d4a more Particles to Entities migration 2014-10-16 21:03:40 -07:00
ZappoMan
ce638dd14d more Particles to Entities migration 2014-10-16 20:52:38 -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
Sam Gateau
a8c3b18e78 Adding the Batch class to GPU and fixing the compilation issues 2014-10-16 17:29:40 -07:00
Sam Gateau
f09133f413 Adding the Batch class to GPU 2014-10-16 17:23:31 -07:00
Brad Hefta-Gaub
a46610a7c1 Merge pull request #3609 from ZappoMan/groupMaterialsRendering 
small optimization to model rendering
 2014-10-16 16:24:28 -07:00
Brad Hefta-Gaub
5c5e47fb14 Merge pull request #3611 from AndrewMeadows/inertia 
longer lengths for experimental hair
 2014-10-16 16:23:39 -07:00
Brad Hefta-Gaub
90e9c85ea4 Merge pull request #3610 from samcake/temp10 
Check for msdev version and appropriate window sdk
 2014-10-16 16:23:23 -07:00
Andrew Meadows
c44a592032 longer lengths for experimental hair 2014-10-16 16:21:59 -07:00
Sam Gateau
843a64eeee Check for msdev version and appropriate window sdk 2014-10-16 16:15:01 -07:00
Atlante45
ea7c2e2fa3 Added reverb settings to DS settings 2014-10-16 15:28:24 -07:00
ZappoMan
47f5d499f6 small optimization 2014-10-16 15:26:01 -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
148b880bb1 handle case of meshes with multiple parts with different materials better, don't mix them in with single material meshes 2014-10-16 14:32:07 -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
e856191bf3 Merge pull request #3605 from birarda/master 
fix for interest list pull when node requests domain list
 2014-10-16 12:05:25 -07:00
Stephen Birarda
9ba636314e Merge pull request #3595 from Atlante45/attenuation_zones 
Coefficients reordering
 2014-10-16 12:01:57 -07:00
Stephen Birarda
7bbaaf6b78 cleanup some username signature debug, fix interest list pull 2014-10-16 11:54:55 -07:00
Atlante45
d7d0a45990 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-16 11:09:33 -07:00
AndrewMeadows
e75d2a167a Merge pull request #3602 from ZappoMan/frustumCullModelParts 
More Model::render() improvements
 2014-10-16 11:04:57 -07:00
Atlante45
0f128509d8 removed old processReceivedAudio method 2014-10-16 10:58:19 -07:00
Atlante45
9019ae4f89 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/web/js/settings.js
 2014-10-16 10:55:46 -07:00
Brad Hefta-Gaub
866b3d40fc Merge pull request #3604 from AndrewMeadows/inertia 
experimental hair tuning
 2014-10-16 10:53:31 -07:00
Ryan Huffman
5139914ba9 Fix entity tools focus not always using latest entity position 2014-10-16 10:50:42 -07:00