Mark Peng
|
c5fe8b078e
|
ping reporter added to interface
|
2013-06-28 11:07:01 -07:00 |
|
ZappoMan
|
1fc3ad8011
|
CR feedback
|
2013-06-18 12:03:58 -07:00 |
|
ZappoMan
|
8b18ee6844
|
renamed VoxelProjectedShadow class
|
2013-06-18 12:01:01 -07:00 |
|
ZappoMan
|
46d7ada753
|
code cleanup
|
2013-06-18 10:21:47 -07:00 |
|
ZappoMan
|
8331fc1acb
|
removed some old debug code
|
2013-06-18 10:19:49 -07:00 |
|
ZappoMan
|
7fe6c0e3b3
|
added occlusion culling menu option
|
2013-06-18 09:34:12 -07:00 |
|
ZappoMan
|
c9e1c898c2
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-06-14 19:50:38 -07:00 |
|
Andrzej Kapolka
|
c11ab45474
|
It seems gl_ModelViewMatrixInverse is problematic on OS X; let's try passing
in the camera's position as transformed into model space.
|
2013-06-14 17:21:35 -07:00 |
|
Andrzej Kapolka
|
790cdfb0bd
|
Added refraction to irises.
|
2013-06-14 16:46:34 -07:00 |
|
Andrzej Kapolka
|
7d1679dab7
|
Ryan's new iris texture.
|
2013-06-14 14:35:56 -07:00 |
|
Andrzej Kapolka
|
5241c41ddd
|
Shed some light on what these shaders are doing, so to speak.
|
2013-06-14 11:29:32 -07:00 |
|
Andrzej Kapolka
|
ec0b1a99fb
|
Fix iris orientations: start with the head orientation, then rotate onto the
lookat vector. This way, the irises don't rotate around as we yaw.
|
2013-06-14 11:23:08 -07:00 |
|
Andrzej Kapolka
|
4f9f2fa4ca
|
Better iris texture.
|
2013-06-14 10:28:45 -07:00 |
|
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 |
|
ZappoMan
|
620a4a8ad6
|
latest occlusion culling with support for checking map without adding to coverage map for checking parent nodes
|
2013-06-13 16:37:14 -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 |
|
ZappoMan
|
40c2cf2d44
|
removed some dead code
|
2013-06-13 13:31:26 -07:00 |
|
ZappoMan
|
8320925add
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-06-13 13:30:18 -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 |
|
ZappoMan
|
72b2845178
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-06-13 09:40:45 -07:00 |
|
Philip Rosedale
|
c0ba2aeebe
|
Added jumping, tuned friction model, tuned thrust
|
2013-06-12 23:45:59 -07:00 |
|
ZappoMan
|
b8e51943ab
|
make sure position is in voxel units NOT TREE_SCALE
|
2013-06-12 21:45:45 -07:00 |
|
ZappoMan
|
0f234d739e
|
remove Camera menu from frustum debugging, because its obsolete and only causes problems
|
2013-06-12 21:44:49 -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 |
|
ZappoMan
|
627f61badb
|
some debug changes for testing occlusion culling
|
2013-06-12 12:36:28 -07:00 |
|