Commit graph

13899 commits

Author SHA1 Message Date
Stephen Birarda
935c0cc137 handle AudioInjectorManager cleanup in Application 2015-11-17 16:39:23 -08:00
Stephen Birarda
ab5c8e072f handle blocked AudioInjectorManager for restart 2015-11-17 16:31:18 -08:00
Stephen Birarda
d764ff2e87 remove static variables in AudioInjector.cpp 2015-11-17 15:12:04 -08:00
Stephen Birarda
7da6ec46c4 more handling of various AudioInjector states 2015-11-17 14:20:59 -08:00
Stephen Birarda
4fa934dccf make sure AudioInjectorManager process is on AI thread 2015-11-16 18:54:16 -08:00
Stephen Birarda
80115d38e9 tweak the AudioInjectorManager for injector threading 2015-11-16 18:53:09 -08:00
Stephen Birarda
aa77c4894c add an AudioInjectorManager for more efficient threading 2015-11-16 16:04:10 -08:00
Stephen Birarda
52716b8f95 emit a ready signal if Sound has downloaded 2015-11-16 10:55:25 -08:00
Stephen Birarda
429a4d51d5 Merge pull request #6375 from Atlante45/resize
Fix models resizing
2015-11-13 10:23:05 -08:00
Brad Hefta-Gaub
ecaa50c0ff fix for infinite loop in erase entities special packet 2015-11-12 18:25:18 -08:00
Brad Hefta-Gaub
da651ac475 fix mac compiler error 2015-11-12 13:47:27 -08:00
Brad Hefta-Gaub
8bfb368a61 fix mac compiler error 2015-11-12 13:32:43 -08:00
Brad Hefta-Gaub
33110eda30 fix mac compiler error 2015-11-12 13:25:50 -08:00
Brad Hefta-Gaub
14a6e1fb6b fix mac compiler error 2015-11-12 13:24:25 -08:00
Brad Hefta-Gaub
66a2b38f50 switch various status to use thread safe atomics 2015-11-12 13:09:51 -08:00
samcake
da8270d50b Merge pull request #6377 from jherico/rec3
Cleaning up clip and transform
2015-11-12 11:50:10 -08:00
Brad Davis
ee1545f649 Cleaning up clip and transform 2015-11-12 11:48:47 -08:00
samcake
319f9fc30e Merge pull request #6376 from ZappoMan/fixModelCrash
fix crash in Model::deleteGeometry when _rig is not initialized
2015-11-12 09:37:30 -08:00
James B. Pollack
39f44115be Merge pull request #6373 from Atlante45/rotationBetween
Rotation between
2015-11-12 09:25:56 -08:00
Brad Hefta-Gaub
eefe26d96a fix crash in Model::deleteGeometry when _rig is not initialized 2015-11-12 09:24:49 -08:00
Brad Davis
f521be10fe Avatar recording work in progress 2015-11-12 00:33:38 -08:00
Atlante45
954391ae3e Fix models resizing
When models are MUCH bigger one one axis than the others
and we modify the scale only of one of those small axis,
it wouldn't propagate because the change was relatively
too small conpared to the size of the model
2015-11-11 18:33:26 -08:00
Atlante45
118d05d824 Use a clearer function 2015-11-11 17:24:50 -08:00
Atlante45
e4897a8de7 Use new constants 2015-11-11 15:58:27 -08:00
Atlante45
115b63a117 Simplify rotationBetween 2015-11-11 15:54:48 -08:00
Brad Hefta-Gaub
4fddc86851 tweaks to click 2015-11-11 15:26:16 -08:00
Brad Hefta-Gaub
eb598bd3d3 Merge branch 'master' of https://github.com/highfidelity/hifi into rightClickMenu 2015-11-11 15:15:34 -08:00
Brad Hefta-Gaub
2f903a9513 CR feedback and some cleanup 2015-11-11 14:21:14 -08:00
Brad Hefta-Gaub
bdfe304f7a remove some logging 2015-11-11 14:08:15 -08:00
Brad Hefta-Gaub
040bae6014 more debugging 2015-11-11 12:31:50 -08:00
Brad Hefta-Gaub
5576cf188e Merge branch 'master' of https://github.com/highfidelity/hifi into moreEraseHistory 2015-11-11 12:14:03 -08:00
Brad Hefta-Gaub
866116d285 more debugging 2015-11-11 12:13:47 -08:00
Brad Hefta-Gaub
fc3602d780 change context menu to RightPrimaryThumb, add filter to mouse click to not count slow clicks 2015-11-10 16:46:58 -08:00
Brad Hefta-Gaub
3316b63bf6 add a fixme comment 2015-11-10 15:46:53 -08:00
Brad Hefta-Gaub
006a1d60c8 keep some additional erase entities history and send to viewers 2015-11-10 15:31:51 -08:00
Eric Levin
a2abc11df1 Merge pull request #6351 from huffman/script-path-resolution
Update script engine path resolution behavior to behave consistently
2015-11-10 14:10:42 -08:00
samcake
d3d5d3a19e Removing useless code 2015-11-10 12:02:20 -08:00
samcake
2cf2257783 Fix warning 2015-11-10 09:20:43 -08:00
samcake
d1df6854ac Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-10 09:16:28 -08:00
Brad Hefta-Gaub
0ea901fd72 fix various warnings 2015-11-10 08:34:58 -08:00
Sam Gateau
06a87012ad Removing the setJointTranslations which is not helping... 2015-11-09 23:38:51 -08:00
Sam Gateau
b47c5dbff2 Cleaning the code to remove the old rec format and the use of separate joint Rotationns/Translations arrays 2015-11-09 23:12:04 -08:00
samcake
77e21b7190 Trying to fix the animation recording and playback, but still not good 2015-11-09 18:18:30 -08:00
Brad Hefta-Gaub
021a6e689d added some asserts to test future mistakes that would cause render item leaks 2015-11-09 17:09:17 -08:00
Brad Hefta-Gaub
e47b049200 fix render item leak on Model::reset() 2015-11-09 16:41:40 -08:00
U-GAPOS\andrew
390310f822 swap the order of checks 2015-11-09 14:15:09 -08:00
U-GAPOS\andrew
c07b97920e fix for avatars created with blender 2015-11-09 14:11:45 -08:00
U-GAPOS\andrew
2716a9f2b4 fix IK for feet targets 2015-11-09 13:11:03 -08:00
samcake
5bc827981d Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-09 12:32:10 -08:00
Eric Levin
7700e67734 Merge pull request #6326 from imgntn/entity_params
Add Ability to Pass Parameters When Calling Methods on Entities
2015-11-09 12:17:58 -08:00