Andrew Meadows
e793c207f9
Minor whitespace removal.
2014-02-13 10:03:14 -08:00
Andrew Meadows
cc70e099bf
Merge branch 'avatar-interaction' of ssh://github.com/AndrewMeadows/hifi into avatar-interaction
2014-02-12 08:31:05 -08:00
Andrew Meadows
04bc05cfe6
Moving hand-avatar collision trigger calls into MyAvatar
...
Also renaming some methods in Model to be more descriptive.
2014-02-12 08:29:22 -08:00
Andrew Meadows
66dc4e17ad
Fixing formatting to be KR
2014-02-11 15:59:35 -08:00
Andrew Meadows
6c4ecb0246
Splitting hand collisions between other avatars and ourself.
2014-02-11 14:38:31 -08:00
Andrew Meadows
3b3359abce
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-11 14:02:08 -08:00
Andrew Meadows
d0f9b78710
Adding avatar body-body collisions to prevent near-clipping.
2014-02-11 13:48:48 -08:00
Andrew Meadows
887fa0c938
Only resolve our hand collisions that would not move the other avatar.
...
This helps us only penetrate the moveable parts of other avatars.
2014-02-11 09:23:40 -08:00
Andrew Meadows
861778347f
Fixing windows compile warnings about signed vs unsigned compare.
2014-02-11 08:54:40 -08:00
Andrew Meadows
ed610c0739
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-mouselook
2014-02-11 08:47:02 -08:00
Andrew Meadows
7840b351dd
Fix for #1968 : head does not roll
2014-02-11 08:43:56 -08:00
Andrzej Kapolka
f9e9d62fe3
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-10 19:02:58 -08:00
Andrzej Kapolka
2071da2c8a
Provide a means to specify a fallback for when we fail to load a model. Also
...
added missing associated resources for default model. Closes #1960 .
2014-02-10 18:50:36 -08:00
Andrzej Kapolka
bbb8e2a45f
Ignore the =1's that Faceshift appends to our custom data in the FST.
2014-02-10 17:41:57 -08:00
Andrew Meadows
8529858134
Remove experimental joining of hand-avatar and avatar-avatar collision logic.
2014-02-10 17:12:25 -08:00
Andrew Meadows
4edc6cd88b
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-10 15:42:56 -08:00
Philip Rosedale
ac9e2732b9
Merge pull request #1963 from birarda/authentication
...
default avatar head and body URLS
2014-02-10 15:42:53 -08:00
AndrewMeadows
c517675edb
Merge pull request #1931 from ey6es/master
...
Fix for textures on Blender FBX exports (such as jellyrob_blue_blender.fbx).
2014-02-10 14:27:44 -08:00
Andrew Meadows
e73c9f7095
It is now possible to "poke" moveable parts of the avatar skeleton.
2014-02-10 14:07:50 -08:00
Andrew Meadows
e2e02fc855
Removing bounding sphere measurement of hands -- not useful yet.
2014-02-10 14:04:32 -08:00
Stephen Birarda
3e90bcd523
use shorter default URLs, set as placeholder text in prefs
2014-02-10 11:28:22 -08:00
Stephen Birarda
712692f8bf
add fallback default URLs for head and body models
2014-02-10 11:15:35 -08:00
Stephen Birarda
230caf5b27
add the default body and head to the resources directory
2014-02-10 10:26:28 -08:00
Stephen Birarda
27305c7a43
change default domain to root, don't double load domains on startup
2014-02-10 10:23:06 -08:00
Andrew Meadows
e5a700bf79
Fix crash -- use correct index.
2014-02-10 09:59:22 -08:00
Andrew Meadows
be1aaee359
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-10 09:05:08 -08:00
Andrew Meadows
10296577f4
More info when colliding with meshes + stubbery for poking avatar.
2014-02-10 09:02:29 -08:00
ZappoMan
bdf5c7a6b7
changed stopKeepLookingAt() to stopLooking()
2014-02-09 23:26:46 -08:00
ZappoMan
221a5c75c7
remove debug
2014-02-09 23:22:10 -08:00
ZappoMan
d5447452ae
more work on lookAt behavior
2014-02-09 21:06:32 -08:00
ZappoMan
c64a530be4
first cut at lookAt
2014-02-09 16:24:38 -08:00
ZappoMan
e35df7904b
cleanup bad merge
2014-02-09 12:32:12 -08:00
ZappoMan
fe1a6b8f29
improvements to rotating gesture detection
2014-02-09 12:29:57 -08:00
ZappoMan
dca0b05927
added easier support for calculating multitouch rotating behavior including deltaAngle, isRotating, rotating(direction) properties
2014-02-09 12:08:17 -08:00
ZappoMan
3bf8dd87e8
Merge branch 'master' of https://github.com/worklist/hifi into more_events
2014-02-09 10:32:14 -08:00
ZappoMan
d2b3e74f5d
added isPinching and isPinchOpening to touch events
2014-02-09 02:02:42 -08:00
Philip Rosedale
cfa7f5e6ca
Add drag to add more voxels, turn off hover orbit voxels until in the script as function key
2014-02-08 23:17:04 -08:00
Philip Rosedale
9655e93432
Remove re-coloring of voxels on hover or click, anticipating switch to scripted behavior
2014-02-08 19:13:43 -08:00
Philip Rosedale
c6bf11361e
Merge branch 'master' of https://github.com/worklist/hifi
2014-02-08 16:52:28 -08:00
Philip Rosedale
03bc5adf64
Add Audio Noise Reduction
2014-02-08 16:35:37 -08:00
ZappoMan
ef7dee4387
Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting
2014-02-07 18:34:43 -08:00
Andrew Meadows
6b2c7c556d
Fixing mouselook.
...
Faceshift head rotations are stored separately and then integrated into
the final (rendered) head rotation at the right times but do not affect
the camera.
2014-02-07 17:46:14 -08:00
Andrew Meadows
8c3ba5b2de
Cruft removal. We don't use Head::YawRate stuff.
2014-02-07 17:45:25 -08:00
Andrew Meadows
3894fc0cb8
Minor comment change.
2014-02-07 17:44:43 -08:00
ZappoMan
802f72c732
more ray picking and intersection work
2014-02-07 15:06:32 -08:00
Andrzej Kapolka
a49ec2f11b
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-07 14:45:03 -08:00
Andrzej Kapolka
f6ca042ffc
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-07 14:33:25 -08:00
Stephen Birarda
a1a4a3db8a
HifiSockAddr to SharedNodePointer changes in MetavoxelServer
2014-02-07 14:27:10 -08:00
Andrzej Kapolka
9c3624d0d9
Fix for texture on jellyrob_blue_blender.fbx; apparently you can map textures,
...
as well as materials, by polygon. Closes #1844 .
2014-02-07 14:25:48 -08:00
Stephen Birarda
dd4d944dea
ping inactive nodes in conjunction with domain server check in
2014-02-07 14:06:42 -08:00
