Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 20:46:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
35375 commits 25 branches 0 tags 1.1 GiB
Commit graph

13923 commits

Author SHA1 Message Date
Seth Alves
ac635336b7 split AvatarActionHold's finding of its location target into a new function 2015-11-13 14:58:17 -08:00
U-GAPOS\andrew
91bc7ca062 cleanup start/stop logic for HMD follow 2015-11-13 14:04:36 -08:00
Stephen Birarda
ea38c4cc49 don't allow domain check-ins while shutting down 2015-11-12 18:04:15 -08:00
Stephen Birarda
d932ba74fd remove the avatar kill packet from Interface 2015-11-12 17:58:12 -08:00
samcake
1fd37b51a2 trying to get somewhere.... 2015-11-12 17:54:35 -08:00
Stephen Birarda
6b2987eef8 handle domain server node removal in NodeList 2015-11-12 17:47:51 -08:00
Seth Alves
d7be1699a7 adjust how the decision to send action changes over the wire is made 2015-11-12 15:27:10 -08:00
Seth Alves
a78b1619be Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug 2015-11-12 14:20:23 -08:00
Seth Alves
a8cd891e48 adjust how the decision to send action changes over the wire is made 2015-11-12 14:19:23 -08:00
Brad Davis
ee1545f649 Cleaning up clip and transform 2015-11-12 11:48:47 -08:00
Seth Alves
3519dd248b Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug 2015-11-12 09:53:11 -08:00
Brad Davis
f521be10fe Avatar recording work in progress 2015-11-12 00:33:38 -08:00
Anthony J. Thibault
e698d3c1e8 Isolate JointStates within the Rig class 
Except for SkeletalModel::computeBounds() JointStates are now completly
encapsulated by the Rig.  Now we can start using AnimPoses instead and
in parallel with the JointState implementation. Then we can assert that
they are identical, before removing JointStates.

This check in has many comments with the AJT tag.
Each one of these cases will need to be revisitied and fixed.
In particular // AJT: LEGACY will be used to enclose all code
in the Rig which manipulates the _jointState QVector.
 2015-11-11 18:23:58 -08:00
Thijs Wenker
4c2c37acce Merge branch 'master' of https://github.com/worklist/hifi into 20724 2015-11-12 02:19:35 +01: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
533773d1cd Removed animationHandles section from Avatar prefs 2015-11-11 13:21:37 -08:00
Anthony J. Thibault
cce967df94 Removed AnimationsDialog 2015-11-11 12:14:56 -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
Seth Alves
4df65e4c11 Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug 2015-11-10 15:02:07 -08:00
samcake
d3d5d3a19e Removing useless code 2015-11-10 12:02:20 -08:00
Thijs Wenker
27495b99f2 Merge branch 'master' of https://github.com/worklist/hifi into 20724 2015-11-10 19:17:33 +01:00
Seth Alves
b9ca509f07 Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup 2015-11-10 09:50:12 -08:00
samcake
d1df6854ac Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-10 09:16:28 -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
Atlante45
767a7a7f1e Fix warnings on OS X 2015-11-09 14:26:23 -08:00
Thijs Wenker
a58bd4ff05 Merge branch 'master' of https://github.com/worklist/hifi into 20724 2015-11-09 22:37:44 +01:00
samcake
2078c753ae Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-09 09:23:59 -08:00
Seth Alves
f3d26e163d turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system 2015-11-07 07:19:27 -08:00
Clément Brisset
2c27d18922 Merge pull request #6282 from jherico/externals 
Runtime plugins fixes
 2015-11-06 19:30:40 -08:00
Brad Davis
6122fa145d More PR feedback 2015-11-06 17:17:26 -08:00
Brad Davis
37a9538f10 PR feedback, ensure destruction of shared objects 2015-11-06 16:57:31 -08:00
Brad Davis
11733c039f Allow shared libraries to access core global objects 2015-11-06 16:57:31 -08:00
Atlante45
0a65bb145b Some more code cleanup 2015-11-06 16:44:28 -08:00
samcake
5fb2c3ccd1 resolve merge conflict 2015-11-06 16:27:47 -08:00
Brad Davis
7c433f47c0 Breaking up input devices and input plugins classes. 2015-11-06 15:20:00 -08:00
James B. Pollack
8eea7ff67c Merge pull request #6329 from sethalves/fix-grab-release 
send to server upon grab release
 2015-11-06 14:33:08 -08:00
