Brad Davis
aa03241dd9
Make all load script dialogs QML and respect previous script location
2016-01-28 15:53:04 -08:00
Brad Davis
1324525ecc
Make file dialog compatible with QFileDialog::getOpenFile
2016-01-28 15:50:57 -08:00
Andrew Meadows
7b5c221ceb
Merge pull request #6956 from hyperlogic/tony/velocity-fix
...
MyAvatar: copy body velocity + hmd follow velocity onto avatar
2016-01-27 14:59:46 -08:00
Anthony Thibault
3cdd88e06c
Merge pull request #6951 from ZappoMan/fixAnimationRestart
...
fix for animations stopping after domain restart
2016-01-27 14:31:27 -08:00
Stephen Birarda
f3903022f2
Merge pull request #6958 from huffman/injector-timing-fixes
...
Fix injector looping issues when using audio that isn't a multiple of the sample size
2016-01-27 14:29:30 -08:00
samcake
f4e0352f61
Merge pull request #6930 from zzmp/feat/bubble-render-settings
...
Bubble up render settings from CPP to JS/QML
2016-01-27 14:20:51 -08:00
Ryan Huffman
2ec201b85e
Fix conversion warning
2016-01-27 14:13:23 -08:00
Ryan Huffman
7e5eec55da
Fix non-looped injected audio possibly looping
2016-01-27 13:47:32 -08:00
Ryan Huffman
4de8e7a3c8
Add audio resizing in injector
2016-01-27 13:47:09 -08:00
James B. Pollack
86b2a67f72
Merge pull request #6891 from sethalves/avatar-updates-query-cube
...
Avatar updates query cube
2016-01-27 13:04:03 -08:00
Anthony J. Thibault
c771c925c8
MyAvatar: copy body velocity + hmd follow velocity onto avatar
...
This was inadvertently removed in a previous PR.
https://github.com/highfidelity/hifi/pull/6895
Also, renamed Velocity stat to Speed.
2016-01-27 11:20:32 -08:00
Ryan Huffman
8764eda479
Merge branch 'master' of https://github.com/highfidelity/hifi into injector-timing-fixes
2016-01-27 11:03:52 -08:00
Howard Stearns
0d257b82fa
Merge pull request #6934 from hyperlogic/tony/anim-pre-post-rot-support
...
Avatar Developer Menu: added animation debug options
2016-01-27 10:39:25 -08:00
Ryan Huffman
607f23618d
Fix compiler warning for float->int conversion
2016-01-27 10:36:44 -08:00
Ryan Huffman
a3b2dd2295
Add proper loop handling in injector
2016-01-27 10:14:05 -08:00
Brad Davis
664100b9b1
Attachment dialog
2016-01-26 21:55:40 -08:00
Brad Hefta-Gaub
881a94cd19
Merge pull request #6950 from jherico/qml
...
Small QML fixes
2016-01-26 21:30:46 -08:00
Zach Pomerantz
49c1285837
Add suffix Mode to DebugMode enum to avoid collision
2016-01-26 19:11:59 -08:00
Zach Pomerantz
e770d7b679
Add PhysicsShowOwned back to Menu
2016-01-26 18:56:52 -08:00
Brad Hefta-Gaub
f178fc789c
fix for animations stopping after domain restart
2016-01-26 18:44:34 -08:00
Zach Pomerantz
4354eae129
Fix type, gaussion->gaussian
2016-01-26 18:09:18 -08:00
Anthony Thibault
0fdfb69cae
Merge pull request #6938 from AndrewMeadows/reduce-hip-swing
...
reduce hips swing driven by head orientation when wearing HMD
2016-01-26 17:00:31 -08:00
Brad Davis
940b095013
Removing menu logspam
2016-01-26 16:59:37 -08:00
Brad Davis
5f38c5265c
Fixing potential crash in dialog popups
2016-01-26 16:59:19 -08:00
Brad Davis
cea57a111b
Desktop cleanup
2016-01-26 16:56:33 -08:00
Zach Pomerantz
5009e8702e
Cleanup new render settings
2016-01-26 15:58:50 -08:00
Anthony J. Thibault
33993b8c44
AnimClip: removed unused static member.
2016-01-26 13:34:21 -08:00
samcake
462758ebdd
Merge pull request #6863 from zzmp/feat/boom-shadow
...
Tie shadow frustum to boom offset
2016-01-26 13:33:57 -08:00
Seth Alves
1cc0aa18bb
Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube
2016-01-26 13:31:07 -08:00
Stephen Birarda
b6f478e087
add some debug for audio injector wrap case
2016-01-26 13:10:02 -08:00
Zach Pomerantz
2d0d542765
Fix friend class typedef confusion in gcc
2016-01-26 12:44:56 -08:00
Zach Pomerantz
5b1834d7be
Fix Wreorder for Job::Models
2016-01-26 12:44:37 -08:00
Zach Pomerantz
2da2bc60db
Tie shadow frustum to boom offset
2016-01-26 12:26:16 -08:00
David Rowe
4e9fc02af5
Fix typos noticed in passing
2016-01-27 08:03:14 +13:00
David Rowe
1bfb941057
Fix Quat.equal()
2016-01-27 08:03:13 +13:00
Anthony J. Thibault
69d833a6c0
AnimClip: consistent application of translations
...
Apply animation translation the same way regardless of state of usePreAndPostPoseFromAnimation.
2016-01-26 10:53:21 -08:00
Ryan Huffman
b56668892e
Fix else style
2016-01-26 09:39:11 -08:00
U-GAPOS\andrew
2728290ffb
fix bug in IK and tune head/neck constraints
2016-01-26 09:37:33 -08:00
Ryan Huffman
3160aa3068
Change 0LL to INT64_C(0)
2016-01-26 09:36:52 -08:00
Ryan Huffman
5268ef8ac2
Fix else indentation
2016-01-26 09:36:40 -08:00
Ryan Huffman
0e1742588b
Fix indentation
2016-01-26 09:35:35 -08:00
Ryan Huffman
641a6e9c30
Fix injector handling for when it falls behind
2016-01-26 09:29:02 -08:00
Anthony J. Thibault
bc9621baab
CharacterController: Improve ground support detection
...
In addition to the existing line probe ground check, also check if the bottom sphere of the capsule is contact with any geometry before going into hover mode.
This should prevent going into the fly animation when standing or walking on collision shapes with small gaps between elements.
2016-01-25 21:54:35 -08:00
Anthony J. Thibault
3b062b7a31
AnimClip: special case the translation on the eyes
2016-01-25 18:52:14 -08:00
Anthony J. Thibault
3cee3cbb5a
Avatar Developer Menu: added animation debug options
...
This options are for for developers only and might help debug animation related issues.
* Enable Inverse Kinematics: this can be toggled to disable IK for the avatar.
* Enable Anim Pre and Post Rotations: this option can be used to use FBX pre-rotations from source avatar animations, instead of the current default, which is to use them from the source model.
This only effects FBX files loaded by the animation system, it does not affect changing model orientations via JavaScript.
2016-01-25 18:52:13 -08:00
Anthony J. Thibault
1bdeeeceeb
AnimSkeleton: Added getPre and Post rotation accessors
2016-01-25 18:52:12 -08:00
Brad Hefta-Gaub
1ef01d670d
Revert "Make entity properties be undefined after entity is unloaded"
2016-01-25 18:07:14 -08:00
Zach Pomerantz
15ff106947
Merge pull request #6917 from AndrewMeadows/cf-empty-model-url
...
fix crash for empty modelUrl in ModelEntityItem
2016-01-25 16:09:00 -08:00
Zach Pomerantz
59ac93485e
Propogate configuration changes through tasks
2016-01-25 15:18:13 -08:00
Zach Pomerantz
e73902899b
Explicitly emit dirty for AO/Debug
2016-01-25 15:18:12 -08:00
