Seth Alves
76923583ee
Interface only sends joint data to avatar-mixer if they have changed enough since the last send
2015-09-01 13:31:34 -07:00
Brad Davis
b7dd47efcb
Merge pull request #5674 from birarda/master
...
cleanup of some warnings
2015-08-27 23:34:43 -07:00
Stephen Birarda
1d6f43e0d0
cleaned up some warnings
2015-08-27 18:26:55 -07:00
Howard Stearns
96c74ebbd5
Enable Rig Animations is now a developer menu item (rather than requiring javascript to set). Also turning it off resets you to bind pose and deliberately throws away old animations.
...
Default animations are the new ones for our standard T-pose. (Had been for the double-A pose fightbot.)
Rig state machine now does "backup", and doesn't apply strafe while turning.
2015-08-27 12:25:40 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Howard Stearns
b579b996c3
There was a hidden (and inappropriate) dependency on face model loading.
2015-08-21 15:07:39 -07:00
Howard Stearns
642e569033
Uncomment code that was commented out to simplify debugging.
2015-08-20 17:38:49 -07:00
Howard Stearns
ea02583875
Cleanup.
2015-08-20 17:33:10 -07:00
Howard Stearns
05f4145acb
Checkpoint. Working?
2015-08-20 16:28:40 -07:00
Howard Stearns
f26849c7e1
Proper HMD scaling.
2015-08-20 12:34:50 -07:00
Howard Stearns
0f6c0a3117
Merge branch 'master' of https://github.com/highfidelity/hifi into recapitate
2015-08-13 15:56:13 -07:00
Howard Stearns
2756a00638
Get default avatar url from resources.
2015-08-13 14:23:34 -07:00
Howard Stearns
4dae01a69c
Provide a consistent avatar default for the empty string.
2015-08-13 12:54:16 -07:00
Howard Stearns
62941c0914
Remove dead code.
2015-08-13 12:39:30 -07:00
David Rowe
6a0a08eafb
Consolidate identical code paths
2015-08-12 15:25:34 -07:00
David Rowe
8f376247f0
Fix calculation of corrected look-at position in HMD view
2015-08-11 20:25:02 -07:00
David Rowe
0f56285283
Fix HMD look-at positions and lines
2015-08-11 18:54:55 -07:00
David Rowe
3e8d0ad712
Fix to use new HMD methods
2015-08-11 13:40:08 -07:00
David Rowe
e6473fc8b9
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.h
tests/ui/src/main.cpp
2015-08-11 12:34:28 -07:00
David Rowe
b54c2526c1
Fix rendering own look-at vectors in HMD mode
...
Vectors now originate at user's physical eyeballs rather than at user
avatar's eye separation.
2015-08-07 16:13:25 -07:00
David Rowe
b70c1a4960
Merge branch 'master' into 20639
2015-08-07 12:33:13 -07:00
David Rowe
e37fd956ed
Fix look-at target position getting stuck when avatar moves out of range
2015-08-06 22:51:25 -07:00
David Rowe
551c00dc23
Fix look-at position calculation when in HMD display
...
Calculate look-at target from camera position and orientation.
Render own look-at vectors from camera eye positions.
Draw other avatar's look-at vectors from their eyeballs.
With and without eye trackers.
2015-08-06 16:41:06 -07:00
Sam Gondelman
54f64b62eb
Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins
2015-08-06 14:45:26 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
David Rowe
d7b42e264e
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-08-05 16:49:06 -07:00
Atlante45
3dc8bd47ae
Fix warning and remove unused headers
2015-08-05 16:46:44 -07:00
David Rowe
e8eac7db34
Render look-at vectors and target in first person view
2015-08-05 13:40:57 -07:00
Sam Gondelman
113c4ea28b
exposing palm velocity and angular velocity to js
2015-08-05 12:17:15 -07:00
Howard Stearns
731bcba956
Merge branch 'master' of https://github.com/highfidelity/hifi into smooth-faded-animations
2015-08-04 17:27:23 -07:00
Howard Stearns
61198a658c
Smooth fading of animations in and out.
...
Also, turn on the secret rig animations from Javascript with MyAvatar.setEnableRigAnimations(true). (persists)
2015-08-04 17:04:15 -07:00
Andrew Meadows
661a916ebd
merge rig into cleanup (removal of legacy shapes)
...
Conflicts:
interface/src/avatar/Avatar.h
tests/physics/src/ShapeColliderTests.cpp
tests/physics/src/ShapeColliderTests.h
2015-07-31 13:40:51 -07:00
Brad Davis
f7a2513f26
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/MyAvatar.h
tests/ui/src/main.cpp
2015-07-30 12:55:22 -07:00
Howard Stearns
4e7d191fb1
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 18:53:38 -07:00
Howard Stearns
838711e526
Remove avatar->shift hips for idle animations.
...
See https://app.asana.com/0/32622044445063/43127903156601
2015-07-29 15:27:50 -07:00
Howard Stearns
a9f76324b5
Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig2
2015-07-29 10:49:27 -07:00
Howard Stearns
68aec1fd36
Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig
2015-07-29 09:12:44 -07:00
Howard Stearns
327ecfe62c
Be less noisy.
2015-07-29 09:11:58 -07:00
Andrew Meadows
2c66af67e9
Merge howard/rig into andrew/caesium
2015-07-29 09:04:32 -07:00
Anthony J. Thibault
ce7e385900
Updated comment
2015-07-28 18:03:03 -07:00
Anthony J. Thibault
b06485c266
Remove cauterize code from Rig and move it back into Model.
...
* cauterize code is used as at render time and is not dependent on
the jointStates.
* MyAvatar now initialize the bone set used for cauterization and
makes the decision to perform cauterization or not in preRender.
2015-07-28 17:45:33 -07:00
Seth Alves
6e5aca6da4
merge from upstream
2015-07-27 16:52:36 -07:00
Seth Alves
5ae15d46b4
add some javascript callable stuff back to MyAvatar
2015-07-27 16:42:54 -07:00
Andrew Meadows
e527f49d65
removing interface dependency on ShapeCollider
2015-07-27 15:30:10 -07:00
Howard Stearns
ef52c0703f
Merge pull request #8 from AndrewMeadows/cadmium
...
remove unused legacy Shapes from Model and friends
2015-07-27 13:20:41 -07:00
Howard Stearns
8196770ed3
Wiring, including avatar position/velocity/orientation data, and an enableRig setting so that we don't break stuff unless turned on.
2015-07-27 12:58:43 -07:00
Andrew Meadows
81831975b5
remove legacy CapsuleShape from SkeletonModel
2015-07-27 12:27:17 -07:00
Andrew Meadows
73ac941230
remove unused legacy Shapes from Model and friends
2015-07-27 11:15:33 -07:00
Howard Stearns
1ec0518d05
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-27 09:20:30 -07:00
Seth Alves
81375e47e0
remove methods from MyAvatar: setJointRotations setJointData clearJointData clearJointsData
2015-07-27 09:07:26 -07:00
