Commit graph

56691 commits

Author SHA1 Message Date
Dante Ruiz
a749fa19ad made requested changes 2017-06-30 19:14:22 +01:00
Dante Ruiz
f077e40dd3 Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update 2017-06-28 23:51:13 +01:00
Dante Ruiz
a7e4dc1473 clean up code 2017-06-28 23:51:00 +01:00
Andrew Meadows
e9edf01a34 Merge pull request from kencooke/audio-hrtf-optimize
More HRTF optimizations
2017-06-28 14:17:00 -07:00
Seth Alves
5617860fe4 Merge pull request from sethalves/fix-server-scripts
fix server scripts AC
2017-06-28 11:56:32 -07:00
Dante Ruiz
a2df2f8472 added user activity status 2017-06-28 19:52:19 +01: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 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
Andrew Meadows
1e23fa7baa Merge pull request from hyperlogic/feature/no-toe-wiggle
Eliminated toe wiggle while pucks are enabled.
2017-06-28 08:30:27 -07:00
Seth Alves
e4a9674614 Merge pull request 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
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
Howard Stearns
20f713a241 Merge pull request 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 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 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
Ryan Huffman
209a4f33b5 Merge pull request from huffman/feat/pal-replicated
Disable silence + ban buttons for replicated users
2017-06-26 12:50:23 -07:00
Anthony J. Thibault
d7416434bf added tool to visualize avatar-animation.json using graphviz. 2017-06-26 11:38:24 -07:00
Seth Alves
59e72470f3 Merge pull request from druiz17/wide-stance-fix
MoCap wide stance fix for calibration
2017-06-26 10:13:26 -07:00
Chris Collins
19d3646fef Merge pull request from kencooke/audio-scripting-fix
Audio scripting fixes
2017-06-26 10:01:52 -07:00
Brad Hefta-Gaub
a32f7b2395 Merge pull request from humbletim/21383
CR 21383: Integrate attachments into doppleganger mirror
2017-06-26 09:54:04 -07:00
Brad Hefta-Gaub
6314a8d273 Merge pull request from vladest/fix_browse_black
Make background with default color. Fix few warnings
2017-06-26 09:50:09 -07:00
Seth Alves
2f2a13ec27 Merge pull request from jherico/object_parent_warnings
Fix warnings about creating QObjects with parents in different thread
2017-06-26 09:39:29 -07:00
Ken Cooke
fba1a8ddaa Fix halfDuplex script 2017-06-26 08:28:29 -07:00
Ken Cooke
db2b702221 Fix reverbTest script 2017-06-26 08:08:52 -07:00
Sam Gateau
619b357ad0 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-26 10:03:53 +02:00
Seth Alves
9ae390853c Merge pull request from jherico/linux_fix_static_plugins
Fix static plugin initialization on Linux
2017-06-25 08:17:16 -07:00
Seth Alves
a09986a865 Merge pull request from jherico/fix_toolbar_buttons
Fix toolbar button mouse click when they were added via the tablet scripting interface
2017-06-25 08:16:41 -07:00
Brad Davis
6b47981c6e Merge pull request from sethalves/fix-initialization-order-fiasco
fix an initialization order fiasco
2017-06-25 02:57:26 -07:00
Brad Davis
08784ff30c Fix toolbar button mouse click when they were added via the tablet scripting interface 2017-06-25 02:34:58 -07:00
anshuman64
8d5bdd2d84 Merge pull request from hyperlogic/feature/pole-vector
Pole vector support for elbow and knee joints
2017-06-24 23:08:22 -07:00
anshuman64
9d9f4ee64a Merge pull request from ctrlaltdavid/21414
EZRECORD app
2017-06-24 22:46:30 -07:00
anshuman64
d1891069d2 Merge pull request from hyperlogic/feature/puck-attach
Added script that will attach an entity to a vive sensor
2017-06-24 22:35:45 -07:00
Bradley Austin Davis
960017ddd7 Fix static plugin initialization on Linux 2017-06-24 22:22:47 -07:00
Seth Alves
05f0ec267e fix an initialization order fiasco 2017-06-24 18:53:00 -07:00