Andrzej Kapolka
|
a0886d4301
|
Use raw OpenGL textures rather than QOpenGLTexture, since that we're having
issues with constants in that class.
|
2014-07-31 11:55:52 -07:00 |
|
Andrzej Kapolka
|
90ce73823a
|
Attempting to fix the Linux build error.
|
2014-07-31 11:03:50 -07:00 |
|
Andrzej Kapolka
|
f2a72aa5a9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-30 18:17:28 -07:00 |
|
Andrzej Kapolka
|
c3c2265ddd
|
Hide the unset (black) bits.
|
2014-07-30 18:14:11 -07:00 |
|
Brad Hefta-Gaub
|
d6e6cfd585
|
Merge pull request #3216 from wangyix/inbound_audio_stream
Audio ringbuffer classes refactored into subclasses of InboundAudioStream
|
2014-07-30 18:00:17 -07:00 |
|
wangyix
|
8d6896a1da
|
forgot an arg in Agent.cpp
|
2014-07-30 17:26:58 -07:00 |
|
Andrzej Kapolka
|
6c15468c87
|
Fix for sizing.
|
2014-07-30 17:21:31 -07:00 |
|
wangyix
|
7281eca5a4
|
fixed inj crash; added statcDesired to MixedAudioStream
|
2014-07-30 17:20:05 -07:00 |
|
Leonardo Murillo
|
e32e950e55
|
Merge pull request #3226 from birarda/oculus
fix set of LIBOVR_LIBRARIES in FindLibOVR module
|
2014-07-30 18:09:07 -06:00 |
|
Andrzej Kapolka
|
f356f0652b
|
Collapse nodes when they fall out of LOD.
|
2014-07-30 16:36:40 -07:00 |
|
Stephen Birarda
|
5b371cedb9
|
Revert "remove useless lib prefix in oculus find module"
This reverts commit ff1ae43474 .
|
2014-07-30 16:18:04 -07:00 |
|
Stephen Birarda
|
ff1ae43474
|
remove useless lib prefix in oculus find module
|
2014-07-30 16:16:50 -07:00 |
|
Stephen Birarda
|
4f6a86fc6c
|
tweak to help windows find oculus libraries
|
2014-07-30 16:15:28 -07:00 |
|
wangyix
|
24be668d36
|
added check before pushAudioToOutput to prevent starvecount buildup
|
2014-07-30 15:47:49 -07:00 |
|
wangyix
|
636b6d3307
|
Merge branch 'pull_mode_audio_output' into inbound_audio_stream
|
2014-07-30 15:37:18 -07:00 |
|
wangyix
|
daeb2a898d
|
added staticDesiredJitterBufferFrames feature; AudioMixer crashing
moved some callbacks from Application::updateAvatar() to
Application::update()
|
2014-07-30 15:35:40 -07:00 |
|
Stephen Birarda
|
d101d321da
|
add a missing closing bracket
|
2014-07-30 15:32:45 -07:00 |
|
Stephen Birarda
|
4e27738cb1
|
don't apply udev and xinerama libraries to APPLE
|
2014-07-30 15:31:47 -07:00 |
|
Stephen Birarda
|
e702738694
|
only add udev and xinerama on UNIX
|
2014-07-30 15:31:05 -07:00 |
|
Stephen Birarda
|
f25e8b0b75
|
add NAMES to find_library commands
|
2014-07-30 15:28:45 -07:00 |
|
Andrzej Kapolka
|
a722c4ba0a
|
Merge fix.
|
2014-07-30 15:22:45 -07:00 |
|
Stephen Birarda
|
4f17902c6b
|
fix set of LIBOVR_LIBRARIES in FindLibOVR module
|
2014-07-30 15:08:31 -07:00 |
|
Andrzej Kapolka
|
82e442c115
|
Working on heightfield transmission, merging.
|
2014-07-30 14:54:38 -07:00 |
|
Leonardo Murillo
|
da7c46d8d9
|
Merge pull request #3224 from birarda/master
remove explicit src dir requirement in OculusManager
|
2014-07-30 15:54:16 -06:00 |
|
Stephen Birarda
|
7302af4fec
|
fix bad conditional in LibOVR find module
|
2014-07-30 14:52:58 -07:00 |
|
Stephen Birarda
|
6275dd68ab
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-07-30 14:15:22 -07:00 |
|
Stephen Birarda
|
4be8a92e52
|
remove explicit requirement of LibOVR source file in OculusManager
|
2014-07-30 14:15:14 -07:00 |
|
Leonardo Murillo
|
2b9849875a
|
Merge pull request #3223 from birarda/master
patch to LibOVR find module for 0.4.0
|
2014-07-30 15:13:00 -06:00 |
|
Stephen Birarda
|
4d3aafa5df
|
use path suffixes instead of full path in name
|
2014-07-30 14:07:40 -07:00 |
|
Stephen Birarda
|
d6c0defd98
|
check in VS2010 subdir to see oculus 0.4.0 library
|
2014-07-30 14:05:20 -07:00 |
|
wangyix
|
a2945eaa96
|
qaudiooutput overflow check enabled by default
|
2014-07-30 12:52:35 -07:00 |
|
wangyix
|
efd4b7ad67
|
switched upstream/downstream stats; added menu item to disable injected stats
|
2014-07-30 12:04:03 -07:00 |
|
wangyix
|
81e5419287
|
added CTRL+A shortcut to display audio stats
|
2014-07-30 11:43:33 -07:00 |
|
wangyix
|
af5eedb50e
|
fixed sequenceNumberStats sender changed msgs
|
2014-07-30 11:39:29 -07:00 |
|
wangyix
|
2b77a72aba
|
changed Mac downstream ringbuffer to 100 frames
|
2014-07-30 11:13:15 -07:00 |
|
wangyix
|
093e78ac52
|
Merge branch 'reduce_client_latency' into inbound_audio_stream
|
2014-07-30 11:03:18 -07:00 |
|
wangyix
|
30c17067a1
|
moved pushAudioOutput to handleAudioInput
|
2014-07-30 11:02:10 -07:00 |
|
wangyix
|
5b0662f1d0
|
fixed setToStarved() behavior of InboundAudioStream
|
2014-07-30 10:51:50 -07:00 |
|
wangyix
|
656131b7ee
|
made frames available avg window 2s; added missing _silentFramesDropped update
|
2014-07-30 10:24:24 -07:00 |
|
Philip Rosedale
|
f0b64c11bc
|
Merge pull request #3221 from lzuwei/add_cara_face_tracker
Add cara face tracker
|
2014-07-29 20:22:21 -07:00 |
|
Philip Rosedale
|
743200a38c
|
Merge pull request #3220 from Atlante45/avatar_simulate_optimisation
Avatar simulate optimisation
|
2014-07-29 20:20:32 -07:00 |
|
Andrzej Kapolka
|
ff01d4b80d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-29 19:14:08 -07:00 |
|
Andrzej Kapolka
|
1ea9b0ccbc
|
Working on heightfield encoding.
|
2014-07-29 19:13:43 -07:00 |
|
Zu
|
1e719f1a88
|
fixed: restyled code for better readability
|
2014-07-30 10:04:20 +08:00 |
|
Zu
|
113a173577
|
fix: update code style to conform to hifi convention
|
2014-07-30 09:30:55 +08:00 |
|
Atlante45
|
9b3cdacf08
|
Removed microthreading in favor of lazy computation
|
2014-07-29 18:28:33 -07:00 |
|
Zu
|
dcd7b81426
|
Merge branch 'master' into add_cara_face_tracker
|
2014-07-30 08:45:44 +08:00 |
|
wangyix
|
ecfd5c2757
|
default max frames over desired changed to 10
|
2014-07-29 17:37:59 -07:00 |
|
Andrzej Kapolka
|
496f4a184e
|
Translation, etc.
|
2014-07-29 17:36:52 -07:00 |
|
wangyix
|
bcf9a3c20c
|
changed default max frames over desired in client to 20
|
2014-07-29 17:17:10 -07:00 |
|