Andrzej Kapolka
|
b62d2d85c3
|
Let's try actually releasing the camera when we turn it off.
|
2013-07-11 10:28:09 -07:00 |
|
Andrzej Kapolka
|
d59b9ce955
|
Flip x when in mirror mode, rather than special-casing all the head rotations.
Also fixed sideways leaning (was correct in mirror mode, incorrect in world).
|
2013-07-10 17:31:21 -07:00 |
|
Andrzej Kapolka
|
a03a46ad16
|
Merge branch 'master' of https://github.com/worklist/hifi into kinected
|
2013-07-10 16:36:21 -07:00 |
|
Andrzej Kapolka
|
100f7c19c3
|
Merge pull request #636 from PhilipRosedale/master
Touchlook tuned and always on!
|
2013-07-10 16:36:10 -07:00 |
|
Andrzej Kapolka
|
67afc61fd8
|
Merge branch 'master' of https://github.com/worklist/hifi into kinected
|
2013-07-10 15:16:38 -07:00 |
|
Andrzej Kapolka
|
559dc4bb5d
|
Flush the queue so that we don't get any funny data on the initial read.
|
2013-07-10 15:07:39 -07:00 |
|
Andrzej Kapolka
|
2ffd151a1f
|
Ryan likes the eyelids starting at forty degrees.
|
2013-07-10 14:40:45 -07:00 |
|
Andrzej Kapolka
|
6a5fb4f535
|
Removed unused variables, added motion driver library for OS X.
|
2013-07-10 14:28:06 -07:00 |
|
Andrzej Kapolka
|
53eb5ed0bb
|
No clock_gettime on OS X; must use gettimeofday.
|
2013-07-10 14:21:23 -07:00 |
|
Andrzej Kapolka
|
0aa1b396db
|
Merge branch 'master' of https://github.com/worklist/hifi into kinected
|
2013-07-10 14:08:03 -07:00 |
|
Andrzej Kapolka
|
6fe9a71868
|
Basic compass fusion.
|
2013-07-10 14:06:12 -07:00 |
|
Atlante45
|
7d94f65448
|
Linked ZLIB to voxels library
|
2013-07-10 13:00:16 -07:00 |
|
Atlante45
|
d79acea6a7
|
Merge branch 'master' of git://github.com/worklist/hifi into 19373
|
2013-07-10 12:46:50 -07:00 |
|
Stephen Birarda
|
70ccef0733
|
remove avatar data read and write to file
|
2013-07-10 12:37:23 -07:00 |
|
Philip Rosedale
|
dae79d8a55
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-07-10 12:20:45 -07:00 |
|
Philip Rosedale
|
2e854b5ed7
|
Tune and smooth 'Touch Look' and always turned on, old mouseLook code removed. Add vec3 speed test. Smooth simulation by passing exact deltaTime to update()
|
2013-07-10 12:20:26 -07:00 |
|
Stephen Birarda
|
488a4affd3
|
fix member variable initialization order to remove warnings
|
2013-07-10 09:59:14 -07:00 |
|
Andrzej Kapolka
|
a116f5a636
|
Use InvenSense code to handle the rather complicated business of talking the
sensor into giving us the compass reading. We're getting it now, but I still
have to figure out how to incorporate it.
|
2013-07-09 17:28:23 -07:00 |
|
atlante45
|
2e036a0e46
|
Merge branch 'master' of git://github.com/worklist/hifi into 19373
|
2013-07-09 17:56:18 +02:00 |
|
atlante45
|
dbdbd7a8c4
|
Incorporating comments for code review (minecraft import)
|
2013-07-09 17:55:55 +02:00 |
|
atlante45
|
3433cf5a98
|
Merge branch 'master' of git://github.com/worklist/hifi into 19373
|
2013-07-09 16:34:12 +02:00 |
|
atlante45
|
2c438e8af3
|
Fixed broken shortcut (Turn on/off voxels is now Shift + V)
|
2013-07-09 16:20:55 +02:00 |
|
atlante45
|
b3c0f3fedb
|
More code review for UI job
|
2013-07-09 15:29:12 +02:00 |
|
atlante45
|
c3b0be5c63
|
More consts for UI job
|
2013-07-09 14:49:01 +02:00 |
|
atlante45
|
3c4f8f5120
|
put hard coded numbers into variables for UI job
|
2013-07-09 14:17:42 +02:00 |
|
atlante45
|
5d4d0ba43e
|
Merge branch 'master' of git://github.com/worklist/hifi into 19373
|
2013-07-09 12:56:27 +02:00 |
|
atlante45
|
5703a60797
|
Merge branch 'master' of git://github.com/worklist/hifi into 19368
|
2013-07-09 10:25:58 +02:00 |
|
atlante45
|
d38c1f081c
|
Modified code according to review for UI job
|
2013-07-09 10:25:46 +02:00 |
|
Philip Rosedale
|
e9f8e50d49
|
Merge pull request #623 from machinelevel/dev4
Added safety checks to processEvents(), which was causing problems. Also...
|
2013-07-08 17:04:06 -07:00 |
|
Philip Rosedale
|
4936676cc1
|
Merge pull request #627 from ey6es/kinected
Basic depth camera support (only built in when OpenNI is available).
|
2013-07-08 16:57:10 -07:00 |
|
Eric Johnston
|
c298f78ae9
|
Fixed multi-touch event loop problems by selectively processing just the touch events.
|
2013-07-08 16:31:28 -07:00 |
|
Eric Johnston
|
7de2281226
|
Merge branch 'master' of https://github.com/worklist/hifi into dev4
|
2013-07-08 16:29:51 -07:00 |
|
Stephen Birarda
|
c2ad02def2
|
Merge pull request #625 from PhilipRosedale/master
Tuned smooth gyro look to feel better
|
2013-07-08 15:55:52 -07:00 |
|
Eric Johnston
|
14374fb0df
|
Merge branch 'master' of https://github.com/worklist/hifi into dev4
|
2013-07-08 15:31:11 -07:00 |
|
Andrzej Kapolka
|
b1050c633b
|
Suppress warnings for OpenNI.
|
2013-07-08 14:17:03 -07:00 |
|
Andrzej Kapolka
|
5f3a37139f
|
Merge branch 'master' of https://github.com/worklist/hifi into kinected
|
2013-07-08 14:04:42 -07:00 |
|
Andrzej Kapolka
|
c5c9debed5
|
Fix for combined gyro/depth camera.
|
2013-07-08 13:03:53 -07:00 |
|
Andrzej Kapolka
|
c43994fe03
|
Orientation -> rotation.
|
2013-07-08 12:54:27 -07:00 |
|
Andrzej Kapolka
|
4a22154737
|
Fix for leaning, smoothing.
|
2013-07-08 11:35:42 -07:00 |
|
atlante45
|
013aabc65c
|
Merge branch 'master' of git://github.com/worklist/hifi into 19373
|
2013-07-08 15:54:37 +02:00 |
|
atlante45
|
1f78c6461d
|
Merge branch 'master' of git://github.com/worklist/hifi into 19373
|
2013-07-08 13:37:55 +02:00 |
|
atlante45
|
6c840a9ec3
|
Functionnal version of minecraft import
|
2013-07-08 13:37:47 +02:00 |
|
Eric Johnston
|
4341e8596f
|
Merge branch 'master' of https://github.com/worklist/hifi into dev4
|
2013-07-07 22:19:13 -07:00 |
|
Andrzej Kapolka
|
357ac05d35
|
Removed debug logging.
|
2013-07-05 22:58:57 -07:00 |
|
Andrzej Kapolka
|
f9f2c66115
|
Merge branch 'master' of https://github.com/worklist/hifi into kinected
Conflicts:
interface/src/Application.cpp
interface/src/Avatar.cpp
interface/src/Avatar.h
libraries/avatars/src/AvatarData.h
|
2013-07-05 22:52:42 -07:00 |
|
Andrzej Kapolka
|
9c6e5b23e0
|
Alignment fixes.
|
2013-07-05 22:44:47 -07:00 |
|
Andrzej Kapolka
|
7a65ebbba3
|
Remove Freenect/LibUSB bits.
|
2013-07-05 22:17:59 -07:00 |
|
Andrzej Kapolka
|
9c977450e3
|
Finally got the rotations figured out; I had forgotten the default pose/bind
pose distinction.
|
2013-07-05 22:14:32 -07:00 |
|
Andrzej Kapolka
|
ff5d1455aa
|
More work on joint tracking.
|
2013-07-05 17:45:29 -07:00 |
|
tosh
|
c2e2ff0ffe
|
changes broadcast function in Application to use a different name but the same signature as in NodeList
|
2013-07-05 14:16:50 +02:00 |
|