Mark Peng
62570f0804
Merge remote-tracking branch 'upstream/master'
2013-07-10 16:01:28 -07:00
Mark Peng
0b334f9e5d
Make lookAtVectors lock on other avatar's eyes if the mouse is over
...
the other avatar's head.
Add rayIntersectsSphere function to Util. glm::intersectRaySphere was buggy.
2013-07-10 15:56:23 -07:00
Atlante45
7d94f65448
Linked ZLIB to voxels library
2013-07-10 13:00:16 -07:00
Mark Peng
4b6e7f1079
Merge remote-tracking branch 'upstream/master' into eyecontact
2013-07-10 11:57:08 -07:00
Mark Peng
e4e7966075
Add print statements to debug eyecontact code in Application.cpp.
2013-07-10 11:56:16 -07:00
Mark Peng
61ad33d9d0
Merge remote-tracking branch 'upstream/master' into eyecontact
2013-07-09 16:29:56 -07:00
Mark Peng
2a25c97446
Change LookAtPosition of Head to the eye level of another avatar,
...
if looking at another avatar in Application.cpp.
Add eyePosition to Head class and bool isLookingAtOther.. in Application.cpp.
2013-07-09 16:22:41 -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
5f3a37139f
Merge branch 'master' of https://github.com/worklist/hifi into kinected
2013-07-08 14:04: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
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
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
tosh
2da132be65
upstream merge
2013-07-04 21:21:11 +02:00
tosh
689794259d
Merge branch 'master' of git://github.com/worklist/hifi into 19376
...
Conflicts:
interface/src/Application.cpp
2013-07-04 21:20:36 +02:00
Philip Rosedale
d70eb38542
Properly make the goHome() function in slot group
2013-07-03 23:43:53 -07:00
Philip Rosedale
92cec4cfa0
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-03 22:55:09 -07:00
Philip Rosedale
2de6d3eb6a
Make 'Go Home' an option from the options because it conflicts with 'G' for gravity on/off
2013-07-03 22:55:01 -07:00
Eric Johnston
3ea100e595
Added safety checks to processEvents(), which was causing problems. Also narrowed the scope of the events processed.
...
It can now be disabled in the interface by un-checking touch-look, which most people don't use yet.
Also, the event processing time should be limited to 1 ms.
2013-07-03 15:33:18 -07:00
Stephen Birarda
0be42698b5
resolve conflicts on merge with upstream master
2013-07-03 15:12:50 -07:00
Stephen Birarda
8a4dc8446b
what is July 3rdg
2013-07-03 15:05:51 -07:00
Stephen Birarda
e85e49ef3b
add a comment to disable of processEvents
2013-07-03 14:31:28 -07:00
Stephen Birarda
0e68942674
comment out processEvents to remove event receipt bug
2013-07-03 14:27:07 -07:00
Philip Rosedale
3388fccc86
Fixes per code review
2013-07-03 13:09:55 -07:00
Philip Rosedale
c309774e3c
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-03 13:01:21 -07:00
Eric Johnston
acef2bc669
Fixed two-finger touch delay, and all other hidden event-pile-up.
...
Added a processEvents() call in the idle, because otherwise calling idle updates starves the event handlers.
2013-07-03 11:37:38 -07:00
Philip Rosedale
7880c74304
smooth gyro look on by default if not in settings
2013-07-03 11:17:06 -07:00
Philip Rosedale
bf4bc22fbf
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-03 11:11:00 -07:00
Philip Rosedale
1868717520
Improve gyro look to smoothly follow the head and not move for small movements
2013-07-03 11:10:40 -07:00
Stephen Birarda
36c6912de8
your agents are now nodes
2013-07-03 10:35:09 -07:00
Andrzej Kapolka
e866c22518
Merge branch 'master' of https://github.com/worklist/hifi into kinected
...
Conflicts:
interface/src/Avatar.cpp
2013-07-03 10:15:11 -07:00
Eric Johnston
fd2009738b
Merge branch 'master' of https://github.com/worklist/hifi into dev4
2013-07-03 09:56:00 -07:00
Stephen Birarda
00fa688aba
Merge pull request #614 from machinelevel/dev4
...
(changed per requests and re-merged) Two Leap-related crashes fixed, plu...
2013-07-03 09:53:40 -07:00
