Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 10:04:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13625 commits 25 branches 0 tags 1.1 GiB
Commit graph

13625 commits

This branch
This branch
All branches
Author SHA1 Message Date
wangyix
ffda98fe0b var name change again 2014-06-09 17:50:29 -07:00
wangyix
4665df4d1f nackdisable to disablenack 2014-06-09 17:41:20 -07:00
wangyix
de61029f05 Added dev menu option to disable nack packets 2014-06-09 17:30:09 -07:00
wangyix
8312e1642d replaced takeFirst() with dequeue() for consistency 2014-06-09 15:15:43 -07:00
wangyix
e45f2fed4b changed writelock to readlock 
plus a coding standard fix
 2014-06-09 13:42:45 -07:00
wangyix
ff2a5342ee removed another extra space 2014-06-09 12:57:50 -07:00
wangyix
412d3e19fe removed debug prints in parseNackPacket() 2014-06-09 12:56:00 -07:00
wangyix
0fce7e721a removed more spaces 2014-06-09 12:40:01 -07:00
wangyix
968ea3563c removed an extra space 2014-06-09 12:37:42 -07:00
wangyix
aa694d6967 removed debug code 2014-06-09 12:35:26 -07:00
wangyix
f13ae84da6 Merge branch 'packet_recovery_pull' 2014-06-09 12:04:12 -07:00
wangyix
529dd827a2 moved around code in sendNack() a bit 2014-06-09 12:00:19 -07:00
wangyix
3bc457d4d2 added octree scene stats locking and unlocking 2014-06-09 11:14:02 -07:00
wangyix
5286090812 removed interface print statements 2014-06-06 17:52:48 -07:00
wangyix
b39559d860 packet recovery seems to be working 
Seems to impact FPS a lot.  OctreeSceneStats is not being locked (causes
freezing, need to find out why).
 2014-06-06 17:44:30 -07:00
wangyix
d21a8e73ff Merge remote-tracking branch 'upstream/master' into packet_recovery_pull 2014-06-06 15:05:29 -07:00
wangyix
0b1bffa83c added random packet drops; ready to test 2014-06-06 15:03:54 -07:00
wangyix
bd2148d4b7 added write lock/unlock 
...for _octreeSceneStatsLock
 2014-06-06 14:33:53 -07:00
wangyix
5c47485562 client-side nack sending complete; ready to test 2014-06-06 14:27:51 -07:00
Stephen Birarda
570b66b310 Merge pull request #2998 from birarda/master 
remove MMX math in stereo audio copy
 2014-06-06 12:02:21 -07:00
Stephen Birarda
194493ab9b remove MMX math to fix stereo discrepancies 2014-06-06 12:00:47 -07:00
wangyix
6bbf3f1f17 Merge remote-tracking branch 'upstream/master' 2014-06-06 11:53:37 -07:00
Stephen Birarda
53a15bc7ed Merge pull request #2997 from birarda/master 
bump silent audio frame packet version
 2014-06-06 11:50:52 -07:00
Stephen Birarda
6fdc5df47b bump silent audio frame version 2014-06-06 11:50:36 -07:00
wangyix
8cd5ec3b54 started work on sending nack packets from client 2014-06-06 11:50:34 -07:00
Stephen Birarda
1c8cf20ec2 Merge pull request #2996 from birarda/master 
add a mixer crash guard for meeting
 2014-06-06 11:47:45 -07:00
Stephen Birarda
a7a9656ac7 add a mixer crash guard in addSilentFrame 2014-06-06 11:47:34 -07:00
Philip Rosedale
b07a3488aa Merge pull request #2995 from birarda/master 
initial pass at stereo input source
 2014-06-06 11:40:41 -07:00
Stephen Birarda
b6b148cd9f resolve conflicts on merge with upstream master 2014-06-06 11:31:16 -07:00
Stephen Birarda
f6011b65d7 fix input loudness for a stereo source 2014-06-06 11:26:04 -07:00
Stephen Birarda
ae2f6a3cb6 complete piping of stereo audio through mixer 2014-06-06 10:55:04 -07:00
Stephen Birarda
681ce247d6 tweak resample to handle 48 to 24 stereo, add stereo/mono byte 2014-06-06 10:27:59 -07:00
Stephen Birarda
7da091d2b4 initial hooks for stereo audio 2014-06-06 10:15:09 -07:00
wangyix
5461a06e99 completed code to resend nacked packets on AC 2014-06-06 09:33:14 -07:00
wangyix
1a7e3a859c started work on resending nacked packets 2014-06-05 18:00:58 -07:00
Brad Hefta-Gaub
3646a7a61d Merge pull request #2992 from PhilipRosedale/master 
Left and Right hands have clasping animations in squeezeHands.js
 2014-06-05 17:20:59 -07:00
Andrzej Kapolka
ff306e5675 Merge pull request #2991 from ey6es/master 
Temporarily disable enum streamers, which are crashing on Windows startu...
 2014-06-05 17:08:31 -07:00
Andrzej Kapolka
83c2938c2e Temporarily disable enum streamers, which are crashing on Windows startup. 2014-06-05 17:05:57 -07:00
Andrzej Kapolka
981d0eb36e Merge pull request #2990 from AndrewMeadows/bug-fix 
fix for broken windows build with PrioVR libs
 2014-06-05 17:04:58 -07:00
Philip Rosedale
6bef0c1a6a both left and right hands in animation 2014-06-05 17:03:58 -07:00
Andrew Meadows
c689d826f4 fix for broken windows build with PrioVR libs 
The Model API changed but this code path was not updated.
 2014-06-05 15:48:18 -07:00
Clément Brisset
02452819c3 Merge pull request #2988 from AndrewMeadows/ragdoll 
RagDoll Part 1: basic data structure
 2014-06-05 14:44:36 -07:00
Andrzej Kapolka
8abcacd433 Merge pull request #2989 from ey6es/master 
That'll teach me not to wait for the PR build.
 2014-06-05 12:28:47 -07:00
Andrzej Kapolka
8d908a12a3 Fix build. 2014-06-05 12:28:02 -07:00
Andrzej Kapolka
c2d4113768 Merge pull request #2986 from Barnold1953/OculusOverlay 
Hemisphere Oculus Overlay
 2014-06-05 12:19:23 -07:00
barnold1953
f0f7d0c55f Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2014-06-05 12:17:09 -07:00
Andrew Meadows
4eb801b8e9 merge upstream/master into andrew/ragdoll 2014-06-05 11:32:18 -07:00
Andrew Meadows
1b2cd2e144 adding RagDoll scaffold 2014-06-05 11:07:35 -07:00
barnold1953
4e699c0f84 Fixed coding standard and build error 2014-06-05 10:34:06 -07:00
Philip Rosedale
3cc67f5229 Merge pull request #2984 from ZappoMan/octreeWireformatImprovements 
Octree wireformat improvements checkpoint
 2014-06-04 21:58:08 -07:00