AlessandroSigna
fdd4a55057 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-06 12:47:04 -08:00
AlessandroSigna
6d3a79af83 changed the behaviour of Standard.LY input 2015-11-06 12:46:08 -08:00
samcake
703a6bdb95 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-06 12:38:07 -08:00
Clément Brisset
5d80dc0c90 Merge pull request #6324 from sethalves/smooth-hold-action-velocity 
smooth hold action velocity over 2 frames
 2015-11-06 12:25:52 -08:00
Seth Alves
46b7b92b2f prefix private member variables with _ 2015-11-06 11:54:51 -08:00
samcake
a82c2d66ed Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-06 11:53:49 -08:00
Brad Davis
1dc392bb36 Merge pull request #6330 from Atlante45/master 
// FIXME incredibly evil....
 2015-11-06 11:43:33 -08:00
Atlante45
c53c0ec53f Fix double delete on shutdown 2015-11-06 11:13:10 -08:00
samcake
2f9c33dbfb Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-06 09:35:48 -08:00
samcake
46d9a14951 Work in progress, fixing the animation playback 2015-11-06 09:35:20 -08:00
Seth Alves
4ed8a1e5d1 changes to send an update to entity-server when AvatarActionHold releases an entity 2015-11-06 09:25:53 -08:00
Thijs Wenker
de98a17ada - rename CameraEntityItem to AnchorEntityItem 2015-11-06 01:58:08 +01:00
Atlante45
ffafd3194e Recording audio fixes 2015-11-05 16:46:59 -08:00
Seth Alves
28d4d29bb6 smooth hold action velocity over 2 frames 2015-11-05 15:07:00 -08:00
Anthony J. Thibault
50370479e4 Application.h: coding standard fixes 2015-11-05 11:03:32 -08:00
Anthony J. Thibault
d9f4b0218e Merge branch 'master' into tony/mac-fixes 2015-11-05 08:26:44 -08:00
samcake
00797b4dea Merge pull request #6314 from jherico/homer 
Fixing step yaw to move by consistent amounts, be 'tappable'
 2015-11-04 23:33:45 -08:00
Brad Davis
86b852231e Merge pull request #6286 from EdgarPironti/master 
Spacemouse migration
 2015-11-04 19:15:35 -08:00
Brad Davis
20d1035821 Fixing step yaw to move by consistent amounts, be 'tappable' 2015-11-04 15:54:50 -08:00
Anthony J. Thibault
d46d521d81 Added #else branch to #if 0 2015-11-04 15:10:23 -08:00
Thijs Wenker
42cbccc725 fix stretchy HMD view on entity camera 2015-11-04 21:39:22 +01:00
Thijs Wenker
ee218faf5e Merge branch '20724' of github.com:thoys/hifi into 20724 2015-11-04 21:21:57 +01:00
Anthony J. Thibault
69f1cfbcb9 Fixes for Mac build and crash on startup 
For some reason the qt code gen is getting confused by the #if 0
in 3DConnextionClient.h, so I added a stub implementation.

In Application.cpp the change of moving idle into paintGL had a sideeffect
of calling OffscreenGlCanvas before it was initialized.  To work around this
I added a guard to prevent calling idle before all the gl windows/widgets have
been initialized.
 2015-11-04 12:04:34 -08:00
Anthony Thibault
275b248547 Merge pull request #6302 from AndrewMeadows/fix-avatar-drift 
fix slow drift of avatar when wearing HMD
 2015-11-04 11:19:45 -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
U-GAPOS\andrew
9de5721a48 set _hmdFollowVelocity to zero when done following 2015-11-04 10:23:55 -08:00
Seth Alves
270b4b97fc remove a left-over kludge that was causing the appearence of frame-lag in held objects 2015-11-04 02:26:02 -08:00
EdgarPironti
7adf38f781 Spacemouse migration 2015-11-03 18:22:55 -08:00
EdgarPironti
2a84cadd5d Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 18:22:29 -08:00
Thijs Wenker
d7279e4c88 Support for Camera Entities. 
- New entity type: camera, with just the basic properties of an entity (position, rotation, name etc.).
- New CameraMode: CameraEntity
- Example script using the new cameraEntity
- Updated edit.js to use the CameraEntities (with button to preview the camera)
 2015-11-04 02:51:23 +01:00
