Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 02:25:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2653 commits 71 branches 56 tags 1.2 GiB
Commit graph

2653 commits

This branch
This branch
All branches
Author SHA1 Message Date
birarda
c28a0412b7 Merge pull request #324 from birarda/master 
fix missing bytes on audio injector read
 2013-05-15 16:32:06 -07:00
Stephen Birarda
9b72762eb8 fix missing bytes on read for audio injector 2013-05-15 16:31:43 -07:00
birarda
811a3dd934 Merge pull request #323 from birarda/master 
add missing header for broken eve unix build
 2013-05-15 16:25:56 -07:00
Stephen Birarda
e6cba99c0e include cstring for memcpy in eve main 2013-05-15 16:25:27 -07:00
ZappoMan
ac19f0b078 Merge pull request #321 from birarda/injector 
add threaded injection of audio via AudioInjector class
 2013-05-15 16:21:27 -07:00
Stephen Birarda
af934e2104 type squishes in UDPSocket implementation 2013-05-15 16:19:45 -07:00
Stephen Birarda
13c10c95e8 type squishes in UDPSocket header 2013-05-15 16:17:38 -07:00
Stephen Birarda
fc5e42cf8b add threaded injection of audio via audio injector class 2013-05-15 16:10:59 -07:00
Stephen Birarda
47766d6c6b add methods to AudioInjector to prepare for procedural injection 2013-05-15 15:20:11 -07:00
birarda
d4b75670a9 Merge pull request #320 from birarda/master 
new interface icon
 2013-05-15 14:44:05 -07:00
Stephen Birarda
67b9b5382d update to newer interface icon 2013-05-15 14:43:35 -07:00
ZappoMan
b1e4c039ce Merge pull request #319 from birarda/master 
refactor the Agent class
 2013-05-15 14:34:25 -07:00
Stephen Birarda
db0c1bdba1 another type squish in Agent header 2013-05-15 14:28:43 -07:00
Stephen Birarda
9b8fd55bb7 type squishes in Agent header 2013-05-15 14:28:20 -07:00
Stephen Birarda
80284470ed type squishes in Agent class 2013-05-15 14:20:15 -07:00
Stephen Birarda
12b4b485f0 refactor the Agent copy constructor 2013-05-15 14:19:14 -07:00
Stephen Birarda
f333aaf809 refactor Agent constructor to call member variable constructors 2013-05-15 14:16:15 -07:00
Stephen Birarda
48b57c92bd refactor Agent member variables 2013-05-15 14:12:21 -07:00
birarda
f71b342b8e Merge pull request #318 from birarda/master 
add audio injector the getTypeName switch case
 2013-05-15 14:02:52 -07:00
Stephen Birarda
2c242a7704 add AGENT_TYPE_AUDIO_INJECTOR to getTypeName, refactor 2013-05-15 14:02:09 -07:00
ZappoMan
652832c207 Merge pull request #316 from ey6es/master 
Voxel editing improvements: apply color on add, menu items, free placement, dragging.
 2013-05-15 13:01:43 -07:00
Andrzej Kapolka
3e57aa08c9 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 12:48:51 -07:00
ZappoMan
ab3ee22dc9 Merge pull request #317 from birarda/audio-refactor 
refactoring Audio in interface and audio-mixer
 2013-05-15 12:40:05 -07:00
Stephen Birarda
e0ee50fa9c spacing changes in Audio render 2013-05-15 12:38:11 -07:00
Stephen Birarda
351412f6e8 constantize SOUND_PITCH in addProceduralSounds 2013-05-15 12:36:53 -07:00
Stephen Birarda
63a2b203d9 constantize VOLUME_BASELINE in addProceduralSounds 2013-05-15 12:36:19 -07:00
Stephen Birarda
274c810dec constantize the number of packets to discard for stats 2013-05-15 12:35:41 -07:00
Stephen Birarda
b186dd0f65 comment cleanup for audioCallback 2013-05-15 12:24:58 -07:00
Stephen Birarda
c5fdfd64e7 remove extra space 2013-05-15 12:22:11 -07:00
Stephen Birarda
44b12cb593 spacing changes 2013-05-15 12:21:43 -07:00
Stephen Birarda
fb42e8df04 correct some global references in Audio.cpp 2013-05-15 12:19:40 -07:00
Stephen Birarda
182b0b4fa1 data sent to client from mixer must include packet header 2013-05-15 12:13:39 -07:00
Andrzej Kapolka
4292cd9ab3 Moved voxel options into their own menu, switched destructive flag to check 
Qt action.
 2013-05-15 12:05:32 -07:00
Stephen Birarda
e4a734fc78 refactor constructor in AudioInjector 2013-05-15 12:01:32 -07:00
Stephen Birarda
e83710e45e prepend audio packets from the mixer with a packet header 2013-05-15 12:00:04 -07:00
Andrzej Kapolka
0ce9e42085 Support dragging when in coloring mode. I tried it in add/delete mode, too, 
but it felt messy.
 2013-05-15 11:48:23 -07:00
Stephen Birarda
ce34a8f3e0 add packet headers and agent types for audio clarity 2013-05-15 11:43:49 -07:00
Stephen Birarda
26c34bb86c sensible initialization for Audio member variables 2013-05-15 11:29:52 -07:00
Andrzej Kapolka
6317404249 When in add mode and there's no voxel under the cursor, place the mouse voxel 
a fixed distance away.
 2013-05-15 11:21:34 -07:00
Stephen Birarda
4693082db0 refactor Audio to remove requirement of AudioData 2013-05-15 10:54:36 -07:00
Andrzej Kapolka
b05140ee51 Turned the voxel edit commands into menu options for better visibility. 2013-05-15 10:40:41 -07:00
Andrzej Kapolka
1f7b77eb95 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-15 09:55:56 -07:00
birarda
6f7d2a6922 Merge pull request #314 from birarda/transmitter 
add new packet header for V2 transmitter data
 2013-05-14 16:30:55 -07:00
Stephen Birarda
aca2ce47b6 add a V2 transmitter data packet for new iOS transmitter 2013-05-14 16:29:39 -07:00
Andrzej Kapolka
45e1d341fa When we add voxels, add them with the selected color. 2013-05-14 16:02:50 -07:00
Andrzej Kapolka
9ff006916f Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 15:35:42 -07:00
Philip Rosedale
75f31970f0 Merge pull request #313 from ey6es/master 
Voxel painitng with color selection, fix for coloring subvoxels (must break up larger ones).
 2013-05-14 15:10:03 -07:00
Andrzej Kapolka
775fd5bd2e Use the sun location in the environment to set the light position. 2013-05-14 14:53:29 -07:00
Andrzej Kapolka
8e04c17cc2 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Application.cpp
 2013-05-14 14:44:22 -07:00
Andrzej Kapolka
e1016ad902 What matters is the active state, not the focus. 2013-05-14 14:40:18 -07:00