Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 06:32:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
3492 commits 75 branches 59 tags 1.2 GiB
Commit graph

633 commits

Author SHA1 Message Date
Stephen Birarda
4cb00ad54b clean up AudioRingBuffer by subclassing 2013-06-05 11:51:21 -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
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
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
ZappoMan
6e70f3b187 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-04 16:21:20 -07:00
Stephen Birarda
bfad6c8f61 fix orientation setter in AudioInjector header 2013-06-04 16:10:20 -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
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
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
ZappoMan
026fb5b344 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-04 09:34:37 -07:00
ZappoMan
4f3872c18f CR feedback 2013-06-04 01:13:58 -07:00
ZappoMan
37cc436b2b CR feedback 2013-06-04 01:08:18 -07:00
ZappoMan
1f3de3e12b CR feedback 2013-06-04 01:03:26 -07:00
ZappoMan
ceb15d407d removed assert 2013-06-03 22:08:19 -07:00
ZappoMan
eef0636655 some cleanup 2013-06-03 21:53:06 -07:00
ZappoMan
510dfc7353 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-03 21:43:38 -07:00
ZappoMan
03f79f5cab fixed delete voxel 2013-06-03 21:04:42 -07:00
ZappoMan
cf3ff53e2c copy and paste working 2013-06-03 18:08:11 -07:00
ZappoMan
0b7f4b21f4 Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-06-03 16:42:27 -07:00
Stephen Birarda
c55b6a20d7 parse the desired cube side length for injected audio source 2013-06-03 15:38:12 -07:00
ZappoMan
ea965f2290 fixed issue with sendVoxelsOperataion, some other cleanup 2013-06-03 13:46:21 -07:00
ZappoMan
78fe89172a eyedropper mode, and import work 2013-06-03 12:23:16 -07:00
Stephen Birarda
f3ce68e5e4 remove space at the top of PacketHeaders 2013-06-03 12:21:44 -07:00
Stephen Birarda
ca39593f05 move typedef for FreeVerbAgentMap to AudioRingBuffer header 2013-06-03 12:02:41 -07:00
Stephen Birarda
104fcd1289 revert hardcode of birarda test machine IP to AgentList 2013-06-03 12:00:34 -07:00
Stephen Birarda
4348702dd2 Merge remote-tracking branch 'upstream/master' into synthesis 2013-06-03 11:53:13 -07:00
ZappoMan
7dd217b318 more work on copy and paste 2013-06-03 10:57:18 -07:00
Andrzej Kapolka
a6daa296ff Slight fix to capsule/box penetration test: we should use the smaller distance 
to the diagonal, not the first one we find.
 2013-06-03 10:08:42 -07:00
Stephen Birarda
2d7c397138 create a FreeVerb object for each other agent per agent 2013-05-31 15:47:57 -07:00
ZappoMan
e5e200345b more work on copy and paste 2013-05-31 11:52:18 -07:00
Andrzej Kapolka
98759c3ba1 Include <unistd.h> to address a build error experienced by Clement. 2013-05-31 10:27:25 -07:00
ZappoMan
b0397e8eb9 Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels 2013-05-30 21:41:55 -07:00
Andrzej Kapolka
3f6cf08b97 Removed remaining Orientation bits (and class itself), enforce limits on 
head yaw/pitch/roll.
 2013-05-30 15:15:12 -07:00
Andrzej Kapolka
100d10dc9e Offset camera fix, cleaner frustum transformation. 2013-05-30 11:08:33 -07:00
Andrzej Kapolka
021dce72be Moved direction vectors to AvatarData, made them align with OpenGL view space 
(to avoid the 180 degree rotations).
 2013-05-30 09:55:34 -07:00
Andrzej Kapolka
9b301eb235 Merge branch 'master' of https://github.com/worklist/hifi into reorient 
Conflicts:
	interface/src/Avatar.cpp
 2013-05-29 19:13:18 -07:00
Andrzej Kapolka
d6855b6430 Massive changes to orientations: use quaternions rather than Orientation 
class.
 2013-05-29 19:05:33 -07:00
Stephen Birarda
1f4e9f3051 update last heard from time for audio injectors 2013-05-29 18:37:03 -07:00
Stephen Birarda
c259b025db fix a crash in audio injector when there is no audio mixer 2013-05-29 15:05:39 -07:00
ZappoMan
46c6f2f9b5 latest copy paste 2013-05-29 15:02:28 -07:00
ZappoMan
377fb1e936 latest copy and paste 2013-05-29 12:06:58 -07:00
Stephen Birarda
56e0e3882d kill agents who send NaN bearings 2013-05-29 11:29:38 -07:00
Stephen Birarda
1fb61faded fix the isnan check for agent bearing 2013-05-29 11:22:25 -07:00
Stephen Birarda
f45062a097 don't use audio when the bearing sent by the agent is garbage 2013-05-29 11:14:50 -07:00