Brad Hefta-Gaub
71e4092276 Merge pull request #6283 from hyperlogic/tony/one-update-for-every-render 
Remove idleTimer and call idle directly from paintGL.
 2015-11-03 16:38:43 -08:00
Anthony J. Thibault
31f361d49c Moved fps timing to beginning of paintGL 
This should improve accuracy.

However the fps displayed can still sometimes be slightly greater then the
vsync, this is either due to timer accuracy problems or QTimer delay within
OpenGLDisplayPlugin.
 2015-11-03 15:51:18 -08:00
U-GAPOS\andrew
d544b7a645 fix bug: avatar can't walking when HMD at rest 2015-11-03 13:59:15 -08:00
Andrew Meadows
4215ce5d25 Merge pull request #6212 from howard-stearns/dont-use-other-avatar-sounds 
Don't play other avatar's collision sounds.
 2015-11-03 13:40:27 -08:00
Andrew Meadows
498cec3abd Merge pull request #6294 from AndrewMeadows/fix-hydra-sans-hmd 
fix hydra sensor matrix when no HMD is attached
 2015-11-03 13:37:03 -08:00
EdgarPironti
d99838de9c Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 12:25:19 -08:00
Andrew Meadows
e160e2a7ae the minimal fix 2015-11-03 11:37:30 -08:00
Brad Davis
4c076d8b12 Disabling billboard rendering, source of the evil black rectangles 2015-11-03 11:34:05 -08:00
Andrew Meadows
12ff9734e0 init _bodySensorMatrix in ctor 2015-11-03 11:26:49 -08:00
Anthony J. Thibault
c139b62217 fps calculation now based on moving average 
fps stat is now calcualted the same way as simRate and avatarRate are calculated,
based on a moving average that is sampled once a second.
Also, Removed unused constants and renamed Application::checkFPS to Application::ping
 2015-11-03 11:19:49 -08:00
EdgarPironti
603405ad61 Do not merge - Spacemouse 2015-11-02 23:29:15 -08:00
Brad Davis
764ecba2a8 Adding diagnostics to track down the 'black rectangles of death' 2015-11-02 21:55:35 -08:00
Anthony J. Thibault
0c12bb5a4e Remove idleTimer and call idle directly from paintGL. 2015-11-02 18:47:18 -08:00
Seth Alves
310a5c9bfb don't initialize SMI sdk unless we need it 2015-11-02 13:42:12 -08:00
U-GAPOS\andrew
a77f888f15 more correct HMD offset correction velocity 2015-11-02 11:29:17 -08:00
U-GAPOS\andrew
a545d770d8 fix bug preventing avatar motion in 2D mode 2015-11-02 11:07:43 -08:00
Andrew Meadows
9799693135 remove extra whitespace 2015-11-02 11:07:41 -08:00
Andrew Meadows
fd557c4e52 route HMD-following through the physics simulation 2015-11-02 11:07:40 -08:00
Howard Stearns
fc63fa6f7b Update comments, and don't continue through collisions after finding one for our avatar. 2015-11-01 18:55:43 -08:00
Howard Stearns
ea2971a24f Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds 2015-11-01 17:02:59 -08:00
Brad Hefta-Gaub
9c23f2551d Merge pull request #6207 from jherico/pluginSupport 
Support for runtime plugins (DLLs)
 2015-11-01 14:57:13 -08:00
