Howard Stearns
20f713a241
Merge pull request #10803 from davidkelly/dk/cacheSwitch
...
new --cache switch for interface
2017-06-27 12:23:23 -07:00
Stephen Birarda
af79555e4b
make sure nodeData exists before using it
2017-06-27 12:05:35 -07:00
Stephen Birarda
089a2bb362
do not manage identity data without identity data received
2017-06-27 11:58:03 -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
Sam Gateau
63835d0863
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-27 14:24:55 +02:00
Sam Gateau
76dae279cf
Removing the default case from the renderer
2017-06-27 14:24:34 +02: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
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
7687bdc060
less comments & constant
2017-06-26 17:02:45 +02:00
Sam Gateau
5e05c41980
less comments & constant
2017-06-26 16:56:04 +02:00
Sam Gateau
6ab2dccd38
less comments & constant
2017-06-26 16:52:04 +02:00
Sam Gateau
7cbeabfc29
less comments & constant
2017-06-26 16:49:20 +02:00
Sam Gateau
a2fc44703d
One less constant
2017-06-26 16:45:54 +02:00
Sam Gateau
904f22985c
CLeaning up comments
2017-06-26 16:43:04 +02:00
Sam Gateau
77644e7e9d
Removing commented objects from deferredlighting effect
2017-06-26 14:34:09 +02:00
Olivier Prat
1bb0d51849
Merged with master
2017-06-26 11:55:46 +02:00
Sam Gateau
75e457ce7c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-26 10:05:04 +02: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
