Andrew Meadows
0e1e5db7eb
only need one animateScaleChanges() implementation
2015-12-15 18:18:08 -08:00
Andrew Meadows
e9f52b1211
properly scale avatar collision shape
2015-12-15 18:18:08 -08:00
Brad Hefta-Gaub
a1a3c4470c
reload own avatar on Content Reload
2015-12-11 11:02:16 -08:00
Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -08:00
Howard Stearns
a0a4f7d177
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-anim-graph-preference-change
2015-12-04 11:08:44 -08:00
howard-stearns
1b42c5a172
Make MyAvatar.get/setAnimGraphUrl take a url(!), and make setting it
...
actually do something.
2015-12-03 16:16:01 -08:00
Atlante45
083205916f
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-30 18:25:53 -08:00
Seth Alves
b7ebe5b92b
merge from upstream
2015-11-30 16:59:52 -08:00
Stephen Birarda
4573e5c59e
resolve conflicts on merge with upstream/master
2015-11-30 13:32:38 -08:00
Anthony J. Thibault
6cfd831a5a
Menu: Added Developer > Avatar > Debug Draw Position
...
Also renamed "Debug Draw Bind Pose" to "Debug Draw Default Pose"
2015-11-21 09:50:56 -08:00
Seth Alves
f013f95e9b
merge from upstream
2015-11-21 08:43:00 -08:00
Anthony J. Thibault
b481d7c73d
Merge branch 'master' into tony/remove-joint-states
2015-11-18 09:38:21 -08:00
Brad Davis
cb26fc67fc
Move recording interface back to float/seconds
2015-11-16 14:44:22 -08:00
Howard Stearns
35f7a1cf10
Merge pull request #6391 from AndrewMeadows/sisyphus7
...
simplify MyAvatar::deriveBodyFromHMDSensor() take 2
2015-11-16 13:55:22 -08:00
Anthony J. Thibault
55adedcec8
Merge branch 'master' into tony/remove-joint-states
2015-11-16 11:22:44 -08:00
U-GAPOS\andrew
6733767d8b
use animation state to compute bodyInSensorFrame
2015-11-13 16:39:40 -08:00
U-GAPOS\andrew
91bc7ca062
cleanup start/stop logic for HMD follow
2015-11-13 14:04:36 -08:00
Stephen Birarda
d932ba74fd
remove the avatar kill packet from Interface
2015-11-12 17:58:12 -08:00
Stephen Birarda
ef778c554c
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-12 10:40:51 -08:00
Brad Davis
f521be10fe
Avatar recording work in progress
2015-11-12 00:33:38 -08:00
Anthony J. Thibault
11440f92f4
Removed rig animations
...
* Deleted AnimationHandle class
* Removed enableAnimGraph and anableRigAnimations from Menu.
* Removed *some* references to old IK system.
But it is still used when computing collision bounding volumes
2015-11-11 15:32:57 -08:00
Anthony J. Thibault
56e96ed24c
Merge branch 'master' into tony/script-start-stop-anim
2015-11-11 11:33:24 -08:00
Anthony J. Thibault
936c55a94e
New MyAvatar animation JS interface
...
JavaScript changes:
* removed MyAvatar.playAnimation
* removed MyAvatar.stopAnimation
* removed MyAVatar.getGetAnimationDetails
* removed MyAvatar.startAnimationByRole
* removed MyAvatar.stopAnimationByRole
* removed MyAVatar.getGetAnimationDetailsByRole
* removed MyAVatar.clearJointPriorities
* added MyAvatar.overrideAnimation(url, fps, loop, firstFrame, lastFrame)
* added MyAvatar.restoreAnimation()
* added MyAvatar.getAnimationRoles()
* added MyAvatar.overrideRoleAnimation(role, url, fps, loop, firstFrame, lastFrame)
* added MyAvatar.restoreRoleAnimation(role)
* added MyAvatar.prefetchAnimation(url)
* update kneel.js with new api.
* added theBird.js to test role override api.
C++ changes:
* Added getParent() and replaceChild() to AnimNode
* Added findByName() and traverse() to AnimNode
* Changed AnimStateMachine to hold nodes by childIndex instead of smart pointer.
This allows script to replace nodes dynamically via overrideRoleAnimation
2015-11-10 16:34:38 -08:00
Atlante45
ddf82c35e1
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-10 14:18:49 -08:00
samcake
d3d5d3a19e
Removing useless code
2015-11-10 12:02:20 -08:00
Anthony J. Thibault
eacc2cae0c
WIP checkpoint
2015-11-09 18:36:23 -08:00
Anthony J. Thibault
af2b3bb9d5
MyAvatar: removed priority, hold and maskedJoints from playAnimation js call
2015-11-09 16:56:49 -08:00
Seth Alves
4ab727c47c
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-04 13:57:59 -08:00
Atlante45
d9cd986db2
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-04 11:26:16 -08:00
samcake
ce5e89ce66
removing the pulsing mechanism in MyAvatar and making a new stadnard.json mapping file
2015-11-04 10:53:53 -08:00
Seth Alves
dba9eb7046
merge from upstream
2015-11-03 13:35:17 -08:00
Stephen Birarda
bbf5991f9a
resolve conflicts on merge with huffman/baseball
2015-11-02 14:14:36 -08:00
Stephen Birarda
017cee6961
make shouldRenderLocally do the right thing
2015-11-02 11:59:09 -08:00
Andrew Meadows
fd557c4e52
route HMD-following through the physics simulation
2015-11-02 11:07:40 -08:00
Seth Alves
3ac0fef1ea
merge from upstream
2015-11-01 15:22:57 -08:00
Brad Hefta-Gaub
8839458d54
Merge pull request #6242 from highfidelity/controllers
...
New Controller interfaces/api
2015-10-30 12:47:51 -07:00
Howard Stearns
d79d0bc5c5
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 08:25:41 -07:00
Brad Davis
3c1a0930da
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
interface/src/avatar/MyAvatar.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-10-28 13:38:22 -07:00
Andrew Meadows
afec2a9771
fix whitespace
2015-10-28 09:42:55 -07:00
Brad Hefta-Gaub
5a42991e0c
first pass at cleaning up MyAvatars use of PalmData
2015-10-27 13:51:42 -07:00
Andrew Meadows
8b285fd228
recover follow HMD behavior
2015-10-27 13:51:40 -07:00
Andrew Meadows
43aac813da
more prep for shifting avatar during HMD motion
2015-10-27 13:15:38 -07:00
Andrew Meadows
5f278f9024
name change
2015-10-27 13:15:38 -07:00
Andrew Meadows
a1f1e50431
split CharacterController btw phys and interface
2015-10-27 13:15:38 -07:00
Howard Stearns
900b07fdee
dead code
2015-10-26 10:00:07 -07:00
Brad Hefta-Gaub
71dfff7c35
first cut at adding MyAvatar.xxxHandPose
2015-10-23 12:00:40 -07:00
Howard Stearns
ecc920199d
Return id suitable for use with remover, per comments.
2015-10-22 15:24:24 -07:00
Howard Stearns
1d0464ede5
Name change and thread checks per comments.
2015-10-22 15:15:10 -07:00
Brad Davis
afcec347ff
Wiring yaw action to avatar
2015-10-21 21:35:19 -07:00
Howard Stearns
9fd61907f5
Call back to Javascript asynchronously, so that we don't block and the script's engine doesn't have thread conflicts.
2015-10-21 20:50:07 -07:00
