TonyPeng
7e23ca1738
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_new_avatar_light
2014-07-16 09:46:15 -07:00
TonyPeng
317a08fc60
Draw local light stats.
2014-07-16 09:44:05 -07:00
Andrzej Kapolka
3be00b972d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-15 18:11:54 -07:00
TonyPeng
90d56bc108
Use the number of local lights to update new avatars instead of checking hashes.
2014-07-15 16:10:13 -07:00
Brad Hefta-Gaub
fc28279afe
Merge pull request #3170 from wdings23/master
...
Allow script to set light properties for all the avatars
2014-07-15 14:07:26 -07:00
Andrzej Kapolka
1f5922fa67
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-15 11:55:47 -07:00
ZappoMan
0068428c7c
fixed some warnings
2014-07-15 10:41:29 -07:00
TonyPeng
4cea4d2838
Resolve upstrem conflict
2014-07-15 10:33:22 -07:00
Andrzej Kapolka
60e8c12d4b
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-15 09:25:36 -07:00
TonyPeng
28854363d4
Coding standard
2014-07-15 09:20:33 -07:00
Brad Hefta-Gaub
dcd3110266
Merge pull request #3166 from wangyix/quick_audio_PR
...
Made audio timegap stats more readable with varying units; Fixed AudioMixer NaN error on WIndows;
2014-07-15 08:28:48 -07:00
wangyix
1047ec7c87
merge with upstream
2014-07-14 16:25:26 -07:00
Andrzej Kapolka
e32bab5b04
Beginnings of some metavoxel scriptability, to create some test landscapes.
2014-07-14 14:32:55 -07:00
Leonardo Murillo
6bf06989db
Adding place/user go to logging
2014-07-14 15:24:47 -06:00
TonyPeng
1aa20dff60
Expose light directions and colors for the avatar list in AvatarManager. Light parameter changes within the script will effect all the avatars currently in AvatarManager.
2014-07-14 13:59:57 -07:00
AndrewMeadows
64ff5f6ecf
Merge pull request #3165 from AlericInglewood/master
...
Compiler warnings fixes.
2014-07-14 11:10:48 -07:00
Philip Rosedale
4b7ba08932
code review fix
2014-07-14 08:53:10 -07:00
Philip Rosedale
2d4194cae5
fixes per review, clap animation requires double-tap to start
2014-07-13 23:33:02 -07:00
Aleric Inglewood
bd212c26d0
Fix initializer list order (avoiding compiler warning).
...
This patch fixes the compiler warning:
In file included from /opt/highfidelity/hifi/hifi/interface/src/Application.h:45:0,
from /opt/highfidelity/hifi/hifi/interface/src/Audio.cpp:42:
/opt/highfidelity/hifi/hifi/interface/src/Audio.h: In constructor ‘Audio::Audio(int16_t, QObject*)’:
/opt/highfidelity/hifi/hifi/interface/src/Audio.h:268:30: warning: ‘Audio::_interframeTimeGapStats’ will be initialized after [-Wreorder]
/opt/highfidelity/hifi/hifi/interface/src/Audio.h:259:9: warning: ‘int Audio::_starveCount’ [-Wreorder]
/opt/highfidelity/hifi/hifi/interface/src/Audio.cpp:63:1: warning: when initialized here [-Wreorder]
by fixing the initializer list of class Audio.
Note that I omitted _audioMixerAvatarStreamAudioStats() - which is a default constructor
that is called anyway (it's the default!) and therefore doesn't belong in the initializer list.
2014-07-13 17:10:39 +02:00
Philip Rosedale
b0e44be1c0
merge fix
2014-07-11 20:26:58 -05:00
Philip Rosedale
d493b92d7b
tweaked defaults
2014-07-11 20:23:59 -05:00
Philip Rosedale
0b3e41a541
remove wind from hair, fix gravity
2014-07-11 19:58:13 -05:00
Philip Rosedale
b86890033c
Moved hair to separate class
2014-07-11 19:35:17 -05:00
Andrew Meadows
9b7fc9de95
merge upstream/master into andrew/bispinor
2014-07-11 16:09:22 -07:00
Andrew Meadows
d832f5bec8
fix menu config of visible stats
2014-07-11 16:08: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
Andrzej Kapolka
21a1f4772c
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-11 12:42:25 -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
Andrzej Kapolka
7af4e4e261
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-11 11:25:15 -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
22bcb7d7e7
Billboard overlays disply grey square while image is loading
2014-07-11 11:22:06 -07:00
Atlante45
bd7b17a787
Added subimage to Billboards overlays
2014-07-11 10:50:11 -07:00
wangyix
c5e0da0477
Merge remote-tracking branch 'upstream/master' into quick_audio_PR
2014-07-11 10:18:49 -07:00
Andrzej Kapolka
af3af15084
Comment, formatting fix.
2014-07-10 18:11:51 -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
TonyPeng
df7f3073dc
2 local lights as default
2014-07-10 17:18:49 -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
barnold1953
4bfd393d02
Proper scaling for oculus UI using avatar scale
2014-07-10 16:42:00 -07:00
Andrzej Kapolka
d858e20af2
For now, tie the metavoxel LOD threshold to the avatar LOD parameter.
2014-07-10 16:02:53 -07:00
Andrzej Kapolka
817b50c7b8
Show upload/download stats for all reliable messages, not just reliable delta
...
downloads.
2014-07-10 15:34:45 -07:00
Andrzej Kapolka
e55a0fbc9c
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-10 14:39:42 -07:00