Brad Davis
cfb2fd1523 Support for runtime plugins (DLLs) 2015-11-01 11:12:12 -08:00
Brad Hefta-Gaub
e899229cde tweaks to how VrMenu is shown 2015-11-01 09:55:30 -08:00
Brad Hefta-Gaub
05dea847be add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu 2015-10-31 15:47:40 -07:00
Howard Stearns
79f05c63e5 Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds 2015-10-31 11:23:18 -07:00
Seth Alves
896ed3927c merge from upstream 2015-10-30 19:17:43 -07:00
Anthony J. Thibault
085282db4f Crash fix for AvatarManager when iterating over _avatarHash 
The main problem is that a null shared pointer was inserted into the _avatarHash
via the AvatarManager::getAvatarBySessionID().  When the sessionID is not present
in the _avatarHash, [QHash](http://doc.qt.io/qt-5/qhash.html#operator-5b-5d) will *insert*
an empty smart_ptr into the hash.
 2015-10-30 16:13:04 -07:00
Andrew Meadows
f652e983a9 flag kinematic objs when changed in stepSimulation() 2015-10-30 14:53:29 -07:00
Howard Stearns
28246c1951 Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds 2015-10-30 13:21:56 -07:00
Brad Hefta-Gaub
8839458d54 Merge pull request #6242 from highfidelity/controllers 
New Controller interfaces/api
 2015-10-30 12:47:51 -07:00
Seth Alves
93503d0a21 make kinematic grab set entities kinematic in bullet and update entity position 2015-10-30 11:03:13 -07:00
Howard Stearns
792fed0090 We weren't setting type for avatar motion states. 2015-10-29 22:15:26 -07:00
samcake
f72146c35d FIxing the mac build 2015-10-29 14:17:52 -07:00
samcake
d73eafddd1 COmfort mode working with the COntroller system observing the menu state 2015-10-29 13:48:16 -07:00
samcake
e902e5e97a Introduce the concept of loading the default Mapping 2015-10-29 13:05:29 -07:00
Howard Stearns
3c6d4f9c22 Thread safety per #6154. 2015-10-29 11:02:24 -07:00
Howard Stearns
6e4d0043c9 Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-29 10:32:12 -07:00
Brad Davis
ccbae81dad Merge branch 'master' into HEAD 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-10-29 10:24:38 -07:00
Seth Alves
ac1055c3e0 Merge pull request #6214 from howard-stearns/goToPosition 
Don't go to wrong position on startup/teleport.
 2015-10-29 10:15:26 -07:00
Seth Alves
10717dc364 Merge pull request #6154 from howard-stearns/safe-avatar-list-access 
Safe avatar list access
 2015-10-29 10:12:34 -07:00
Andrew Meadows
d33530f5d0 Merge pull request #6209 from howard-stearns/guard-rendering-of-avatar-collision-hull 
Don't render avatar's renderBoundingCollisionShapes before data is there
 2015-10-29 09:34:26 -07:00
Brad Davis
c4e82a85d9 Remove DeviceProxy in favor of InputDevice 2015-10-29 09:32:56 -07:00
Andrew Meadows
f9012d5051 Merge pull request #6187 from sethalves/fix-actions-ttl 
fix actions bug
 2015-10-29 09:30:21 -07:00
Howard Stearns
c47d246987 Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-29 08:27:12 -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 Hefta-Gaub
21decaaf8e Merge pull request #6218 from ctrlaltdavid/20719 
20719 Fix audio stats dialog box not being sized properly
 2015-10-29 08:16:56 -07:00
Howard Stearns
697b9fb60b Merge pull request #6205 from hyperlogic/tony/eye-lookat-fix 
Fixes locally rendered eye gaze
 2015-10-28 21:39:54 -07:00
Anthony J. Thibault
5e73af9272 Rig: Removed dt from updateFromEyeParameters() 2015-10-28 18:10:41 -07:00
David Rowe
568e5536b8 Control bandwidth stats dialog sizing similarly 2015-10-29 13:18:43 +13:00
David Rowe
4cb5ccab90 Fix audio stats dialog not being sized properly 2015-10-29 13:18:27 +13:00
howard-stearns
62e56d3f13 Don't go to wrong position on startup/teleport. 
This fixes one cause of being in the wrong place.
https://app.asana.com/0/32622044445063/61787931469907
 2015-10-28 16:44:53 -07:00
Howard Stearns
bc0e14cb71 Don't render avatar's renderBoundingCollisionShapes before the data is there. 
(Found while trying to repro "Deadlock in AvatarData::nextAttitude() on main thread" https://app.asana.com/0/32622044445063/61023569045356)
 2015-10-28 13:58:44 -07:00
Brad Davis
570b4a32da Merge pull request #6206 from samcake/controllers 
Controllers : Add a new kind onf controller to expose ReadOnly state from the application
 2015-10-28 13:42:15 -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
samcake
bbc6d9f5e7 Fixing typo and review comments 2015-10-28 12:52:21 -07:00
samcake
b37a6f689a Fixing typo and review comments 2015-10-28 12:51:22 -07:00
samcake
fc15c7cd98 Adding the ApplicationStateDevice to the APplication class and add one entry ythere 2015-10-28 12:15:14 -07:00
Brad Hefta-Gaub
731fab6ffc Merge pull request #6196 from jherico/gl 
Move GL utilities to their own library
 2015-10-28 12:10:52 -07:00
Brad Hefta-Gaub
c5e22a62e8 Merge pull request #6182 from Atlante45/script-engine 
Improved ScriptEngine debug messages
 2015-10-28 11:27:30 -07:00
Anthony J. Thibault
6ae5c540fd SkeletonModel: coding standard fix 
Replaced glm::vec3(0) with glm::vec3().
 2015-10-28 11:09:24 -07:00
Howard Stearns
367175b8a6 Reduce lock time. 2015-10-28 10:49:19 -07:00
Andrew Meadows
afec2a9771 fix whitespace 2015-10-28 09:42:55 -07:00
samcake
57aa89d14f Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-28 09:24:24 -07:00
samcake
92ca658aae Trying to get a state controller to work 2015-10-28 09:23:20 -07:00
Anthony J. Thibault
ae8938cadc Fix for local eye tracking in AnimGraph 
Also moved Rig::updateAnimations() now occurs after
Rig::updateFromHeadParameters() and Rig::updateFromHandParameters().
This should remove a frame of lag for head and hand IK targets.

Rig::updateFromEyeParameters() occurs after Rig::updateAnimations().
But now the eye JointStates are re-computed, this is the actual
fix for the local eye tracking issue.
 2015-10-27 18:30:35 -07:00
Brad Hefta-Gaub
65eae35433 a little more cleanup 2015-10-27 17:09:43 -07:00
samcake
6ec87086bc Adding the state controller 2015-10-27 16:57:06 -07:00
Brad Hefta-Gaub
d86f1b50a7 more cleanup 2015-10-27 16:37:43 -07:00
Brad Hefta-Gaub
19743c1f39 gak, build busters and more CR feedback 2015-10-27 16:16:03 -07:00
Brad Hefta-Gaub
eb19364129 CR feedback 2015-10-27 15:56:27 -07:00
Brad Hefta-Gaub
133d48ebee CR feedback 2015-10-27 15:53:48 -07:00
Brad Davis
5cbb2562cd Move GL utilities out to their own library 2015-10-27 15:53:42 -07:00
Andrew Meadows
e35596428c cleanup comment 2015-10-27 14:43:18 -07:00
Atlante45
32f88f3fb6 Fix for JSConcole 2015-10-27 14:37:39 -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
24c2f538a4 keep MyAvatar RigidBody on shape changes 2015-10-27 13:15:38 -07:00
Andrew Meadows
355ebe923d cleanup and comments 2015-10-27 13:15:38 -07:00
Andrew Meadows
5e59e9595b fix typo in comments 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
samcake
87cf3b237b Supporting a InHMD action and using it to enable COmfort mode 2015-10-27 09:59:22 -07:00
Seth Alves
8d0aaed41a fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl' 2015-10-26 13:50:21 -07:00
Howard Stearns
900b07fdee dead code 2015-10-26 10:00:07 -07:00
Howard Stearns
7b0b77f4d1 getAvatarHash => withAvatarHash 2015-10-23 16:57:27 -07:00
Brad Davis
e8be92cab8 Adding input action event 2015-10-23 13:36:06 -07:00
Brad Hefta-Gaub
f90844449d fix angular velocity 2015-10-23 13:16:05 -07:00
Brad Hefta-Gaub
4a58eeb810 expose deltaRotation as part of MyAvatar.xxxHandPose 2015-10-23 12:14:33 -07:00
Brad Hefta-Gaub
71dfff7c35 first cut at adding MyAvatar.xxxHandPose 2015-10-23 12:00:40 -07:00
Howard Stearns
f0a4e25e89 Name change per comments. 2015-10-22 15:25:14 -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
Howard Stearns
0d514ad645 Thread-safe avatar list access 2015-10-22 13:02:08 -07:00
Brad Davis
5227c40298 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-22 12:15:41 -07:00
Howard Stearns
a58539be82 Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-22 10:39:54 -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
Brad Davis
044a28212d Wiring step yaw to the avatar 2015-10-21 20:44:38 -07:00
Brad Hefta-Gaub
68a2985b7a add tip position as well 2015-10-21 17:14:48 -07:00
Brad Hefta-Gaub
a3900a954b expose MyAvatar.leftHandePosition and MyAvatar.rightHandPosition to JS 2015-10-21 17:03:54 -07:00
Brad Davis
4a1df286fd Cleanup of enums and JS names 2015-10-21 15:57:37 -07:00
Seth Alves
c0eccca6d3 relay 'kinematic' mode of a hold to other interfaces 2015-10-21 12:29:26 -07:00
Brad Davis
a124d3b433 Moving to InputEndpoint, fixing build problem 2015-10-20 22:00:16 -07:00
Howard Stearns
574a51e831 Use cleaner interface. 2015-10-20 17:02:16 -07:00
samcake
da55011c2a Trying to merge 2015-10-20 16:38:41 -07:00
Howard Stearns
4c6867bb9c Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-20 12:17:00 -07:00
Brad Davis
bea6fdd890 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:20:28 -07:00
Brad Davis
8d0148a1ca Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-20 10:13:31 -07:00
Andrew Meadows
341bc3666f Merge pull request #6093 from sethalves/hold-action-changes 
Hold action changes
 2015-10-20 09:19:48 -07:00
Brad Hefta-Gaub
9f17f10d6a fix warning in master 2015-10-19 17:56:38 -07:00
Seth Alves
4feb9dc8c6 prepare for possible future coding standard 2015-10-19 17:46:34 -07:00
Brad Hefta-Gaub
7669f9ed2c fix several warnings 2015-10-19 17:26:57 -07:00
Seth Alves
41f7ef1e2e cleanups 2015-10-19 16:53:27 -07:00
Brad Hefta-Gaub
56f625d376 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-19 16:53:25 -07:00
Brad Hefta-Gaub
0b2bf8bda8 remove some dead code 2015-10-19 15:23:45 -07:00
Brad Hefta-Gaub
110adc5c22 fix model LOD behavior 2015-10-19 15:21:25 -07:00
Seth Alves
46e5bf0435 take entity-server clock-skew into account when handling action expiration times 2015-10-19 11:59:03 -07:00
Brad Davis
a8e707ced2 Correcting update order to fix mouse 2015-10-18 22:46:14 -07:00
Brad Davis
734a39f962 Breaking up UserInputMapper, restoring some mappings 2015-10-18 18:58:03 -07:00
Brad Davis
57be59935d Move controller test to app 2015-10-17 19:13:38 -07:00
Brad Davis
5bac1aae2d Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-16 17:23:30 -07:00
Howard Stearns
91c2d31118 Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-16 15:51:09 -07:00
Howard Stearns
770282ad88 Javascript methods to getAvatars listing and getAvatar from id. 2015-10-16 15:22:43 -07:00
samcake
f0034844e7 Actions working from the Controller layer 2015-10-16 12:24:12 -07:00
Seth Alves
fe709a9397 keep object active in kinematic mode, also 2015-10-16 10:53:33 -07:00
Howard Stearns
f25cc93936 Initial prototype of exposing anim vars to javascript. 2015-10-16 10:48:36 -07:00
Seth Alves
966499b9e5 continually activate (in the bullet sense) a held object 2015-10-16 10:17:17 -07:00
Seth Alves
d2b7e5c4eb Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-16 09:54:26 -07:00
Seth Alves
b18bb1e076 Merge pull request #6084 from AndrewMeadows/physics-cleanup 
move DIRTY_FLAGS out of EntityItem namespace
 2015-10-16 07:22:40 -07:00
Seth Alves
359a318568 fold kinematic hold into normal hold (disabled by default, an argument enables) 2015-10-15 20:23:06 -07:00
Seth Alves
0964180f2c code review 2015-10-15 17:10:47 -07:00