Commit graph

14644 commits

Author SHA1 Message Date
wangyix
a37e24aeb4 updated domain page stats to use formated usec time strings 2014-07-14 11:08:00 -07:00
wangyix
cb5a9bf668 moved some const defs to avoid redefinition 2014-07-14 10:43:02 -07:00
wangyix
a59cef3197 removed debug code in AudioMixer 2014-07-14 10:05:37 -07:00
wangyix
82e9aa8bb7 made stats easier to read; reverted injected stream deletion conditions 2014-07-11 16:08:15 -07:00
wangyix
90c931ea45 removed Audio.cpp initialization list warning; updated Injector removal conditions 2014-07-11 15:07:50 -07:00
wangyix
3a98ea0d56 Merge remote-tracking branch 'upstream/master' into quick_audio_PR 2014-07-11 13:26:14 -07:00
wangyix
d369435240 added dirty fix for NaN _nextOutputTrailingLoudness 2014-07-11 13:25:47 -07:00
Clément Brisset
a5222c7bbd Merge pull request #3161 from ZappoMan/fixeParticleServerCrash
fix crash in particle and model server from attempting to edit items that dont exist in the server
2014-07-11 11:51:53 -07:00
Brad Hefta-Gaub
56a6cb9184 Merge pull request #3160 from Atlante45/sitting_improvments
Sitting improvments
2014-07-11 11:48:42 -07:00
Brad Hefta-Gaub
a94e077a75 Merge pull request #3153 from wangyix/quick_audio_PR
Added more stats to AudioStreamStats; Added template classes RingBufferHistory and MovingMinMaxAvg
2014-07-11 11:42:55 -07:00
Atlante45
7ad90ac7bb When visible is false, don't render billboards/models overlays 2014-07-11 11:29:58 -07:00
ZappoMan
4c3a1d192e fix crash in particle and model server from attempting to edit items that dont exist in the server 2014-07-11 11:29:32 -07:00
Andrzej Kapolka
222869bf53 Merge pull request #3157 from wdings23/master
2 local lights as default
2014-07-11 11:24:48 -07:00
Atlante45
e067a013a0 Made sitting point more consistant 2014-07-11 11:22:38 -07:00
AndrewMeadows
f108f99cc4 Merge pull request #3156 from Barnold1953/OculusSDK
Oculus UI 2.0
2014-07-11 11:22:23 -07:00
Atlante45
22bcb7d7e7 Billboard overlays disply grey square while image is loading 2014-07-11 11:22:06 -07:00
Atlante45
a9ceec4627 Switched sit.js spheres to billboards 2014-07-11 10:50:46 -07:00
Atlante45
bd7b17a787 Added subimage to Billboards overlays 2014-07-11 10:50:11 -07:00
Atlante45
2347bd7eed Sitting position persists between sessions 2014-07-11 10:47:48 -07:00
wangyix
c5e0da0477 Merge remote-tracking branch 'upstream/master' into quick_audio_PR 2014-07-11 10:18:49 -07:00
Brad Hefta-Gaub
dbca97c71b Merge pull request #3158 from wangyix/master
worklist 19807: Fixed bug in OctreeEditPacketSender where there was one outgoing seq number for all nodes.
2014-07-10 18:48:11 -07:00
barnold1953
97165cadcc Removed unneeded variable 2014-07-10 17:34:10 -07:00
barnold1953
1781a2d125 fixed unused variable warning 2014-07-10 17:30:43 -07:00
wangyix
69005242b9 forgot to multiply rates by 100% for domain stats page 2014-07-10 17:18:54 -07:00
TonyPeng
df7f3073dc 2 local lights as default 2014-07-10 17:18:49 -07:00
wangyix
ae1d91b21d improved domain page stats string a bit 2014-07-10 17:11:15 -07:00
wangyix
6c85caaa54 updated Stats for new AudioStreamStats format 2014-07-10 17:03:53 -07:00
barnold1953
4bf74c1b65 Fixed more ubuntu compiler warnings 2014-07-10 16:59:57 -07:00
barnold1953
e658ce8fb9 Fixed ubuntu compiler warning 2014-07-10 16:57:46 -07:00
barnold1953
71634b4c8d Fixed windows compiler warning 2014-07-10 16:56:04 -07:00
wangyix
a7ef7647ed application stats tracking and packing updated; 2014-07-10 16:54:26 -07:00
barnold1953
18c5ebce9e Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-07-10 16:42:36 -07:00
wangyix
25f4f63a1e added window PacketStreamStats to AudioStreamStats 2014-07-10 16:42:23 -07:00
barnold1953
4bfd393d02 Proper scaling for oculus UI using avatar scale 2014-07-10 16:42:00 -07:00
wangyix
ce0101aa2a fixed octreeEditPacketSender seq numbers errors; untested 2014-07-10 14:53:29 -07:00
barnold1953
8bc9214445 Added helper scaling function to Avatar. 2014-07-10 14:37:04 -07:00
barnold1953
fc21f7bbac Removed outdated and incorrect getFingerTipPosition() 2014-07-10 14:21:17 -07:00
wangyix
b4c9e51011 Audio now periodically sends downstream audio stats to audiomixer 2014-07-10 14:14:29 -07:00
AndrewMeadows
afa0f19995 Merge pull request #3152 from AlericInglewood/19854
Code Review for Job #19854
2014-07-10 12:57:05 -07:00
Brad Hefta-Gaub
fb357ae04c Merge pull request #3155 from AndrewMeadows/bispinor
fix bad FPS for crowds of avatars
2014-07-10 12:06:43 -07:00
barnold1953
45421ffb0e Made palm ball and disk properly use avatar scale 2014-07-10 12:06:36 -07:00
wangyix
35419eb939 Merge remote-tracking branch 'upstream/master' into quick_audio_PR 2014-07-10 11:56:35 -07:00
wangyix
a955a17472 changed RingBufferHistory to use qvector instead of raw array 2014-07-10 11:55:19 -07:00
Andrew Meadows
0be70063c5 only set hasNewJointRotations true for valid rotation 2014-07-10 11:39:49 -07:00
Andrew Meadows
ad6a219a60 fix bug: remove redundant _skeleton.simulate() 2014-07-10 11:08:15 -07:00
Clément Brisset
d9acdd6f6e Merge pull request #3154 from AndrewMeadows/bispinor
bug fix: bad logic for early exit in AvatarManager::updateOtherAvatars()
2014-07-10 11:00:48 -07:00
Andrew Meadows
fdd9acb477 bug fix: bad logic for early exit 2014-07-10 10:55:41 -07:00
barnold1953
4d591de762 Applied low velocity filter to palm tip position 2014-07-10 10:52:15 -07:00
wangyix
0b213f9616 streamlined AudioStreamStats packing; added #include <limits> 2014-07-10 10:44:33 -07:00
wangyix
35e4b253c2 added typename keyword in MovingMinMaxAvg.h 2014-07-10 10:35:29 -07:00