Commit graph

5138 commits

Author SHA1 Message Date
Craig Hansen-Sturm
8ecf0870e7 dependency on new audiobuffer and audioformat objects 2014-09-06 02:20:14 -07:00
Craig Hansen-Sturm
0b33c344ff new audio buffer object 2014-09-06 02:18:35 -07:00
Craig Hansen-Sturm
f439475f3c new audio gain/mute object 2014-09-06 02:18:04 -07:00
Craig Hansen-Sturm
3a9a4a6402 new pink noise generator audio source object 2014-09-06 02:16:00 -07:00
Craig Hansen-Sturm
c6911274f6 new tone generator audio source object 2014-09-06 02:14:47 -07:00
Craig Hansen-Sturm
1cdb01e072 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-noise 2014-09-05 18:31:02 -07:00
Clément Brisset
f3344ac440 Merge pull request #3365 from AndrewMeadows/inertia
remove warnings
2014-09-05 18:00:35 -07:00
Andrew Meadows
bd8fc75305 fix bug: zero velocity when teleporting to new locations 2014-09-05 17:51:18 -07:00
Andrew Meadows
51dca12a7b added default case for switch statements
which avoids warnings about unhandled enum values
2014-09-05 16:55:42 -07:00
Andrew Meadows
2fdfb125f2 removed signed/unsigned comparisons 2014-09-05 16:55:24 -07:00
Andrew Meadows
c089dbb0bb removed signed/unsigned comparisons 2014-09-05 16:44:33 -07:00
Andrew Meadows
e7b39ae119 removed unused variable 2014-09-05 16:42:24 -07:00
Andrew Meadows
3ae78da593 fixed signed/unsigned comparison 2014-09-05 16:41:51 -07:00
Andrew Meadows
62438bae6a fixed signed/unsigned comparison and unused variable 2014-09-05 16:41:01 -07:00
Andrew Meadows
0ddc8eb448 fix signed/unsigned comparison 2014-09-05 16:40:14 -07:00
Brad Hefta-Gaub
5942386383 Merge pull request #3364 from Atlante45/stereo_injections
move isStereo packing to the correct position
2014-09-05 16:37:58 -07:00
Atlante45
619aebcd67 move isStereo packing to the correct position 2014-09-05 16:18:02 -07:00
Philip Rosedale
1d2150e12d Merge pull request #3362 from Atlante45/stereo_injections
Added stereo option to the AudioInjector
2014-09-05 15:53:29 -07:00
Philip Rosedale
39ffd3dadd Merge pull request #3356 from ZappoMan/fixingOctreeSave
voxel file corruption fixes
2014-09-05 15:51:02 -07:00
ZappoMan
f0d72b83fa CR feedback 2014-09-05 15:39:29 -07:00
ZappoMan
1e6b49899a allow FBXReader to parse new format SVO files 2014-09-05 15:12:41 -07:00
Atlante45
507419162c Added stereo option to the AudioInjector 2014-09-05 14:34:55 -07:00
ZappoMan
a19ce6e859 clean up warning 2014-09-05 12:52:04 -07:00
ZappoMan
54a746a846 remove noise 2014-09-05 12:49:23 -07:00
ZappoMan
e1064d8da7 correctly implement data types who assume all child data must be included (e.g. voxels) 2014-09-05 12:41:14 -07:00
ZappoMan
a25790b350 more work on fixing voxels 2014-09-05 11:51:17 -07:00
Andrew Meadows
ff09a0d41b merge upstream/master into andrew/inerita 2014-09-05 11:47:49 -07:00
Andrew Meadows
7be411b4ca expose _measured_ MyAvatar velocity to JS 2014-09-05 11:44:13 -07:00
Ryan Huffman
b0a0760be2 Update ShutdownEventListener to not stop event handling 2014-09-05 11:26:22 -07:00
Ryan Huffman
38a14c3864 Reapply "Update assignment client to close on WM_CLOSE message on Windows"
This reverts commit a603453cf2.
2014-09-05 11:19:36 -07:00
ZappoMan
f234dbf9a1 converting voxel files to new versioned format with buffer breaks 2014-09-05 10:51:08 -07:00
Leonardo Murillo
a603453cf2 Revert "Update assignment client to close on WM_CLOSE message on Windows" 2014-09-05 11:36:56 -06:00
ZappoMan
5c5658b6e7 Merge branch 'master' of https://github.com/highfidelity/hifi into fixingOctreeSave 2014-09-05 09:27:27 -07:00
ZappoMan
60e8056cd8 removed some debug code 2014-09-05 02:20:30 -07:00
ZappoMan
dc31381fc1 better handling of old model files 2014-09-05 02:19:17 -07:00
ZappoMan
3c2b534842 dead code cleanup and comment cleanup 2014-09-05 01:50:43 -07:00
ZappoMan
5ec98b8dec more guards to corrupt voxel files 2014-09-05 01:40:41 -07:00
ZappoMan
a189f077b8 fix huge-mega-voxels and voxel file corruption 2014-09-05 01:13:22 -07:00
Brad Hefta-Gaub
9648c0d64e Merge pull request #3343 from AndrewMeadows/ragdoll
Ragdoll Part 12: first pass avatar skeleton collides with voxels
2014-09-04 23:09:08 -07:00
Andrzej Kapolka
b275af48ed Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-04 17:26:34 -07:00
Andrzej Kapolka
83d209dbdc Remove unused variables. 2014-09-04 17:26:01 -07:00
Clément Brisset
fb8b3020e5 Merge pull request #3353 from ZappoMan/virtualEntities
fix couple of Entities issues: possible static memory corruption, sphere colors
2014-09-04 16:23:38 -07:00
ZappoMan
931e5fa408 fix potential static memory corruption 2014-09-04 15:43:51 -07:00
Andrew Meadows
7cde6811ca remove unecessary AACube::operator<() 2014-09-04 15:21:19 -07:00
Andrew Meadows
faf31f268e use QHash, not QVector, for Octree content query 2014-09-04 15:20:07 -07:00
Stephen Birarda
2678bd3d9e Merge pull request #3348 from ZappoMan/virtualEntities
patch for possible static memory corruption on large edit entity messages
2014-09-04 10:48:59 -07:00
ZappoMan
957991b67e patch for possible static memory corruption on large edit entity messages 2014-09-04 09:52:26 -07:00
Stephen Birarda
e338c600c3 add debug to show that domain connection is being attempted 2014-09-04 09:29:29 -07:00
ZappoMan
3e1401014d more model naming cleanup and fixing example scripts 2014-09-03 18:32:44 -07:00
ZappoMan
e680260c89 remove assert in favor of warning 2014-09-03 17:17:36 -07:00