Philip Rosedale
3d1ddf047e
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-12 16:27:53 -07:00
Andrzej Kapolka
26a8607334
Merge pull request #531 from ey6es/master
...
Fixed bug with packet type filtering, have client bind to an ephemeral port by default so that we can run multiple clients without having to manually specify ports.
2013-06-12 16:16:29 -07:00
Andrzej Kapolka
ccd61ee5a2
Found the problem we were having: the domain server was reporting back all
...
kinds of things as our ID.
2013-06-12 16:13:44 -07:00
Andrzej Kapolka
19180ad900
Put the debugging back in.
2013-06-12 15:56:28 -07:00
Andrzej Kapolka
6dae9db01d
Initialize members in the right order.
2013-06-12 15:54:13 -07:00
Andrzej Kapolka
e4ed9162b9
This should help, as well as fix another annoyance: bind to an ephemeral port,
...
rather than a fixed one.
2013-06-12 15:52:29 -07:00
Philip Rosedale
311b09eee0
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-12 14:30:48 -07:00
Andrzej Kapolka
f197b4cd62
Some debugging to use on the other machine.
2013-06-12 14:20:28 -07:00
Andrzej Kapolka
da78c70a68
Merge pull request #530 from ey6es/master
...
Fix for previous fix: we need to call trigger in order to get the camera handling.
2013-06-12 13:53:11 -07:00
Andrzej Kapolka
b28df17207
Slight tweak: we need to call trigger in order to get the full toggle
...
behavior.
2013-06-12 13:51:16 -07:00
Andrzej Kapolka
0463e66972
Merge pull request #529 from ey6es/gyroquat
...
Make sure first person mode and mirror mode are mutually exclusive.
2013-06-12 13:33:22 -07:00
Andrzej Kapolka
178996bb8b
Make sure first person mode and mirror mode are mutually exclusive.
2013-06-12 13:30:41 -07:00
Philip Rosedale
6cffb16279
merge fixes
2013-06-12 13:29:17 -07:00
Andrzej Kapolka
0c80a66f84
Merge pull request #528 from ey6es/gyroquat
...
Added configurable lean scale, fixed loadSetting.
2013-06-12 13:09:02 -07:00
Andrzej Kapolka
52c616b688
Added configurable lean scale, fixed loadSetting.
2013-06-12 13:06:28 -07:00
Philip Rosedale
26ca1a9a1d
Remove shortcut on ground plane 'G', was conflicting with turning gravity on/off
2013-06-12 12:58:45 -07:00
Philip Rosedale
6164e6cd7e
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-12 11:37:24 -07:00
Philip Rosedale
3546bcc101
Avatar can set velocity, velocity set to zero on reset
2013-06-12 11:36:28 -07:00
Andrzej Kapolka
e9645ea417
Merge pull request #527 from ey6es/gyroquat
...
Function cleanup, fixed misspelling, transparency fix.
2013-06-12 10:31:17 -07:00
Andrzej Kapolka
59c8d9d26a
Function cleanup, fixed misspelling, tweaked transparency distances to
...
accomodate lean.
2013-06-12 10:25:28 -07:00
Philip Rosedale
750d210f0a
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-11 21:20:39 -07:00
Philip Rosedale
ad58d0aa23
Adding voxel thrust on grabbing/dragging to move avatar
2013-06-11 21:19:58 -07:00
Philip Rosedale
35feb9d78d
Merge pull request #526 from ey6es/gyroquat
...
More changes to gyros: attempt to subtract angular influence from linear acceleration, use estimated position to effect lean, displayed as bending at the waist.
2013-06-11 21:17:31 -07:00
Andrzej Kapolka
c58eb0d584
Bump the maximum voxels up to 10000.
2013-06-11 18:11:42 -07:00
Andrzej Kapolka
7ef2a2c5d9
Set/get lean to/from network data.
2013-06-11 18:06:05 -07:00
Andrzej Kapolka
82f03ffd8e
Don't render the voxels when we're too close (i.e., in first person mode).
2013-06-11 17:53:49 -07:00
Andrzej Kapolka
648aacb53d
Let's use a fixed vector for the camera position so that the target doesn't
...
move with lean.
2013-06-11 17:26:41 -07:00
Andrzej Kapolka
70c5a941d7
Now let's try using the estimated position to calculate lean.
2013-06-11 17:01:06 -07:00
Andrzej Kapolka
c1c2439d2c
Let's try changing the torso rotation based on the gyros!
2013-06-11 16:44:21 -07:00
Andrzej Kapolka
35e18abcbd
Let's try using estimated velocity to control "lean."
2013-06-11 16:27:39 -07:00
Andrzej Kapolka
627fd49003
Merge branch 'master' of https://github.com/worklist/hifi into gyroquat
2013-06-11 16:01:52 -07:00
Andrzej Kapolka
211b638701
Merge pull request #524 from ey6es/master
...
Fix for voxel screwiness on pressing delete/backspace in the chat entry field.
2013-06-11 16:01:16 -07:00
Andrzej Kapolka
ee526265a1
Fix for nibble packing.
2013-06-11 16:00:14 -07:00
Andrzej Kapolka
090df81afe
Fixes to align better with previous code.
2013-06-11 15:58:50 -07:00
Andrzej Kapolka
e77aee3967
Show the average rotation rates, too.
2013-06-11 15:47:05 -07:00
Andrzej Kapolka
d913f8dec0
Actually, we want it sans gravity.
2013-06-11 14:25:05 -07:00
Andrzej Kapolka
4b890e2ccc
Let's see what the long-term average acceleration is.
2013-06-11 14:23:47 -07:00
Andrzej Kapolka
47bd3bcdd7
Don't estimate acceleration before we know the gravity and don't update our
...
matrices without acceleration.
2013-06-11 14:03:49 -07:00
Andrzej Kapolka
b88380db6f
New values, slower learning.
2013-06-11 13:43:29 -07:00
Andrzej Kapolka
5ba1d3a28c
It ain't perfect, but I'm going with what I've got for now.
2013-06-11 13:18:13 -07:00
Andrzej Kapolka
517bbe80a7
Initial values, report error.
2013-06-11 13:02:20 -07:00
Andrzej Kapolka
ff9e6f831c
Revert to previous coordinates.
2013-06-11 11:31:01 -07:00
Andrzej Kapolka
bf389de774
Testing a different coordinate conversion.
2013-06-11 11:22:43 -07:00
Philip Rosedale
57fcaceec2
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-11 11:10:41 -07:00
Philip Rosedale
b1e3a0984b
Improved mouse look behavior to be smoother, removed transmitter debug.
2013-06-11 11:10:09 -07:00
Andrzej Kapolka
73ceea7795
Working on "learning" the acceleration matrices.
2013-06-11 10:55:28 -07:00
ZappoMan
74d63cdd1d
Merge pull request #522 from birarda/conditional-ds
...
allow agents to specify which agent types they want to hear about
2013-06-11 00:47:36 -07:00
Andrzej Kapolka
988c4f97b0
This should be the normalized offset.
2013-06-10 18:43:11 -07:00
Andrzej Kapolka
a34f9a0ef3
Need to include SharedUtil.
2013-06-10 18:41:49 -07:00
Andrzej Kapolka
90ef6a7cc0
Attempting to perform the transform between angular and linear acceleration.
2013-06-10 18:40:07 -07:00