Commit graph

12733 commits

Author SHA1 Message Date
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
Brad Hefta-Gaub
ea141aae92 Merge pull request #5865 from jherico/bart
Instancing work, second pass
2015-09-21 16:51:08 -07:00
Brad Davis
483884196c Merge pull request #5866 from ZappoMan/mergeQuadsAndTriangles
merge model part quads and triangles together to reduce the number of draw calls
2015-09-21 16:48:29 -07:00
Bradley Austin Davis
0401672c82 Fixing lighting again 2015-09-21 16:24:55 -07:00
Bradley Austin Davis
b3aeaba5f4 CR feedback 2015-09-21 15:44:47 -07:00
Bradley Austin Davis
84cea1ffd4 More CR comments 2015-09-21 14:33:32 -07:00
Bradley Austin Davis
0c0af812c2 CR comments 2015-09-21 14:16:56 -07:00
Bradley Austin Davis
e12e4ece34 Fixing lighting and atmosphere 2015-09-21 13:51:08 -07:00
Bradley Austin Davis
e024d23366 Instancing work, second pass 2015-09-21 13:27:02 -07:00
Brad Hefta-Gaub
dc9c774eb5 merge model part quads and triangles together to reduce the number of draw calls 2015-09-21 13:09:43 -07:00
Brad Hefta-Gaub
b88c8e507b fix a couple of properties 2015-09-21 11:35:26 -07:00
Brad Hefta-Gaub
ba5109c458 Merge pull request #5858 from howard-stearns/see-other-default-avatars
Let other users see your default avatar.
2015-09-20 13:57:29 -07:00
Howard Stearns
4fadf986e4 Merge pull request #5857 from hyperlogic/tony/look-whos-talking
Talking idle animation support
2015-09-20 13:46:40 -07:00
Howard Stearns
4d2048c6f6 Let other users see your default avatar.
Fixes https://app.asana.com/0/26225263936266/51001490412567
2015-09-20 13:12:13 -07:00
Anthony J. Thibault
eadf212418 Updated avatar.json with talking idle animation. 2015-09-18 18:31:53 -07:00
Brad Hefta-Gaub
ec87502f49 Merge pull request #5840 from jherico/bart
Instanced rendering for Box entities
2015-09-18 18:06:25 -07:00
Anthony J. Thibault
44eb448cbe Hooked up isTalking flag to Rig and AnimGraph. 2015-09-18 18:05:51 -07:00
Philip Rosedale
5e64420ea1 Merge pull request #5850 from jherico/dargo
Remove overcalling of glVertexAttrib4f
2015-09-18 16:38:22 -07:00
Brad Davis
8a703d0363 Instanced rendering, first pass 2015-09-18 16:29:29 -07:00
Andrew Meadows
269e3d7f23 Merge pull request #5836 from ZappoMan/getEntityPropertiesPerformance
Entities.getEntityProperty() performance improvements
2015-09-18 15:19:06 -07:00
Bradley Austin Davis
f851c6204f Remove overcalling of glVertexAttrib4f 2015-09-18 15:14:04 -07:00
Brad Davis
2f0ba40347 Merge pull request #5844 from ZappoMan/cruftRemovalMachine
Cruft removal machine
2015-09-18 14:59:16 -07:00
Brad Hefta-Gaub
d2a468b31d Merge pull request #5845 from hyperlogic/tony/vive-controller-offset-fix
Adjust controller offset from 6 inches to 3 inches
2015-09-18 14:26:27 -07:00
Brad Hefta-Gaub
020fb25ace CR feedback 2015-09-18 14:24:01 -07:00
Seth Alves
26c14ab730 Merge pull request #5847 from ZappoMan/callEntityMethods
fix grab behavior with toys, add better mechanism for toys to detect grab
2015-09-18 14:21:59 -07:00
Brad Hefta-Gaub
0d37511071 add support for scripts to call methods on entity scripts 2015-09-18 14:06:38 -07:00
Brad Hefta-Gaub
416acb1d4a remove call to _entities.render() in displaySide() 2015-09-18 12:03:58 -07:00
Shared Vive Room
3c64db5c86 Adjust controller offset from 6 inches to 3 inches
When using the vive controller the position of your wrist should
match your actual wrist a bit better, unless your name is Shaquille O'Neal.
2015-09-18 12:02:05 -07:00
Andrew Meadows
07f3abfc91 fix bugs 2015-09-18 12:01:23 -07:00
Brad Hefta-Gaub
6edc817bf2 move the best zone logic out of EntityTreeRenderer::render() 2015-09-18 11:35:50 -07:00
Andrew Meadows
4cb2249cda premature optimization: remove another branch 2015-09-18 10:16:19 -07:00
Andrew Meadows
a85afb5280 simplify logic of RotationAccumulator::add() 2015-09-18 10:13:21 -07:00
Andrew Meadows
6ed0a57d9f avoid unecessary computation of last absolutePose 2015-09-18 10:09:23 -07:00
Andrew Meadows
9e94e7f1d0 less complicated RotationAccumulator 2015-09-18 07:11:36 -07:00
Andrew Meadows
b6a153d926 split RotationAccumulator into its own files 2015-09-17 22:30:44 -07:00
Andrew Meadows
420acde720 blend IK effects between distinct end effectors 2015-09-17 22:11:59 -07:00
Brad Hefta-Gaub
4a34b142d1 remove render element proxies 2015-09-17 22:05:14 -07:00
Brad Hefta-Gaub
d0a4622427 removed some debug code 2015-09-17 21:01:56 -07:00
Brad Hefta-Gaub
45c34e1617 only copy properties to the script values for properties that our type actually has 2015-09-17 20:55:19 -07:00
Brad Hefta-Gaub
7f9a6d7b8e whitespace fixes 2015-09-17 20:26:50 -07:00
Brad Hefta-Gaub
6de424237f add support for property groups in the desired properties logic 2015-09-17 20:24:15 -07:00
Brad Hefta-Gaub
ec86394556 Merge pull request #5835 from hyperlogic/tony/vive-eye-offset-fix
Fix for getEyePose in OpenVRDisplayPlugin
2015-09-17 20:22:10 -07:00
Brad Hefta-Gaub
08babecb75 add support for mapping EntityPropertyFlags to QScriptValues and wire in desiredProps 2015-09-17 19:51:21 -07:00
Anthony Thibault
493819c013 Merge pull request #5834 from AndrewMeadows/ik-repairs-001
route hand data directly to new anim system
2015-09-17 17:49:05 -07:00
Brad Hefta-Gaub
b16dfb8a9e whitespace repair 2015-09-17 17:41:54 -07:00
Brad Hefta-Gaub
81255c8379 whitespace repair 2015-09-17 17:40:41 -07:00
Brad Hefta-Gaub
4e2cb00ec3 first cut at only returning type specific properties in getEntityProperties 2015-09-17 17:33:53 -07:00
Shared Vive Room
4459708b0e Fix for getEyePose in OpenVRDisplayPlugin 2015-09-17 17:16:12 -07:00
Brad Hefta-Gaub
3deaa68b7b Merge pull request #5832 from samcake/HMDLightingBug
Fix the lighting issue when the Rear View mirror is enabled
2015-09-17 16:46:56 -07:00
Andrew Meadows
4505d5999c route hand data differently for new Anim system 2015-09-17 16:04:00 -07:00