Philip Rosedale
|
70a26ff895
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-03-25 11:51:20 -07:00 |
|
Philip Rosedale
|
925f8241e5
|
adding joint animation
|
2014-03-25 11:48:46 -07:00 |
|
Philip Rosedale
|
ec3a83820e
|
Merge pull request #2488 from birarda/avatar-scaling
avatar-mixer tuning for identity and billboard packets
|
2014-03-25 11:46:25 -07:00 |
|
Stephen Birarda
|
ff788a340b
|
add stat for average billboard and identity packets per frame
|
2014-03-25 11:38:00 -07:00 |
|
Stephen Birarda
|
8a796be785
|
only fade avatars if they have ever been initialized
|
2014-03-25 11:10:28 -07:00 |
|
Stephen Birarda
|
786d9ce404
|
force sending of identity and billboard packets changed in last frame
|
2014-03-25 10:56:06 -07:00 |
|
AndrewMeadows
|
5551396a7b
|
Merge pull request #2480 from ZappoMan/scripting_improvements
Scripting improvements
|
2014-03-25 10:49:14 -07:00 |
|
Stephen Birarda
|
f763859fd0
|
don't attempt to render avatars until they are initialized
|
2014-03-25 10:44:52 -07:00 |
|
Stephen Birarda
|
e6b83ac52d
|
send mesh and billboard on receiver's first connect
|
2014-03-25 10:34:38 -07:00 |
|
Philip Rosedale
|
33d461b023
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-03-25 10:33:42 -07:00 |
|
Brad Hefta-Gaub
|
7dce4fdf19
|
Merge pull request #2484 from AndrewMeadows/sanity-checking
Sanity check AvatarData packets as they are unpacked
|
2014-03-25 10:26:37 -07:00 |
|
Brad Hefta-Gaub
|
acf4b2d172
|
Merge pull request #2477 from ey6es/master
Adjust avatar LOD more aggressively: raise detail slowly when above our ...
|
2014-03-25 10:26:15 -07:00 |
|
Andrew Meadows
|
c0177e80a7
|
use glm::isnan() everywhere for portable code
|
2014-03-25 09:56:15 -07:00 |
|
Andrew Meadows
|
17d878bc94
|
sanitiy checking when unpacking AvatarData update
|
2014-03-25 09:55:43 -07:00 |
|
Stephen Birarda
|
e8b9594758
|
spread out billboard and identity fallbacks
|
2014-03-25 09:39:43 -07:00 |
|
ZappoMan
|
d8bf5be68b
|
fix audio position in editVoxles.js
|
2014-03-25 08:43:56 -07:00 |
|
ZappoMan
|
7b50e6d4ef
|
added hydraMove.js to default scripts
|
2014-03-25 01:02:50 -07:00 |
|
ZappoMan
|
14fcbb01a6
|
Merge branch 'master' of https://github.com/worklist/hifi into scripting_improvements
|
2014-03-25 01:01:55 -07:00 |
|
ZappoMan
|
f10d5e23f8
|
set firstRun so it only happens once
|
2014-03-25 00:57:29 -07:00 |
|
Brad Hefta-Gaub
|
24b80fca81
|
Merge pull request #2479 from ZappoMan/defaultscript
add stub of default script
|
2014-03-25 00:46:35 -07:00 |
|
ZappoMan
|
55622d5f23
|
add stub of default script
|
2014-03-25 00:46:07 -07:00 |
|
ZappoMan
|
571ecf0964
|
add first cut at firstrun support
|
2014-03-25 00:45:31 -07:00 |
|
ZappoMan
|
c34b64e296
|
add load script from URL support
|
2014-03-25 00:17:19 -07:00 |
|
ZappoMan
|
a613da8032
|
add Script.include()
|
2014-03-24 21:25:59 -07:00 |
|
Philip Rosedale
|
7f99d3ce26
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-03-24 21:11:00 -07:00 |
|
Andrzej Kapolka
|
7645c26f90
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-03-24 17:49:56 -07:00 |
|
Andrzej Kapolka
|
db05523bc3
|
Merge pull request #2478 from birarda/master
fixes to BUILD instructions and CMakeLists for QT_CMAKE_PREFIX_PATH
|
2014-03-24 17:46:18 -07:00 |
|
Andrzej Kapolka
|
81ae18a3bf
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-03-24 17:25:34 -07:00 |
|
Andrzej Kapolka
|
21728dc604
|
Merge pull request #2474 from ZappoMan/js_prefs
Add a JS example for selecting the input/output audio devices from a menu
|
2014-03-24 17:21:08 -07:00 |
|
Stephen Birarda
|
fcc261cc2b
|
fix BUILD.md instructions and CMakeLists so QT_CMAKE_PREFIX_PATH can be passed
|
2014-03-24 17:15:53 -07:00 |
|
Andrzej Kapolka
|
33aabe4e18
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-03-24 16:59:37 -07:00 |
|
AndrewMeadows
|
961815fe42
|
Merge pull request #2472 from birarda/domain-json-stats
add minimal packet rate stats to all nodes, a little extra to avatar-mixer
|
2014-03-24 16:57:20 -07:00 |
|
Stephen Birarda
|
a90cd7ed31
|
cast numerator to float before divide
|
2014-03-24 16:54:14 -07:00 |
|
Stephen Birarda
|
ce214bc439
|
use the performance tuning ratio in avatar mixer to send less
|
2014-03-24 16:48:23 -07:00 |
|
Andrzej Kapolka
|
47f0af818a
|
Adjust avatar LOD more aggressively: raise detail slowly when above our target
window, lower it in proportion to the ratio between desired and actual rates.
|
2014-03-24 16:45:44 -07:00 |
|
Stephen Birarda
|
4f7a8473fd
|
make stats red when they become stale
|
2014-03-24 16:40:14 -07:00 |
|
Stephen Birarda
|
b01b2a3311
|
use explicit float casts where appropriate
|
2014-03-24 16:35:36 -07:00 |
|
Stephen Birarda
|
364df16a9f
|
pretty up the stats table
|
2014-03-24 16:34:00 -07:00 |
|
ZappoMan
|
547ea047e3
|
cleanup extra debug
|
2014-03-24 16:33:12 -07:00 |
|
ZappoMan
|
03c2ec9376
|
add example of selecting the audio device from a menu
|
2014-03-24 16:28:45 -07:00 |
|
ZappoMan
|
778209ffe4
|
fix bug in Menu.removeMenu() for trees of menus
|
2014-03-24 16:28:07 -07:00 |
|
Stephen Birarda
|
ba338cb7bc
|
at minimum send packet rate stats for ThreadedAssignment subclasses
|
2014-03-24 16:06:25 -07:00 |
|
Stephen Birarda
|
3db8386743
|
suppress trailing sleep ratio debug
|
2014-03-24 15:46:02 -07:00 |
|
Stephen Birarda
|
e7f9acd945
|
add trailing sleep and performance throttling logic to AvatarMixer
|
2014-03-24 15:42:57 -07:00 |
|
Stephen Birarda
|
638e9eae48
|
add some basic stat collection to avatar-mixer
|
2014-03-24 15:38:01 -07:00 |
|
Philip Rosedale
|
763976e723
|
Merge pull request #2468 from ey6es/master
Cull against shadow volume when rendering avatar shadows, don't use textures/fancy shaders when rendering shadow map.
|
2014-03-24 15:30:42 -07:00 |
|
Andrzej Kapolka
|
d3618aa839
|
Yeesh, another translation update.
|
2014-03-24 15:11:14 -07:00 |
|
Andrzej Kapolka
|
7bc0c8eff0
|
Missed a spot.
|
2014-03-24 15:07:57 -07:00 |
|
Stephen Birarda
|
8dbe4dfdde
|
collect packet rate stats in NodeList
|
2014-03-24 15:06:53 -07:00 |
|
Andrzej Kapolka
|
f1fd8175d2
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-03-24 14:53:00 -07:00 |
|