Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-18 15:40:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
8887 commits 72 branches 59 tags 1.2 GiB
Commit graph

8887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
006472cb24 tweaked RGB->Hz for drum to make piano 2013-12-05 15:56:55 -08:00
ZappoMan
072ced0185 first cut at PACKET_TYPE_PARTICLE_ADD implementation 2013-12-05 15:38:36 -08:00
Andrzej Kapolka
9ecef89c6c Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 15:36:56 -08:00
Andrzej Kapolka
ecff3a0542 Basic sphere/capsule-cone penetration test. 2013-12-05 15:36:34 -08:00
Philip Rosedale
e9e6f97084 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 15:26:14 -08:00
Philip Rosedale
0596e0f846 Merge pull request #1328 from birarda/master 
audio fixes after move to QAudio, AvatarMixer self-send fix
 2013-12-05 15:25:11 -08:00
Stephen Birarda
3f9e00d977 fix a boneheaded mistake in AvatarMixer broadcastAvatarData 2013-12-05 15:10:01 -08:00
Andrzej Kapolka
d238d3c35a Called addPenetrations wrong. 2013-12-05 14:49:30 -08:00
Stephen Birarda
5e73e803e9 fixes for procedural audio input 2013-12-05 14:49:28 -08:00
Philip Rosedale
d386eaa0a5 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 14:49:26 -08:00
Andrzej Kapolka
9be30acf82 Render the palm collision proxies. 2013-12-05 14:40:24 -08:00
Stephen Birarda
21076af739 hook audio loudness back to QAudioInput 2013-12-05 14:29:55 -08:00
Andrzej Kapolka
3c167da8a4 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 14:26:37 -08:00
Andrzej Kapolka
d2cb6f0243 Test hand against other avatars. 2013-12-05 14:19:13 -08:00
Stephen Birarda
983fd32676 Merge pull request #1326 from birarda/master 
reset pointers between packet sends in AvatarMixer
 2013-12-05 14:04:58 -08:00
Andrzej Kapolka
b90c5bdae8 Option to render collision proxies, more general avatar penetration test, fix 
for meshes with only one joint influence.
 2013-12-05 14:00:38 -08:00
Stephen Birarda
b3d6c18902 reset buffer pointers in between sending to nodes 2013-12-05 13:54:46 -08:00
Stephen Birarda
7fab3ea269 don't use static packets in AvatarMixer 2013-12-05 13:50:44 -08:00
Philip Rosedale
a9bd6718ff Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 13:41:13 -08:00
Philip Rosedale
a7dacec63d Don’t render collision if not own avatar, don’t check for collisions with voxel tree if not me. 2013-12-05 13:36:00 -08:00
Philip Rosedale
3b12d841de Merge pull request #1325 from birarda/qt-for-portaudio 
audio spacing cleanup and garbled audio fix
 2013-12-05 13:32:21 -08:00
Stephen Birarda
487209e270 fix bandwidth meter for audio 2013-12-05 13:21:16 -08:00
Stephen Birarda
d1054b3cfc add received audio to buffer via queued connection 2013-12-05 13:17:16 -08:00
Stephen Birarda
5ae30bc1a0 cast integer sample rate so BUFFER_SEND_INTERVAL is correct 2013-12-05 13:12:49 -08:00
Stephen Birarda
80e1b5a4bc some logic and spacing fixes in the audio mixer 2013-12-05 13:05:29 -08:00
Philip Rosedale
0d33593561 Merge pull request #1322 from birarda/qt-for-portaudio 
replace PortAudio with QAudioInput and QAudioOutput
 2013-12-05 12:50:50 -08:00
Stephen Birarda
d2f7dd2371 resolve conflicts on merge with upstream master 2013-12-05 12:13:11 -08:00
ZappoMan
a9d16862c8 Merge branch 'master' of https://github.com/worklist/hifi into particle_details 2013-12-05 12:09:48 -08:00
ZappoMan
86ffbc3d33 first pass at adding actual particles to the ParticleTree 2013-12-05 12:07:52 -08:00
Andrzej Kapolka
1edfc90e5e Missed a scale multiplier. 2013-12-05 12:02:48 -08:00
Philip Rosedale
5d510148c6 Merge pull request #1320 from birarda/cleanup 
fix 100% CPU usage in DS and VS
 2013-12-05 11:57:44 -08:00
Stephen Birarda
baae2a3e41 fix reference to NodeList in OctreeServer destructor 2013-12-05 11:44:11 -08:00
Stephen Birarda
5b6c2531a4 use correct cleanup calls in OctreeServer destructor 2013-12-05 11:43:48 -08:00
Stephen Birarda
aac01ee70d rename in OctreeServer destructor debug 2013-12-05 11:42:34 -08:00
Stephen Birarda
5e429250d3 merge with upstream/master 2013-12-05 11:41:28 -08:00
Stephen Birarda
71aca69410 fix rendered scope for new Qt Audio 2013-12-05 11:36:45 -08:00
Philip Rosedale
0c4b66ef54 Merge pull request #1312 from ZappoMan/more_on_particle_server 
First cut at basic Particle Server
 2013-12-05 11:29:01 -08:00
Andrzej Kapolka
0ea0887f66 Add a scale factor to bone radii. 2013-12-05 11:21:56 -08:00
Andrzej Kapolka
9b3560d414 Skip the hands' parents as well as the hands themselves. 2013-12-05 11:10:22 -08:00
Stephen Birarda
6765ce2f1f some spacing cleanup in Audio 2013-12-05 10:23:06 -08:00
Stephen Birarda
6bbd944b6a wait for audio thread to quit on application exit 2013-12-05 10:21:30 -08:00
Andrzej Kapolka
193f676fcb Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 10:18:50 -08:00
Stephen Birarda
7613f3d00c fix VoxelServer to be correctly event-driven, closes #1314 2013-12-05 10:08:41 -08:00
Stephen Birarda
a376ebbca2 make DomainServer a proper QCoreApplication instance, closes #1313 2013-12-05 10:00:20 -08:00
ZappoMan
50833cf04c add --particleServerConfig to domain server 2013-12-04 21:37:31 -08:00
ZappoMan
9654f025b4 fix build buster 2013-12-04 21:33:59 -08:00
ZappoMan
2930ae0f9b attempt to fix build buster 2013-12-04 21:29:25 -08:00
ZappoMan
33b3cbaa43 fix cmake 2013-12-04 21:18:40 -08:00
ZappoMan
0acd9d0fce tweak to cause rebuild 2013-12-04 21:10:01 -08:00
ZappoMan
821b490ff1 added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:17 -08:00