Anthony J. Thibault
46b3a7fd23
Improved default avatar.json state machine.
...
Now triggers 7 states.
Idle, WalkFwd, WalkBwd, StrafeLeft, StrafeRight, TurnLeft & TurnRight.
As well as variable speed walking to match current velocity.
2015-09-02 17:28:06 -07:00
Anthony J. Thibault
99586f259c
Renamed bindTransformIsValid to bindTransformFoundInCluster
2015-09-02 13:44:34 -07:00
Anthony J. Thibault
91fbbf7d4e
Updated copyright boiler plate.
2015-09-02 13:35:26 -07:00
Anthony J. Thibault
df26f18222
Fix for compilation errors on linux
2015-09-02 13:29:29 -07:00
Anthony J. Thibault
fea030b9a0
Compile and warning fixes for MacOSX.
2015-09-02 12:18:17 -07:00
Anthony J. Thibault
1ae22268ac
Added comment to AnimStateMachine header.
2015-09-02 11:04:52 -07:00
Anthony J. Thibault
4a749a0403
Updated MyAvatar to use animGraph from gist instead of local host.
2015-09-02 10:41:04 -07:00
Anthony J. Thibault
d13a188dde
Compile fixes and added test case to verify onDone and onLoop triggers
2015-09-02 10:31:45 -07:00
Anthony J. Thibault
d151474446
Merge branch 'master' into ajt/new-anim-system
2015-09-02 10:00:36 -07:00
Andrew Meadows
b7d892cfcd
Merge pull request #5691 from ctrlaltdavid/display-names-in-front
...
Only render display names if in front of camera
2015-09-01 19:59:06 -07:00
Andrew Meadows
dd2f94bc88
Merge pull request #5696 from birarda/sixense-fix
...
fix for sixense compile when not present
2015-09-01 19:56:03 -07:00
Anthony J. Thibault
7b4cb8655c
First pass integration of new anim system into rig.
2015-09-01 17:57:01 -07:00
Howard Stearns
0f227577b7
Merge pull request #5692 from sethalves/joint-bandwidth
...
WARNING: protocol change - reduce joint-data bandwidth
2015-09-01 15:58:16 -07:00
Brad Davis
4e0bcf5395
Merge pull request #5699 from highfidelity/revert-5678-addressbar
...
Revert "Address bar now closes when you click outside of it"
2015-09-01 15:36:49 -07:00
Leonardo Murillo
232fd72e53
Revert "Address bar now closes when you click outside of it"
2015-09-01 16:32:29 -06:00
Ryan Downe Karpf
710f7c002e
Merge pull request #5678 from SeijiEmery/addressbar
...
Address bar now closes when you click outside of it
2015-09-01 14:42:19 -07:00
Ryan Downe Karpf
f0d69b1cdd
Merge pull request #5665 from ctrlaltdavid/20664
...
Add search radius field to entities list
2015-09-01 14:39:53 -07:00
Stephen Birarda
9a4d666b0c
no consts if HAVE_SIXENSE not set
2015-09-01 15:33:54 -06:00
Stephen Birarda
2ce225d76c
fix for sixense not present on OS X
2015-09-01 15:33:46 -06:00
Seth Alves
e32b9191f5
bump AvatarData protocol version
2015-09-01 13:35:58 -07:00
Seth Alves
6f80c484b4
cleanups
2015-09-01 13:33:19 -07:00
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
Seth Alves
3d7aa6f4d6
Merge pull request #5676 from AndrewMeadows/dubnium
...
remove a few warnings from linux build
2015-09-01 11:45:06 -07:00
Seth Alves
5c0cdfe049
Merge pull request #5651 from AndrewMeadows/copernicium
...
fix hand IK rotation for all models
2015-09-01 11:21:13 -07:00
Andrew Meadows
fe2d03fd37
merge
...
Conflicts:
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
libraries/display-plugins/src/display-plugins/stereo/StereoDisplayPlugin.cpp
libraries/shared/src/GLMHelpers.cpp
2015-09-01 11:17:08 -07:00
Andrew Meadows
7410baedf0
merge highfidelity/master into andrew/copernicium
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
libraries/animation/src/Rig.cpp
libraries/animation/src/Rig.h
2015-09-01 11:08:01 -07:00
Anthony J. Thibault
2401e6cc4b
Merge branch 'master' into ajt/new-anim-system
2015-09-01 10:58:38 -07:00
David Rowe
2b17eafef4
Only render display names in front of camera
2015-09-01 10:24:50 -07:00
Seth Alves
7b6d267c06
Merge pull request #5675 from AndrewMeadows/darmstadtium
...
remove PhysicsEntity class
2015-09-01 10:06:01 -07:00
Andrew Meadows
47c18fa18a
reduced gravity effect in IK
2015-09-01 09:51:14 -07:00
Andrew Meadows
0e5b357362
revert unintended change to "gravity" term in IK
2015-09-01 09:51:14 -07:00
Andrew Meadows
bdcc68ce36
fix bug: allow IK to iterate more than once
...
also changed name of parentTransform to be rootTransform
for more correctness
2015-09-01 09:51:14 -07:00
Andrew Meadows
fba7478c52
remove menu items for legacy IK options
2015-09-01 09:51:14 -07:00
Andrew Meadows
617e210fc6
fix for vive controller to place hand for IK
2015-09-01 09:51:14 -07:00
Andrew Meadows
bb63267e30
fix hand IK rotations or all models
2015-09-01 09:45:14 -07:00
Andrew Meadows
802b3a88c3
more corret cmake file for sixense
2015-09-01 09:45:14 -07:00
Anthony J. Thibault
0d98ab3365
Normalize scale on AnimSkeleton bind pose.
2015-08-31 17:27:23 -07:00
David Rowe
e2ee074b7a
Entity search uses radius, not diameter
2015-08-31 13:51:03 -07:00
Andrew Meadows
5a67865d74
Merge pull request #5679 from jherico/apu
...
Magnetic sticks and balls, rough draft
2015-08-31 13:17:29 -07:00
Andrew Meadows
de6afb4d74
Merge pull request #5660 from sethalves/polyvox
...
Polyvox improvements
2015-08-31 13:14:01 -07:00
Anthony J. Thibault
9786954585
Added support for onDone and onLoop triggers.
2015-08-31 12:13:05 -07:00
Anthony J. Thibault
77b857031b
Take timeScale into account during interps & setCurrentFrame()
2015-08-31 11:01:15 -07:00
Anthony J. Thibault
54aa0677f6
Merge branch 'master' into ajt/new-anim-system
2015-08-31 10:47:50 -07:00
Brad Davis
dc7d20ff86
Working on ui
2015-08-30 23:50:02 -07:00
Brad Davis
9d07bf1585
Magballs: Removing entity scripts, using onUpdate
2015-08-30 19:20:47 -07:00
Brad Davis
a574251173
Cleaning up and moving entity script
2015-08-29 23:06:23 -07:00
Brad Davis
cffb0be384
Removing edge finding calculations
2015-08-29 22:49:14 -07:00
Brad Davis
ebb530aaac
More magball work
2015-08-29 22:30:21 -07:00
Brad Davis
38b62108af
Magnetic sticks and balls
2015-08-28 23:35:43 -07:00
Anthony J. Thibault
9d983e0614
Bug fix to AnimNode::setSkeletonModel and AnimNodeLoader.
...
Also updated avatar.json to test nested graphs under a SM.
2015-08-28 17:16:32 -07:00
