Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 20:54:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14068 commits 71 branches 56 tags 1.2 GiB
Commit graph

14068 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
6d77d438ab Merge pull request #3057 from AndrewMeadows/ragdoll 
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
 2014-06-24 15:47:18 -07:00
AndrewMeadows
da45e8a5f8 Merge pull request #3058 from ZappoMan/octreeTests 
added some model tree performance tests
 2014-06-24 14:27:29 -07:00
Brad Hefta-Gaub
c38790db72 Merge pull request #3068 from ZappoMan/serverSideAudioMixerStats 
make default ring buffer much larger
 2014-06-24 12:19:35 -07:00
ZappoMan
cdbda02765 make default ring buffer much larger 2014-06-24 12:09:58 -07:00
Stephen Birarda
c46453c97f Merge pull request #3067 from ZappoMan/serverSideAudioMixerStats 
adding more stats & allow config setting to enable/disable dynamic jitter buffers
 2014-06-24 10:49:35 -07:00
ZappoMan
1d390faad8 add support for commandline/config value for dynamic jitter buffers 2014-06-24 10:29:38 -07:00
ZappoMan
5c188ea81e adding more stats 2014-06-24 09:41:29 -07:00
Brad Hefta-Gaub
2089dec38a Merge pull request #3066 from ctrlaltdavid/fix_default_audio 
Fix default audio devices on Windows
 2014-06-24 09:33:04 -07:00
David Rowe
c40c5d78c8 Fix default audio devices on Windows 
Windows 8 provides the full friendly device name, not just the first 31 characters.
 2014-06-24 08:50:39 -07:00
Brad Hefta-Gaub
fc88b1f710 Merge pull request #3065 from ZappoMan/serverSideAudioMixerStats 
remove resizing of jitter buffers for now, only ask for 1 frame
 2014-06-23 18:54:18 -07:00
ZappoMan
fda60cc8d5 remove resizing of jitter buffers for now, only ask for 1 frame 2014-06-23 18:45:24 -07:00
Brad Hefta-Gaub
c105bc6c39 Merge pull request #3064 from ZappoMan/serverSideAudioMixerStats 
max desired must be one less than the max frames in our ringbuffer
 2014-06-23 18:11:37 -07:00
ZappoMan
355ab2cb95 max desired must be one less than the max frames in our ringbuffer 2014-06-23 17:58:55 -07:00
Brad Hefta-Gaub
51dfb33985 Merge pull request #3063 from ZappoMan/serverSideAudioMixerStats 
add more stats
 2014-06-23 17:32:50 -07:00
ZappoMan
6434c0a2a4 add more stats 2014-06-23 17:28:39 -07:00
Brad Hefta-Gaub
672808ef86 Merge pull request #3062 from ZappoMan/serverSideAudioMixerStats 
ignore the numSilentSamples from client, always assume one frame
 2014-06-23 16:56:58 -07:00
ZappoMan
77f262561c typo 2014-06-23 16:47:10 -07:00
ZappoMan
8a633743b3 ignore the numSilentSamples from client, always assume one frame 2014-06-23 16:40:38 -07:00
Brad Hefta-Gaub
e374ccb0fa Merge pull request #3061 from ZappoMan/serverSideAudioMixerStats 
use node uuid in stats
 2014-06-23 16:17:51 -07:00
ZappoMan
4becb66e2a use node uuid in stats 2014-06-23 16:10:51 -07:00
Brad Hefta-Gaub
13030d64e6 Merge pull request #3060 from ZappoMan/serverSideAudioMixerStats 
break up audio mixer stats across multiple packets
 2014-06-23 15:56:27 -07:00
ZappoMan
b2c982976e break up audio mixer stats across multiple packets 2014-06-23 15:46:58 -07:00
Stephen Birarda
5a8bbc7a0e Merge pull request #3059 from ZappoMan/serverSideAudioMixerStats 
added server side audio mixer jitter stats
 2014-06-23 15:29:00 -07:00
ZappoMan
076bc11545 added server side audio mixer jitter stats 2014-06-23 15:19:13 -07:00
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
ZappoMan
52b61ebab8 added addModel() performance test 2014-06-23 14:48:12 -07:00
ZappoMan
48e779cf8e added some performance tests 2014-06-23 14:08:47 -07:00
Andrew Meadows
d892a9c00f fixed warning about possible uninitialized variable. 2014-06-23 14:07:31 -07:00
Andrew Meadows
df740dd82a Fix bad static const inside class. 2014-06-23 14:07:09 -07:00
Andrew Meadows
e2204ab78e friend foo --> friend class foo 2014-06-23 13:59:44 -07:00
Andrew Meadows
415dfd98aa remove one line of cuft 2014-06-23 13:40:50 -07:00
Stephen Birarda
ed5c05a61b fix rounding of credit balance in application title 2014-06-23 13:25:32 -07:00
Andrew Meadows
b5aca45ab6 smaller timescale for slaving shapes to skeleton 2014-06-23 12:59:38 -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
Andrew Meadows
7f4ffb363b merge upstream/master into andrew/ragdoll 2014-06-23 12:33:21 -07:00
Andrew Meadows
3e0673418f more complete physics iteration for stability 2014-06-23 12:32:23 -07:00
Andrew Meadows
add556719c fixed perf stats on phys simulation 2014-06-23 12:31:36 -07:00
Andrew Meadows
9713e3d513 remove some unused var warnings in Release build 2014-06-23 12:30:53 -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
Andrew Meadows
8ad2a679c4 move code to SkeletonModel::stepRagdollForward() 2014-06-23 11:16:18 -07:00
Andrew Meadows
9a2197a23c draw skeleton shapes at at correct positions 2014-06-23 10:55:34 -07:00
wangyix
e5d7d471e3 removed debug code 2014-06-23 10:55:30 -07:00
Andrew Meadows
5e4d757e4e merge upstream/master into andrew/ragdoll 2014-06-23 10:43:40 -07:00
Andrew Meadows
b50bf09c93 findPlaneCollisions() works in theory, not used 2014-06-23 10:39:50 -07:00
Andrew Meadows
8986be5f1c remove old collideAgaintsOurself() code 2014-06-23 10:36:31 -07:00
wangyix
7196814ec3 added debug prints to look at injected ring buffers 2014-06-23 10:22:16 -07:00
Andrew Meadows
eba03ddb8a re-enable some basic avatar collisions 2014-06-23 10:05:51 -07:00
Andrew Meadows
8b24e9cd67 Update SkeletonModel::_boundingShape position 2014-06-23 09:39:14 -07:00