Andrzej Kapolka
|
ce9236e659
|
Merge pull request #537 from ey6es/master
Ryan's new iris texture.
|
2013-06-13 16:59:53 -07:00 |
|
Andrzej Kapolka
|
0f897340ee
|
New iris texture from Ryan.
|
2013-06-13 16:42:31 -07:00 |
|
Philip Rosedale
|
dd1df47c71
|
fixes per review
|
2013-06-13 16:20:28 -07:00 |
|
Philip Rosedale
|
e6e147d86a
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-13 16:09:28 -07:00 |
|
Andrzej Kapolka
|
e401663459
|
Added per-pixel specular highlight to irises.
|
2013-06-13 15:58:49 -07:00 |
|
Philip Rosedale
|
04736fefb5
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-13 15:04:41 -07:00 |
|
Philip Rosedale
|
f6e6ceddfe
|
Head camera scaling always one if gyros off so that mouse look works.
|
2013-06-13 14:53:10 -07:00 |
|
Andrzej Kapolka
|
466c062bc1
|
Use a bound texture for the iris, load it with Qt rather than lodepng (we can
probably just remove the lodepng dependency).
|
2013-06-13 14:41:06 -07:00 |
|
Philip Rosedale
|
1556886a64
|
fixing reversed lookat, rendering for all avatars
|
2013-06-13 14:33:09 -07:00 |
|
Philip Rosedale
|
8af0da754f
|
we are always looking at something
|
2013-06-13 14:21:14 -07:00 |
|
Philip Rosedale
|
687966c486
|
Other people's avatar's look where they are mousing
|
2013-06-13 14:04:51 -07:00 |
|
Philip Rosedale
|
e32f9f387a
|
Basic random eye movements added, and fixation on camera in mirror mode.
|
2013-06-13 13:50:56 -07:00 |
|
Andrzej Kapolka
|
78072fbde0
|
Merge pull request #523 from PhilipRosedale/master
Better physics, first person to third person transition
|
2013-06-13 12:07:06 -07:00 |
|
Philip Rosedale
|
b85f91a7d4
|
fixes per code review
|
2013-06-13 12:05:06 -07:00 |
|
Philip Rosedale
|
d517487d1b
|
OK I wanted us to jump just a bit higher.
|
2013-06-13 11:35:36 -07:00 |
|
Philip Rosedale
|
61b1a2f995
|
First person to third person transition driven by velocity, changes to make moving and flying physics more fun.
|
2013-06-13 11:31:41 -07:00 |
|
Andrzej Kapolka
|
db729a04aa
|
Converted double timestamps to long long (64 bit integers), fixed bug with
updating agent timestamps.
|
2013-06-13 11:11:59 -07:00 |
|
Philip Rosedale
|
c0ba2aeebe
|
Added jumping, tuned friction model, tuned thrust
|
2013-06-12 23:45:59 -07:00 |
|
Philip Rosedale
|
a5a0df09cb
|
removed grab voxel rendering
|
2013-06-12 16:36:55 -07:00 |
|
Philip Rosedale
|
3d1ddf047e
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-06-12 16:27:53 -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
|
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
|
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
|
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
|
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
|
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 |
|
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
|
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 |
|