Howard Stearns
a820682816
Merge pull request #5901 from hyperlogic/tony/gangsta-lean
...
Threshold based walking/leaning while in HMD.
2015-09-25 15:51:39 -07:00
Anthony J. Thibault
402573dbf1
Remove unused local
2015-09-25 14:11:33 -07:00
Thijs Wenker
9ed1397a63
Merge branch 'master' of https://github.com/worklist/hifi into 20672
2015-09-25 21:09:38 +02:00
Anthony J. Thibault
fc9b270951
Merge branch 'master' into tony/gangsta-lean
2015-09-25 11:36:58 -07:00
Andrew Meadows
4f0bd08b62
Merge pull request #5900 from ZappoMan/batchOptimizations
...
more work on batch optimzation
2015-09-25 09:00:38 -07:00
Anthony J. Thibault
474c847ef1
Updated constants and units.
2015-09-24 18:00:59 -07:00
Anthony J. Thibault
20d784ba39
Threshold based walking while in HMD.
...
This is a blend of the previous 'sitting' and 'standing' HMD modes.
Basically, when you move your head within a small range (20cm) your
avatar will lean appropriately, however when you cross that threshold
your body will move underneath you, re-centering your head above the body.
While this occurs the avatar should play the appropriate walking animations.
2015-09-24 17:54:32 -07:00
Brad Hefta-Gaub
85b2322acc
more work on batch optimzation
2015-09-24 17:11:14 -07:00
Howard Stearns
266c69fc70
Disable the old-school Rig::inverseKinematics during reset.
2015-09-24 15:33:52 -07:00
Howard Stearns
426ccabba7
Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe
2015-09-24 14:19:58 -07:00
Andrew Meadows
59da684eb9
make IKTarget::setType() a one-liner
2015-09-24 13:15:03 -07:00
Thijs Wenker
6d4e4af0a5
ability to see Stats in JavaScript + example script which outputs the stats to the console/logviewer
2015-09-24 22:02:22 +02:00
Andrew Meadows
17e3e9394f
allow head translation for 3rd person screenie IK
2015-09-24 12:38:46 -07:00
Brad Hefta-Gaub
2eaeb26b2a
fix GetVersionEx warning
2015-09-24 09:14:51 -07:00
Brad Hefta-Gaub
5e82b9c433
more warning fixes
2015-09-24 08:26:56 -07:00
Brad Hefta-Gaub
d14820d3ef
Merge pull request #5880 from thoys/20668
...
Worklist job #20668 - JS: Add option to listen audio from camera
2015-09-23 20:40:32 -07:00
samcake
46e9c463fc
Merge pull request #5885 from ZappoMan/batchOptimizations
...
Batch optimizations
2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub
9a0e5b9870
address Sam's concerns
2015-09-23 17:37:48 -07:00
ZappoMan
65a079cb53
fix mac build
2015-09-23 16:48:34 -07:00
Anthony J. Thibault
6b47373bcb
Fix for precision error in AnimPose(glm::mat4) constructor.
...
Really the culprit is GLMHelpers extractRotation().
I have a separate unit test that demonstrates the bug.
2015-09-23 15:38:56 -07:00
Brad Hefta-Gaub
ef25876c9a
implement vector caching for gpu::Batch
2015-09-23 14:46:47 -07:00
Anthony J. Thibault
0d7eae2d64
Fix slight translation error when rendering debug animation skeleton.
2015-09-23 11:42:55 -07:00
Anthony J. Thibault
90a551214e
Fix for AnimDebugDraw crash on shutdown.
2015-09-23 11:09:43 -07:00
Anthony J. Thibault
a454584496
Updated default avatar-animation.json
2015-09-23 10:59:52 -07:00
Anthony J. Thibault
a9848cd157
Merge branch 'master' into tony/lean-threshold
2015-09-23 10:54:12 -07:00
Howard Stearns
401f83135a
Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe
2015-09-23 09:15:21 -07:00
Brad Hefta-Gaub
ec9bf0791b
Merge pull request #5875 from ctrlaltdavid/20689
...
Don't run Script Editor scripts from the cache
2015-09-23 08:52:30 -07:00
Brad Hefta-Gaub
8d8035a418
Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarning
...
Conflicts:
libraries/render-utils/src/Model.cpp
libraries/render-utils/src/Model.h
2015-09-22 20:54:25 -07:00
Anthony J. Thibault
9ce43a57f1
Better head IK when in an HMD.
...
Because the current IK system doesn't quite handle what we need
for the head and neck IK, we do it procedurally in the rig, and
manually set both neck and head IK targets.
2015-09-22 19:58:21 -07:00
Anthony J. Thibault
d04f4d4b2b
Added shared DebugDraw singleton.
2015-09-22 19:57:23 -07:00
Howard Stearns
a9460b9b41
Merge pull request #5881 from AndrewMeadows/ik-repairs-004
...
remove underpose attenuation from IK relaxation step
2015-09-22 19:45:40 -07:00
Brad Hefta-Gaub
e99ad75a28
more warnings fixes
2015-09-22 18:01:39 -07:00
Brad Hefta-Gaub
7536fed09a
more warning fixes
2015-09-22 17:22:09 -07:00
Andrew Meadows
2edffaf91a
remove unused variables
2015-09-22 17:20:13 -07:00
David Rowe
eda12fd3af
Don't look straight ahead in fullscreen mirror
2015-09-22 16:15:54 -07:00
Howard Stearns
7bd395a4d4
Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe
2015-09-22 15:06:43 -07:00
Brad Hefta-Gaub
5bcce50b98
Merge pull request #5846 from bob-long/master
...
Display the face blend coefficients and update the value in real time.
2015-09-22 14:56:56 -07:00
Andrew Meadows
3af1329be2
Merge pull request #5825 from thoys/20655
...
CR for Job #20655 - Add ability to close one script from another script
2015-09-22 14:52:39 -07:00
David Rowe
fed5e8e573
Don't run Script Editor scripts from the cache
2015-09-22 11:35:34 -07:00
Howard Stearns
c8960e23ec
Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe
2015-09-22 10:55:26 -07:00
Andrew Meadows
7060befd1c
Merge pull request #5862 from howard-stearns/user-specified-animation-graph
...
user-specified animation graph
2015-09-22 10:48:28 -07:00
Philip Rosedale
c09ac51d75
Merge pull request #5871 from ctrlaltdavid/20688
...
DO NOT MERGE - QA for 20688 - Fix 3rd person HMD view
2015-09-22 10:17:28 -07:00
Thijs Wenker
f38bb77d0a
less calls to QHash
2015-09-22 18:48:46 +02:00
Thijs Wenker
90b89cbb45
Merge branch 'master' of https://github.com/worklist/hifi into 20655
2015-09-22 18:44:25 +02:00
Thijs Wenker
dfb9034b4e
- delete new AudioListenerMode menu on script ending
...
- style fix (function naming)
2015-09-22 15:45:57 +02:00
Thijs Wenker
81932fe1d7
- added MyAvatar.audioListenerModeChanged signal , for registering changes.
...
- updated the developerMenuItems.js script to include AudioListenerMode menu options under Developer > Audio
2015-09-22 15:38:53 +02:00
Thijs Wenker
617f048883
Added JS interface to change audio listening position / orientation in Interface
...
- MyAvatar.audioListenerMode change using: MyAvatar.FROM_HEAD , MyAvatar.FROM_CAMERA , MyAvatar.CUSTOM
- MyAvatar.customListenPosition and MyAvatar.customListenOrientation are for manual listening positions
2015-09-22 13:40:33 +02:00
samcake
4513b64b00
fixing review comments
2015-09-21 22:42:24 -07:00
David Rowe
30dc07b621
Code tidying
2015-09-21 21:22:36 -07:00
David Rowe
0f85c28098
Fix HMD 3rd person view
2015-09-21 21:08:13 -07:00
