Andrew Meadows
744da64c50
Merge pull request #6527 from ZappoMan/debugEntitiesSending
...
Add some debugging stats to entity server
2015-12-02 15:51:47 -08:00
Brad Hefta-Gaub
1e51a90204
add edit times and entity ids to the viewer stats
2015-12-02 14:43:00 -08:00
Anthony J. Thibault
9c0b4bc2a2
Fix for model entities with non-uniform scaled mesh
...
Logic which extracted rotations from a non-uniformly scaled matrices was sometimes incorrect.
This should fix the roads in Qbit as well as the blocks in toybox.
2015-12-02 14:09:47 -08:00
Brad Hefta-Gaub
08ba535c38
add some basic send tracking
2015-12-02 13:43:05 -08:00
Brad Hefta-Gaub
33b859df33
Merge pull request #6416 from kencooke/audio-reverb
...
New reverb
2015-12-02 11:22:12 -08:00
Ken Cooke
fbd7549430
Better reverb script defaults
2015-12-02 11:05:06 -08:00
Brad Hefta-Gaub
112cdaf028
Merge pull request #6512 from AndrewMeadows/remove-debug-cruft
...
remove debug option for disabling physics updates
2015-12-02 10:00:29 -08:00
Brad Hefta-Gaub
75a57c3cb8
Merge pull request #6500 from Atlante45/octree_crash
...
Octree crash fix
2015-12-02 09:59:56 -08:00
Ken Cooke
f005afd7c0
Fix stdint.h includes
2015-12-02 09:33:47 -08:00
Brad Davis
9b6ec34f09
Fixing avatar orientation in recordings
2015-12-01 20:51:07 -08:00
James B. Pollack
52d6fdac1a
Merge pull request #6487 from ctrlaltdavid/20740
...
Get the Leap Motion working again
2015-12-01 15:40:48 -08:00
Howard Stearns
ef32853d46
When AvatarData parses the .fst, store the (merged) .fbx filename.
...
(Interface gets the .fbx by a separate path, but agents don't have that chance.)
2015-12-01 11:51:22 -08:00
Andrew Meadows
ab6367ff4e
remove debug option for disabling physics updates
2015-12-01 11:13:01 -08:00
Stephen Birarda
7dbf29821a
don't persist the octree if it never loaded
2015-12-01 10:00:25 -08:00
Ken Cooke
a725c8b12e
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb
2015-12-01 09:12:24 -08:00
Howard Stearns
6f50d91208
Merge pull request #6461 from hyperlogic/tony/remove-joint-states
...
Refactor of Rig and MyAvatar animation JavaScript interface
2015-11-30 16:28:15 -08:00
Clément Brisset
e168966b87
Merge pull request #6409 from birarda/injector-hybrid
...
more efficient threading of networked AudioInjector objects
2015-11-30 15:36:41 -08:00
Atlante45
4aaa9ca02f
Make OctreeElementBag safer to use
2015-11-30 15:23:49 -08:00
Anthony J. Thibault
e2d9e37eb8
Fix for head offset for models with no eyes
...
This was causing in correct body poses while wearing an HMD.
2015-11-30 14:08:21 -08:00
Atlante45
5019f79947
Fix header name
2015-11-30 11:48:34 -08:00
Anthony J. Thibault
11bfed4185
Merge branch 'master' into tony/remove-joint-states
2015-11-30 11:21:44 -08:00
James B. Pollack
85b8266537
Merge pull request #6494 from ctrlaltdavid/20744
...
Fix menu shortcuts created in JavaScript not working
2015-11-30 11:20:10 -08:00
Andrew Meadows
49a6f63663
remove whitespace and fix warning (unused var)
2015-11-30 10:00:05 -08:00
David Rowe
d6b13ef42c
Fix crash when try to remove invalid menu item in JavaScript
2015-11-30 08:33:38 +13:00
Atlante45
a364e85e1d
Remove DeleteHooks
2015-11-25 17:21:56 -08:00
Ken Cooke
a5b64473af
Fix bugs
2015-11-25 16:15:04 -08:00
Anthony J. Thibault
7c9cb97783
Merge branch 'master' into tony/remove-joint-states
2015-11-25 15:48:51 -08:00
Andrew Meadows
527408c7c1
Merge pull request #6292 from huffman/physics-continuous-collision-detection
...
Physics continuous collision detection
2015-11-25 15:45:18 -08:00
Atlante45
cd2e610e17
Remove OctreeElement's UpdateHooks
2015-11-25 15:35:15 -08:00
Anthony J. Thibault
5072339a22
Warning fix
2015-11-25 14:04:01 -08:00
Anthony J. Thibault
23def8d173
Merge branch 'master' into tony/remove-joint-states
2015-11-25 13:55:23 -08:00
Anthony J. Thibault
2a9adafc09
Bumped avatar packet version number
2015-11-25 12:13:40 -08:00
Anthony J. Thibault
97a2eb62d4
Fix for incorrect avatar bounds after changing avatars
2015-11-25 12:06:50 -08:00
Clément Brisset
5ff482071e
Merge pull request #6465 from ericrius1/polyLineFix
...
moved logic to build vertex buffer to renderable polyline class, recalculati…
2015-11-25 11:02:02 -08:00
Anthony J. Thibault
868cf83b48
Fix for attachments and MyAvatar::getDefaultEyePosition()
2015-11-25 10:07:29 -08:00
Andrew Meadows
bc20b72645
Merge pull request #6453 from howard-stearns/avatar-render-controller2
...
Survive Flash Mobs Without Making Everyone Sick
2015-11-25 09:52:28 -08:00
Anthony Thibault
527199bc69
Merge pull request #1 from AndrewMeadows/fix-avatar-capsule
...
compute bounding capsule of avatars
2015-11-25 09:39:18 -08:00
Andrew Meadows
2cc1dfe819
getRootAbsoluteBindPoseByChildName() is deprecated
2015-11-24 20:39:26 -08:00
Andrew Meadows
3ae082f09c
compute bounding capsule of avatars
2015-11-24 20:28:39 -08:00
Anthony J. Thibault
386dad7aff
Fixes hand IK for some avatars
...
Specifically:
https://hifi-content.s3.amazonaws.com/ozan/dev/avatars/hifi_team/ryan/_test/ryan.fst
https://hifi-content.s3.amazonaws.com/ozan/dev/avatars/hifi_team/brad/brad.fst
https://s3.amazonaws.com/hifi-public/tony/blackmery/blackmery.fst
These avatars have "Hips" joints that are NOT the root of the skeleton.
This would cause the getRootAbsoluteBindPoseByChildName() to return (0,0,0).
Causing the IK targets to be lower then they should have.
2015-11-24 18:57:35 -08:00
Anthony J. Thibault
76034d62d5
Eye tracking fixes
2015-11-24 16:57:26 -08:00
Anthony J. Thibault
f120e10ff4
Merge branch 'master' into tony/remove-joint-states
2015-11-24 15:00:05 -08:00
Howard Stearns
b12bc96fb7
Merge pull request #6482 from hyperlogic/tony/avatar-eye-tracking-fix
...
Fix for avatar eye tracking
2015-11-24 14:38:28 -08:00
Anthony J. Thibault
e07e1c5c92
Fix for avatar eye tracking
...
When computing a full eye to world matrix, the translations need to be the geometry coordinate frame, not scaled into meters.
2015-11-24 14:01:01 -08:00
David Rowe
e25d4c17e8
Fix InputController (Leap Motion) not able to be created
2015-11-25 09:29:40 +13:00
Philip Rosedale
dde01b2071
Merge pull request #6476 from AndrewMeadows/arrow
...
fix for objects suffering from very small updates to physics properties
2015-11-24 11:22:25 -08:00
Brad Hefta-Gaub
fd7a704753
Merge pull request #6471 from birarda/url-cmp
...
fix unnecessary model URL updating thanks to URL encoding
2015-11-24 10:56:21 -08:00
Andrew Meadows
e26081e981
always update physics properties when they change
...
and move activation check logic to MotionState
2015-11-24 10:20:19 -08:00
Andrew Meadows
5135c9dded
whitespace cleanup
2015-11-24 10:20:19 -08:00
Brad Hefta-Gaub
d32e500464
Merge pull request #6462 from jherico/rec5
...
Blendshapes and attachments in recordings, plus other minor fixes.
2015-11-24 10:01:17 -08:00
