Commit graph

56875 commits

Author SHA1 Message Date
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
Menithal
0a0e40e182 Removed Redudant qualification from heade:>r 2017-06-26 23:04:48 +03:00
Ryan Huffman
209a4f33b5 Merge pull request #10784 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 #10793 from druiz17/wide-stance-fix
MoCap wide stance fix for calibration
2017-06-26 10:13:26 -07:00
Ken Cooke
2260c0965c Fix halfDuplex script 2017-06-26 10:05:27 -07:00
Ken Cooke
e5f5d3835c Fix reverbTest script 2017-06-26 10:05:19 -07:00
Chris Collins
19d3646fef Merge pull request #10817 from kencooke/audio-scripting-fix
Audio scripting fixes
2017-06-26 10:01:52 -07:00
Brad Hefta-Gaub
a32f7b2395 Merge pull request #10743 from humbletim/21383
CR 21383: Integrate attachments into doppleganger mirror
2017-06-26 09:54:04 -07:00
Menithal
232382e6d0 21387: Fixed issue with av scaling via script 2017-06-26 19:52:11 +03:00
Brad Hefta-Gaub
6314a8d273 Merge pull request #10782 from vladest/fix_browse_black
Make background with default color. Fix few warnings
2017-06-26 09:50:09 -07:00
Ryan Huffman
5f92c1adc0 Update FindFBX to use newer MSVC_VERSION 2017-06-26 09:40:07 -07:00
Seth Alves
2f2a13ec27 Merge pull request #10799 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
David Rowe
bed0e8ef87 Merge branch 'master' into 21396
# Conflicts:
#	interface/src/avatar/MySkeletonModel.cpp
2017-06-26 12:07:25 +12:00
Brad Davis
b1b26bc8a5 Fix toolbar button mouse click when they were added via the tablet scripting interface 2017-06-25 14:02:30 -07:00
Menithal
359642eb0e Refining and allowing for Avatar Scale to be saved as well 2017-06-25 23:55:47 +03:00
Menithal
d43d8ae846 Removed Old Comments 2017-06-25 22:01:14 +03:00
Menithal
f811971a42 Avatar Bookmarking 2017-06-25 21:57:07 +03:00
Seth Alves
9ae390853c Merge pull request #10814 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 #10815 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 #10813 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 #10730 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 #10811 from ctrlaltdavid/21414
EZRECORD app
2017-06-24 22:46:30 -07:00
anshuman64
d1891069d2 Merge pull request #10763 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
Brad Davis
9c99b9d4c5 Merge pull request #10783 from sethalves/fix-linux-asan
Fix linux asan
2017-06-23 22:43:24 -07:00
David Rowe
48caad1ad2 Add user activity logging 2017-06-24 16:03:55 +12:00
David Rowe
3de1c0a312 Make and save recording 2017-06-24 15:57:57 +12:00
David Rowe
bae04966f9 Add "REC" indicator 2017-06-24 14:35:28 +12:00
David Rowe
6543b74b52 Add beeps 2017-06-24 14:26:01 +12:00
David Rowe
ce32f1704e Start/cancel/finish recording logic 2017-06-24 13:22:00 +12:00
David Rowe
1ddae1c61a Change keyboard shortcut to avoid conflict 2017-06-24 13:19:25 +12:00
David Rowe
ced9473eb3 Icon toggling and keyboard shortcut 2017-06-24 12:49:45 +12:00
Anthony J. Thibault
5da43257f7 Fix for eye direction when no look at targets are present. 2017-06-23 17:34:01 -07:00
David Rowe
b546d977f4 "EZRECORD" app script and button 2017-06-24 12:07:20 +12:00
Anthony J. Thibault
aabbcfd23d code review feedback 2017-06-23 16:47:53 -07:00
David Rowe
384e2cefdb Update make file per master changes 2017-06-24 09:53:58 +12:00
Anthony J. Thibault
b8c638b2b7 warning fixes 2017-06-23 14:36:59 -07:00
Seth Alves
43ba5f3772 Merge pull request #10800 from hyperlogic/bug-fix/eyes-forward
Fix for eye direction when no look at targets are present.
2017-06-23 14:32:21 -07:00
Ryan Huffman
86ed61a15d Push avatar packet version for isReplicated 2017-06-23 14:26:13 -07:00