Andrzej Kapolka
dee5c73fed
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-28 17:17:57 -08:00
Andrzej Kapolka
605c74a979
Merge pull request #2152 from PhilipRosedale/master
...
Correct billboards on bots, audio doesn't double play, 50 voice clips!
2014-02-28 17:17:42 -08:00
Philip Rosedale
3cfada1a1b
avatar billboards match body/head
2014-02-28 17:14:18 -08:00
Andrzej Kapolka
3ae98a81fc
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-28 17:03:15 -08:00
Philip Rosedale
8e30766c68
Merge pull request #2149 from ZappoMan/octree_server_scaling
...
Octree server scaling improvements
2014-02-28 17:03:04 -08:00
Philip Rosedale
3dd51db477
Added timer so one bot doesn’t talk twice at same time
2014-02-28 17:02:40 -08:00
Andrzej Kapolka
7e2e80add9
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-28 16:59:15 -08:00
ZappoMan
ef87fbffac
Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling
...
Conflicts:
libraries/shared/src/ResourceCache.cpp
2014-02-28 16:58:43 -08:00
Andrzej Kapolka
d157428704
When we send data to the avatar mixer, send the tweaked head rotation. Closes
2014-02-28 16:58:22 -08:00
Philip Rosedale
d2a75f7b96
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-28 16:51:31 -08:00
Philip Rosedale
ea770c2bb3
Merge pull request #2150 from birarda/master
...
make Agent the parent of its ScriptEngine
2014-02-28 16:51:18 -08:00
Stephen Birarda
094159eefd
make Agent parent of ScriptEngine so they stay on same thread
2014-02-28 16:47:54 -08:00
Philip Rosedale
299d847036
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-28 16:43:28 -08:00
Philip Rosedale
25beadc031
Merge pull request #2148 from ey6es/master
...
Various improvements to model loading: wait until head and body are loaded before rendering; render old model until new one is loaded when switching; process geometry/textures in worker threads.
2014-02-28 16:42:53 -08:00
Andrzej Kapolka
380b0536b3
Indentation fix.
2014-02-28 16:18:44 -08:00
ZappoMan
c1c41ea2ca
handle some shutdown cases and reduce time of locking in octree server
2014-02-28 16:18:02 -08:00
ZappoMan
d2faca9767
fixed some warnings
2014-02-28 16:17:30 -08:00
Andrzej Kapolka
2f27d8ecd3
Process geometry/textures in worker threads (via QThreadPool). Closes #2137 .
2014-02-28 16:14:02 -08:00
Andrzej Kapolka
0bb3752121
Fixed seg fault, don't attempt to transfer joints between different models
...
(as opposed to different LODs).
2014-02-28 14:29:18 -08:00
Philip Rosedale
e35e06c0de
Added Freddy’s 50 cocktail party clips
2014-02-28 13:59:34 -08:00
Andrzej Kapolka
21a149348b
When switching models, retain old one until new one is loaded. Closes #2146 .
2014-02-28 13:57:25 -08:00
Andrzej Kapolka
2639796402
Wait until both head and body are loaded before rendering. Closes #2145 .
2014-02-28 12:22:10 -08:00
ZappoMan
8d7406461a
Merge branch 'master' of https://github.com/worklist/hifi into octree_server_scaling
...
Conflicts:
assignment-client/src/octree/OctreeServer.cpp
assignment-client/src/octree/OctreeServer.h
2014-02-28 10:54:56 -08:00
Philip Rosedale
f4540536a8
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-28 10:20:12 -08:00
ZappoMan
f6ed9c7b4b
Merge pull request #2142 from ZappoMan/SvoViewer
...
fix windows build/cmake for SvoViewer
2014-02-28 09:11:37 -08:00
ZappoMan
f1dd963505
fix mac build
2014-02-28 09:07:47 -08:00
ZappoMan
c3eb42327c
fix unix build
2014-02-28 09:04:20 -08:00
Brad Hefta-Gaub
51ab7c91a7
fix windows build
2014-02-28 08:54:14 -08:00
Philip Rosedale
1ac8b5737c
merge
2014-02-28 07:32:20 -08:00
ZappoMan
01e69bf8d0
Merge pull request #2141 from ZappoMan/SvoViewer
...
fixed text renderer and frame rate display
2014-02-28 02:16:38 -08:00
ZappoMan
88af57eaeb
Merge pull request #2138 from PhilipRosedale/master
...
Travelling noises removed, audio bargraph removed, improve jitter rebuffer behavior
2014-02-28 02:00:07 -08:00
ZappoMan
4bca28abb2
fixed text renderer and frame rate display
2014-02-28 01:57:24 -08:00
Philip Rosedale
db7044cf7f
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-28 01:11:21 -08:00
Philip Rosedale
38f4207fe5
Merge pull request #2140 from ZappoMan/SvoViewer
...
fix debug output and add command line options
2014-02-28 01:09:11 -08:00
ZappoMan
8afb211ec8
fix debug output and add command line options
2014-02-28 01:07:23 -08:00
Philip Rosedale
fd0b94b236
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-28 00:22:44 -08:00
Philip Rosedale
6355d51958
Merge pull request #2139 from ZappoMan/SvoViewer
...
Svo viewer
2014-02-28 00:22:22 -08:00
ZappoMan
de0f320c02
added copyright to files
2014-02-28 00:14:47 -08:00
ZappoMan
6bc71f899c
removed unused code
2014-02-28 00:09:15 -08:00
ZappoMan
45b5f54bc5
adding Matt's SvoViewer
2014-02-28 00:06:37 -08:00
Philip Rosedale
7a2279bda8
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-27 23:31:45 -08:00
Philip Rosedale
d5e106b30d
collision submenu only under edit (I don’t think you can make same one twice)
2014-02-27 23:29:29 -08:00
Philip Rosedale
bae16e24e8
new audio buffer display text, cleanup drawText()
2014-02-27 23:17:39 -08:00
Philip Rosedale
bde7152246
Merge pull request #2135 from ZappoMan/bugfixes
...
bug fixes
2014-02-27 20:43:48 -08:00
Philip Rosedale
5f8c5d36da
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-27 20:29:35 -08:00
Philip Rosedale
7a73ecf98e
Merge pull request #2136 from ey6es/master
...
Factored out common resource cache functionality, added limits to simultaneous downloading (prioritized by distance). Closes #2122 .
2014-02-27 20:29:00 -08:00
Andrzej Kapolka
73ec568b4b
Further work on request limiting.
2014-02-27 19:28:45 -08:00
Andrzej Kapolka
5d4ed4c85e
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-27 18:14:18 -08:00
Andrzej Kapolka
29f7954d20
Factored out bits common to resource caches, added global limit on number of
...
resources being requested at any one time.
2014-02-27 18:13:40 -08:00
Philip Rosedale
7ce380a333
relocate mute button, audio scope
2014-02-27 18:02:53 -08:00
