Brad Hefta-Gaub
19195f9119
Merge pull request #3056 from birarda/master
...
fix rounding of credit balance in application title
2014-06-23 14:48:37 -07:00
Stephen Birarda
ed5c05a61b
fix rounding of credit balance in application title
2014-06-23 13:25:32 -07:00
Brad Hefta-Gaub
18cd794542
Merge pull request #3055 from wangyix/master
...
Audio jitter buffer resizes depending on max inter-frame time gaps of incoming audio packets
2014-06-23 12:45:04 -07:00
wangyix
fbdca59d37
fixed spacing issue
2014-06-23 11:56:14 -07:00
Brad Hefta-Gaub
29a8307825
Merge pull request #3050 from ctrlaltdavid/fix_fullscreen_shortcut
...
Fix fullscreen toggle shortcut
2014-06-23 11:42:20 -07:00
wangyix
ffc20b8876
changed InterframeTimeGapHistory to InterframeTimeGapStats
2014-06-23 11:22:04 -07:00
wangyix
e5d7d471e3
removed debug code
2014-06-23 10:55:30 -07:00
wangyix
7196814ec3
added debug prints to look at injected ring buffers
2014-06-23 10:22:16 -07:00
Clément Brisset
1992f624ad
Merge pull request #3054 from huffman/19723
...
Code Review for Job #19723
2014-06-22 16:37:02 -07:00
Clément Brisset
5b95eafa9b
Merge pull request #3053 from ey6es/metavoxels
...
Added basic tests for metavoxel streaming.
2014-06-22 16:35:49 -07:00
Andrzej Kapolka
626bd42b7b
Use randomColorValue, since we have it.
2014-06-20 18:22:36 -07:00
Andrzej Kapolka
811815e61f
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-20 18:12:29 -07:00
Andrzej Kapolka
49f1d427ec
Removed incremental streaming stubs.
2014-06-20 18:12:08 -07:00
Andrzej Kapolka
de0c45a919
Spanner mutation in test.
2014-06-20 18:09:51 -07:00
wangyix
6b72b161d3
fixed typo with frames/samples confusion.
2014-06-20 17:52:46 -07:00
wangyix
124fba35db
fixed minor comment typo
2014-06-20 17:39:05 -07:00
wangyix
cb6681f6f8
completed code for dynamicly resizing jitter buffer
2014-06-20 17:13:42 -07:00
Ryan Huffman
0e6abe3359
Update inactive chat window opacity to 0.8
2014-06-20 16:31:22 -07:00
wangyix
a5457eb86b
fixed bug in Audio.cpp where numSilentSamples was written to wrong place in packet
...
added more debug stuff, other minor changes and fixes
2014-06-20 14:43:18 -07:00
Andrzej Kapolka
ce778f47b1
More work on stream testing, fixed bug with differently-ordered edits.
2014-06-20 14:08:39 -07:00
David Rowe
633746ab16
Different fullscreen shortcuts for Mac and Windows
...
Revert to the original Mac OSX key combination and provide alternative for Windows.
2014-06-20 13:30:04 -07:00
Ryan Huffman
0c87f0aabc
Update chat window behavior
...
Lower opacity when inactive
Move focus to main window when pressing escape, instead of hiding
2014-06-19 19:45:43 -07:00
Brad Hefta-Gaub
4ab30aae2b
Merge pull request #3052 from Atlante45/misc_fixes
...
Misc fixes
2014-06-19 18:19:45 -07:00
Andrzej Kapolka
24f535e02d
Working on metavoxel streaming tests.
2014-06-19 18:15:17 -07:00
Atlante45
4561a6e326
Fixed voxel being deleted even though voxel tool is not selected
2014-06-19 18:10:06 -07:00
Atlante45
266dc6be3e
fixed tooltip not disapearing when deleting model
2014-06-19 18:09:17 -07:00
wangyix
435b5094a0
moved time gap history to PositionalAudioRingBuffer, untested
...
removed hard-coded jitter buffer length.
2014-06-19 17:58:38 -07:00
wangyix
100bc022ec
fixed a for loop that erased elements while iterating
2014-06-19 16:42:51 -07:00
wangyix
77c377711a
removed debug code
2014-06-19 15:39:54 -07:00
wangyix
8176aa1292
added debug code for testing time gap history
2014-06-19 14:54:22 -07:00
Andrzej Kapolka
7a9c0f0e6a
Working on tests for metavoxel streaming.
2014-06-19 14:50:19 -07:00
wangyix
aa3602f0fb
added InterframeTimeGapHistory and frameReceived() calls
2014-06-19 14:35:02 -07:00
Brad Hefta-Gaub
d7782a2365
Merge pull request #3051 from Atlante45/dont_glow_if_out_of_range
...
Don't glow models if you can't grab it
2014-06-19 12:37:33 -07:00
Andrzej Kapolka
07e54b5162
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-19 11:38:14 -07:00
Atlante45
4a4efb0bfa
Don't glow models if you can't grab it
2014-06-19 11:11:08 -07:00
David Rowe
2dbf8d7daf
Fix fullscreen toggle shortcut
...
Remove the "Meta" modifier so that the shortcut works on Windows.
2014-06-19 11:08:21 -07:00
Brad Hefta-Gaub
45a640d4b2
Merge pull request #3049 from Atlante45/make_selection_range_infinite
...
Make selection range infinite
2014-06-19 10:54:13 -07:00
Atlante45
676141024a
Added angular size limit to hydras too.
2014-06-19 10:46:06 -07:00
Atlante45
641b9e8253
Set minimum angular size too model selection
2014-06-19 10:43:25 -07:00
Brad Hefta-Gaub
5801ea2011
Merge pull request #3048 from ctrlaltdavid/fix_hydra_crash
...
Fix startup crash where Hydra controllers are not properly plugged in
2014-06-19 08:21:22 -07:00
David Rowe
afab5f1cbf
Fix startup crash where Hydra controllers are not properly plugged in
...
Crash occurs if the left controller is plugged in but right one isn't.
2014-06-18 20:52:17 -07:00
Andrzej Kapolka
2decfb9561
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-18 18:08:19 -07:00
Andrzej Kapolka
531c32fdd3
More comments, stubbing out incremental streaming.
2014-06-18 18:07:50 -07:00
wangyix
761a154a93
Merge remote-tracking branch 'upstream/master'
2014-06-18 15:59:45 -07:00
Brad Hefta-Gaub
c7b1b504b4
Merge pull request #3047 from birarda/master
...
allow a payload to define a zone of unattenuated audio
2014-06-18 15:25:41 -07:00
wangyix
827b28ceda
Merge remote-tracking branch 'origin/master'
...
Conflicts:
assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
2014-06-18 15:21:19 -07:00
Stephen Birarda
dd5d59208e
fix a crash when grabbing AABox from buffer
2014-06-18 15:05:38 -07:00
Brad Hefta-Gaub
4699a8011c
Merge pull request #3046 from Atlante45/more_intuitive_rotation_UI
...
More intuitive rotation UI
2014-06-18 15:04:34 -07:00
Brad Hefta-Gaub
f2b2784fa9
Merge pull request #3045 from wangyix/edit_nack_pull
...
Changed octree data NACK handling to repeatedly NACK missing seq numbers, like edit NACKs
2014-06-18 15:02:40 -07:00
AndrewMeadows
71bbbac1c0
Merge pull request #3038 from ey6es/metavoxels
...
Support for writing to and reading from a JSON format that mirrors the bitstream format, with tools to convert between them (using generics so as not to require the original classes).
2014-06-18 14:47:11 -07:00
