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

3705 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
391b62ed32 Make sure we don't hear back from replies after we've cleared them. 2013-06-05 10:34:41 -07:00
Philip Rosedale
5fbf9f8714 gyro look off by default 2013-06-05 10:23:52 -07:00
ZappoMan
8a08bfd01d Merge pull request #476 from PhilipRosedale/master 
Cleanup of serial interface code, added translation estimate
 2013-06-05 10:04:27 -07:00
Philip Rosedale
29c4374dc0 Merge fixes for brad, reversed pitch direction to correct mouse look 2013-06-05 09:59:39 -07:00
Stephen Birarda
6353940bf7 some extra cleanup after merge with upstream master 2013-06-05 09:59:33 -07:00
Stephen Birarda
eee7d6f92f resolve some conflicts on merge with upstream master 2013-06-05 09:56:26 -07:00
Stephen Birarda
6c2dcb86c8 Merge remote-tracking branch 'upstream/master' into synthesis 2013-06-05 09:55:16 -07:00
Philip Rosedale
626dcd0875 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-05 09:40:42 -07:00
ZappoMan
9310876531 Merge pull request #485 from birarda/cube-injector 
spherical audio injector and quaternion rotations for audio
 2013-06-05 09:37:38 -07:00
birarda
69ed86de59 Merge pull request #488 from ZappoMan/master 
support file:// urls for avitar voxles
 2013-06-05 09:37:24 -07:00
Stephen Birarda
351828e8e5 some magic number removal in injector main 2013-06-05 09:35:43 -07:00
ZappoMan
3bce3f7a62 support file:// urls for avitar voxles 2013-06-05 00:53:27 -07:00
Philip Rosedale
8719b9f9d4 merge fix 2013-06-04 21:26:53 -07:00
Andrzej Kapolka
40b7672843 Merge pull request #487 from ey6es/master 
Fix for loading avatar voxels from the web.
 2013-06-04 18:03:12 -07:00
Andrzej Kapolka
c953fc743d Merge branch 'master' of https://github.com/worklist/hifi 2013-06-04 18:00:01 -07:00
Andrzej Kapolka
c0915a91cc Merge pull request #482 from ZappoMan/avatardata_optimization 
Avatardata optimization
 2013-06-04 17:59:25 -07:00
ZappoMan
b75bd80de7 fix build busters 2013-06-04 17:54:48 -07:00
Andrzej Kapolka
f708649546 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-04 17:44:53 -07:00
Andrzej Kapolka
b30b64c5b5 Use downloadProgress rather than isFinished (which worked on files, but didn't 
on HTTP URLs).
 2013-06-04 17:44:19 -07:00
ZappoMan
f66641f1b4 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-04 17:41:41 -07:00
ZappoMan
26542d44c9 Merge pull request #478 from Atlante45/master 
Settings handling with QSettings
 2013-06-04 17:41:02 -07:00
ZappoMan
726a0cecf2 fixed build issue 2013-06-04 17:40:34 -07:00
Stephen Birarda
6bf6d5a28e cleanup NULL comparisons in AgentList 2013-06-04 17:29:37 -07:00
ZappoMan
4f2af717f2 Fixed merge issue with new orientation vectors, migrated to common identity names 2013-06-04 17:27:40 -07:00
Andrzej Kapolka
f403fc33f7 Merge pull request #486 from ey6es/voxeltars 
Fix for glGenBuffers issue.
 2013-06-04 17:27:16 -07:00
Andrzej Kapolka
ad377e6256 We can't initialize avatars from the network thread; they need access to the 
OpenGL context.
 2013-06-04 17:25:04 -07:00
Stephen Birarda
7f486c351f correct direction of angle of delivery 2013-06-04 17:15:58 -07:00
Philip Rosedale
4db6e9074e merge conflict fix 2013-06-04 17:11:33 -07:00
Stephen Birarda
fa9b897025 move mixer related constants above related part of mix 2013-06-04 17:00:55 -07:00
Stephen Birarda
c5d3365f3e correct spatialization and off-axis attenuation for a spherical source 2013-06-04 16:44:01 -07:00
atlante45
d539ea283e Merge 19358 with upstream Master 2013-06-05 01:43:47 +02:00
ZappoMan
6e70f3b187 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-04 16:21:20 -07:00
ZappoMan
82c1ee2062 Merge pull request #484 from ey6es/voxeltars 
Voxeltars!  Much tweaking still to be done, and they currently only show on the local avatar.
 2013-06-04 16:20:35 -07:00
Stephen Birarda
e07c55ec43 set injector orientation from bearing passed as command line argument 2013-06-04 16:11:35 -07:00
Stephen Birarda
4b208e1678 project source position onto XZ plane of listener 2013-06-04 16:11:11 -07:00
Stephen Birarda
bfad6c8f61 fix orientation setter in AudioInjector header 2013-06-04 16:10:20 -07:00
Andrzej Kapolka
93b50f44f5 Add a reasonable minimum size for the URL field. 2013-06-04 15:59:07 -07:00
Andrzej Kapolka
b856af505a Adjusted default bind radius, spring vector threshold. 2013-06-04 15:52:39 -07:00
Stephen Birarda
7d3d8f8b43 rewrite the AudioInjector to send an orientation quaternion instead of bearing 2013-06-04 15:31:11 -07:00
Stephen Birarda
cd79339670 rework audio-mixer to use orientations sent by clients 2013-06-04 15:18:05 -07:00
Stephen Birarda
0f70c9c06b send full quaternion orientation instead of just bearing to audio-mixer 2013-06-04 12:52:09 -07:00
Stephen Birarda
7ea9bb4b92 remove debug line from previous commit 2013-06-04 12:11:59 -07:00
ZappoMan
a12353e112 hopefully fix unix build buster 2013-06-04 11:38:47 -07:00
Stephen Birarda
d02fb65a13 Merge remote-tracking branch 'upstream/master' into cube-injector 2013-06-04 11:25:39 -07:00
Stephen Birarda
eaaeedab68 refactor calculations for audio 2013-06-04 11:24:07 -07:00
Andrzej Kapolka
d09700adde Merge branch 'master' of https://github.com/worklist/hifi into voxeltars 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	interface/src/Skeleton.h
	interface/src/VoxelSystem.h
 2013-06-04 11:00:59 -07:00
Stephen Birarda
3f7fbb5c1e change injector from cube to sphere 2013-06-04 10:57:53 -07:00
Andrzej Kapolka
90a53bc518 Only bind vertices within an adjustable radius. 2013-06-04 10:40:08 -07:00
Andrzej Kapolka
bc8eadd526 More work on voxeltars; separated default pose from bind pose. 2013-06-04 10:22:58 -07:00
atlante45
c199190666 Fixes asked by ZappoMan on QSettings' commit. 2013-06-04 19:00:38 +02:00