Brad Davis
b52dd7b822
Don't use blocking connections on the main thread
2017-06-29 20:45:17 -07:00
anshuman64
b22daa9a6f
Merge pull request #10838 from druiz17/avatar-recording-roomscale
...
Fix loading of incorrect joint data for the avatar recording
2017-06-29 12:24:37 -07:00
utkarshgautamnyu
7353014968
Merge pull request #10857 from highfidelity/agent_bug
...
Update DomainMetadata.cpp
2017-06-29 11:30:43 -07:00
utkarshgautamnyu
5f123018a4
Update DomainMetadata.cpp
2017-06-29 10:38:33 -07:00
Seth Alves
c4667aa1a7
Merge pull request #10839 from vladest/file_dialog_crash_qt59
...
File dialog crash qt59
2017-06-29 10:34:26 -07:00
Chris Collins
3a096381ce
Merge pull request #10851 from Atlante45/master
...
Stable => Master
2017-06-28 17:28:54 -07:00
Atlante45
fbe1518d1f
Merge branch 'stable' of https://github.com/highfidelity/hifi
2017-06-28 17:26:16 -07:00
Thijs Wenker
e781f97ddc
Merge pull request #10846 from sethalves/fix-server-scripts-more
...
make ResourceManager be owned by DependencyManager
2017-06-28 17:05:30 -07:00
Howard Stearns
3606418a22
Merge pull request #10836 from davidkelly/dk/scriptsSwitchBug
...
minor fix for --scripts switch
2017-06-28 16:11:18 -07:00
Thijs Wenker
d5289d357b
I need to setup my code-editor, spaces.
2017-06-29 01:01:59 +02:00
Thijs Wenker
93679f7c3b
move the ResourceManager init back to where it was, to prevent problems
2017-06-29 00:52:51 +02:00
Seth Alves
794495c197
make ResourceManager be owned by DependencyManager
2017-06-28 14:18:14 -07:00
Andrew Meadows
e9edf01a34
Merge pull request #10831 from kencooke/audio-hrtf-optimize
...
More HRTF optimizations
2017-06-28 14:17:00 -07:00
David Kelly
48de8011b2
cr feedback
2017-06-28 14:15:29 -07:00
Seth Alves
5617860fe4
Merge pull request #10841 from sethalves/fix-server-scripts
...
fix server scripts AC
2017-06-28 11:56:32 -07:00
Ken Cooke
a7a049434d
CR fix: comments instead of ref code
2017-06-28 11:32:41 -07:00
Ken Cooke
0dbb7a71f3
CR fix: comments instead of ref code
2017-06-28 11:32:24 -07:00
Seth Alves
2f3109e4be
move the location of Q_DECLARE_METATYPE(std::function<void()>) so that the server-script AC can see it
2017-06-28 11:00:05 -07:00
Clément Brisset
a2c15c9794
Merge pull request #10770 from jherico/fix_deps_1
...
Cleanup entity dependencies
2017-06-28 10:48:58 -07:00
Ken Cooke
0acbdc7755
CR fix: use predefined PI
2017-06-28 10:18:54 -07:00
Chris Collins
f76ec439be
Merge pull request #10810 from highfidelity/RC-45
...
Beta Release 45 - Includes up to Developer Release 6767
2017-06-28 09:25:15 -07:00
Andrew Meadows
1e23fa7baa
Merge pull request #10822 from hyperlogic/feature/no-toe-wiggle
...
Eliminated toe wiggle while pucks are enabled.
2017-06-28 08:30:27 -07:00
Dante Ruiz
96ae39989e
Merge branch 'master' of github.com:highfidelity/hifi into avatar-recording-roomscale
2017-06-28 16:22:41 +01:00
Dante Ruiz
f6ba264de6
avatar recording fix
2017-06-28 16:22:28 +01:00
Vladyslav Stelmakhovskyi
51b44d9021
Implement same for HMD mode
2017-06-28 16:36:25 +02:00
Vladyslav Stelmakhovskyi
6acf426b1e
Merge branch 'master' into file_dialog_crash_qt59
2017-06-28 16:01:18 +02:00
Vladyslav Stelmakhovskyi
d3282a4ed0
Cleanup
2017-06-28 15:56:35 +02:00
Vladyslav Stelmakhovskyi
0d4328fa51
Merge branch 'master' into file_dialog_crash_qt59
2017-06-28 15:54:53 +02:00
Seth Alves
e4a9674614
Merge pull request #10824 from sethalves/fix-script-sleep-busyloop
...
use QEventLoop and a timer for a less CPU using sleep + event-processing
2017-06-27 21:00:40 -07:00
Brad Davis
28d727153b
PR feedback
2017-06-27 19:22:07 -07:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
David Kelly
9417a176a1
make scripts tree show scripts in directory passed in with --scripts
2017-06-27 18:10:54 -07:00
Brad Davis
827fa98baa
Fix toolbar button activation states
2017-06-27 14:06:19 -07:00
Ken Cooke
a00cd42566
fast compute of HRTF gain
2017-06-27 14:01:28 -07:00
Ken Cooke
ad970c9f5c
fast compute of HRTF azimuth
2017-06-27 13:45:18 -07:00
Vladyslav Stelmakhovskyi
241231c00c
file lists works, but not initial yet
2017-06-27 22:14:58 +02:00
Howard Stearns
20f713a241
Merge pull request #10803 from davidkelly/dk/cacheSwitch
...
new --cache switch for interface
2017-06-27 12:23:23 -07:00
Ken Cooke
dcdf07191b
Fast acosf() using polynomial approximation
2017-06-27 11:29:44 -07:00
Anthony J. Thibault
d4122cff5a
warning fix
2017-06-27 11:29:08 -07:00
David Kelly
01155ba4e3
this handles redirecting ktx_cache, data8, prepared
2017-06-27 08:47:54 -07:00
Seth Alves
f1db0e9e53
Merge pull request #10795 from samcake/brown
...
Adding trace profiling feature Script
2017-06-27 08:25:56 -07:00
Sam Gateau
1fbaac12ec
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-27 15:54:12 +02:00
Seth Alves
722dc46f60
Merge branch 'master' of github.com:highfidelity/hifi into fix-script-sleep-busyloop
2017-06-27 06:44:31 -07:00
Seth Alves
588f1aefd9
Merge pull request #10827 from jherico/fix_toolbar_activation_state
...
Fix toolbar button activation states
2017-06-27 06:44:18 -07:00
Brad Davis
de88a34e97
Fix toolbar button activation states
2017-06-26 23:33:32 -07:00
Anthony J. Thibault
2814c94582
Hips should no longer waggle when feet are active
2017-06-26 17:43:51 -07:00
Seth Alves
4f672f93d2
avoid cast that isn't always available
2017-06-26 16:03:39 -07:00
Seth Alves
bf7da71eaf
use QEventLoop and a timer for a less CPU using sleep + event-processing
2017-06-26 15:07:22 -07:00
Anthony J. Thibault
8602d57a57
Eliminated to wiggle while pucks are enabled.
...
* Added new anim node AnimDefaultPose
* AnimNodeLoader was changed to support the addition of the AnimDefaultPose node
* Edited default avatar-animation.json to insert an AnimOverlay and AnimDefaultPose between the IK node and the rest of the "underPose".
* Rig uses this to fade in default pose for the toes when the hip/feet puck are active.
This effectively deadens the toe animations, without effecting the hand animations.
* Also, the rig was changed to use the LimitCenter solution when the feet are enabled but the hips are not.
2017-06-26 14:09:10 -07:00
David Kelly
564d935065
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/cacheSwitch
2017-06-26 13:32:02 -07:00
