Stephen Birarda
|
80e1b5a4bc
|
some logic and spacing fixes in the audio mixer
|
2013-12-05 13:05:29 -08:00 |
|
Stephen Birarda
|
d2f7dd2371
|
resolve conflicts on merge with upstream master
|
2013-12-05 12:13:11 -08:00 |
|
Stephen Birarda
|
71aca69410
|
fix rendered scope for new Qt Audio
|
2013-12-05 11:36:45 -08:00 |
|
Stephen Birarda
|
6765ce2f1f
|
some spacing cleanup in Audio
|
2013-12-05 10:23:06 -08:00 |
|
Stephen Birarda
|
ab1cd7bd2c
|
fix red/green display in audio debug rendering
|
2013-12-04 16:24:14 -08:00 |
|
Philip Rosedale
|
c1f96ab6b4
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-12-04 15:49:30 -08:00 |
|
Philip Rosedale
|
0c32f94116
|
Better drums
|
2013-12-04 15:48:41 -08:00 |
|
Stephen Birarda
|
d722e0bf6a
|
repairs to Audio class after merge with upstream master
|
2013-12-04 14:24:07 -08:00 |
|
Stephen Birarda
|
277aa9dd89
|
handle conflicts on merge with upstream master
|
2013-12-04 14:21:00 -08:00 |
|
Stephen Birarda
|
7df6210ba0
|
Merge remote-tracking branch 'upstream/master' into qt-for-portaudio
|
2013-12-04 14:20:44 -08:00 |
|
Stephen Birarda
|
560844c138
|
re-enable rendering and fix sampling algorithim
|
2013-12-04 13:55:27 -08:00 |
|
Stephen Birarda
|
e339155328
|
replace missing PortAudio with Qt audio
|
2013-12-04 12:54:33 -08:00 |
|
ZappoMan
|
bc715085a9
|
Merge pull request #1304 from PhilipRosedale/master
Voxel drumming, search function to find leaf voxel containing a point
|
2013-12-04 11:28:39 -08:00 |
|
Philip Rosedale
|
8fdd78dc26
|
Added drum sounds and voxel collision detection
|
2013-12-03 16:25:23 -08:00 |
|
Stephen Birarda
|
3277cb49a6
|
Merge remote-tracking branch 'upstream/master' into cleanup
|
2013-12-03 12:21:03 -08:00 |
|
Stephen Birarda
|
141394a664
|
replace UDPSocket with QUDPSocket
|
2013-12-02 13:34:29 -08:00 |
|
Philip Rosedale
|
534c5105b0
|
echo the right one
|
2013-11-26 11:46:11 -08:00 |
|
Philip Rosedale
|
09ca2a45db
|
Add local audio monitor option, tweak turning with head
|
2013-11-26 11:25:06 -08:00 |
|
Philip Rosedale
|
2991c8af61
|
screen does not flash when voxels are clicked
|
2013-11-08 14:34:22 -08:00 |
|
Andrzej Kapolka
|
a568e71e37
|
Merge pull request #1099 from stojce/19433
Code Review for Job #19433
|
2013-10-23 10:03:36 -07:00 |
|
stojce
|
2fcb246923
|
close button on rear mirror view
|
2013-10-22 20:42:31 +02:00 |
|
Stephen Birarda
|
00446076b5
|
remove audio injectors that are starved and not added
|
2013-10-21 16:04:13 -07:00 |
|
Stephen Birarda
|
80d2df6a49
|
fix audio ternary indentations
|
2013-10-17 15:12:34 -07:00 |
|
Stephen Birarda
|
73d3ecccf3
|
resolve conflicts on merge with upstream master
|
2013-10-17 14:37:58 -07:00 |
|
Stephen Birarda
|
fa146e302d
|
remove 16-bit node IDs and replace with UUIDs
|
2013-10-17 11:49:41 -07:00 |
|
PhilipRosedale
|
9643c1262c
|
Fix mute button, visualize gaze direction when showing headMouse
|
2013-10-17 11:03:12 -07:00 |
|
Stephen Birarda
|
7de88898e1
|
activate appropriate socket after receiving ping reply
|
2013-10-16 17:51:32 -07:00 |
|
stojce
|
61b213804a
|
#19426 - Add a mute control to the interface
- OpenGL overlay icon
- mute control
- icons
|
2013-10-05 13:18:35 +02:00 |
|
Andrzej Kapolka
|
54116cbc85
|
Testing audio shutdown before menu destruction.
|
2013-09-04 16:04:36 -07:00 |
|
Stephen Birarda
|
146e9176eb
|
switch to one channel from PortAudio to resolve USB error
|
2013-08-20 13:06:30 -07:00 |
|
Stephen Birarda
|
46b064b7d6
|
initial decoupling of menu from Application
|
2013-08-15 10:46:51 -07:00 |
|
Philip Rosedale
|
45961b2b64
|
Collision and click sounds improved
|
2013-08-08 16:00:50 -07:00 |
|
Stephen Birarda
|
25537f78a1
|
reset the song mix menu item after clip is done
|
2013-08-05 12:18:59 -07:00 |
|
ZappoMan
|
fd81053e33
|
fixed compiler warnings
|
2013-08-02 18:33:41 -07:00 |
|
Stephen Birarda
|
222a46189f
|
some comments and _songFileBytes reset
|
2013-08-02 17:50:08 -07:00 |
|
Stephen Birarda
|
d259180778
|
add option to audio menu to stop the mixed audio
|
2013-08-02 17:46:23 -07:00 |
|
Stephen Birarda
|
d56b715432
|
add menu option to mix RAW audio with microphone audio
|
2013-08-02 17:30:49 -07:00 |
|
ZappoMan
|
9507cd8955
|
switched to vector
|
2013-07-23 19:54:29 -07:00 |
|
ZappoMan
|
a162643e1e
|
more removing of SourceID from classes
|
2013-07-23 19:21:43 -07:00 |
|
ZappoMan
|
c969570e8c
|
working on selected audio
|
2013-07-22 23:05:42 -07:00 |
|
ZappoMan
|
c301b799c5
|
first cut at selecting audio sources
|
2013-07-22 13:54:47 -07:00 |
|
Philip Rosedale
|
984332e638
|
fixes per review
|
2013-07-17 09:51:04 -07:00 |
|
Philip Rosedale
|
59810cac99
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-07-16 16:41:02 -07:00 |
|
Philip Rosedale
|
192ae63789
|
Colliding with ground, voxels makes interesting sounds and flashes your display
|
2013-07-16 16:40:50 -07:00 |
|
Stephen Birarda
|
1b48d4f0fc
|
revert removal of extraneous newlines
|
2013-07-16 12:46:32 -07:00 |
|
Stephen Birarda
|
89d3cfdb6f
|
remove now extraneous newlines after switch to QDebug
|
2013-07-16 11:16:51 -07:00 |
|
Stephen Birarda
|
afe49bc756
|
switch calls to printLog to QDebug
|
2013-07-16 11:07:22 -07:00 |
|
Philip Rosedale
|
edf031b985
|
improve collision sounds, difference between ground and voxels
|
2013-07-15 22:42:55 -07:00 |
|
Philip Rosedale
|
d05108e26d
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-07-15 19:59:26 -07:00 |
|
Philip Rosedale
|
eee8c3e570
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-07-15 16:27:51 -07:00 |
|