ZappoMan
|
c26e39764a
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-07-11 13:50:33 -07:00 |
|
ZappoMan
|
57ce20d3ce
|
add support for Low Res sending while moving
|
2013-07-11 12:43:43 -07:00 |
|
Stephen Birarda
|
fcb8865d2e
|
resolve conflicts on merge with upstream master
|
2013-07-11 10:58:45 -07:00 |
|
Mark Peng
|
24d32bcdc8
|
Fix style mistakes according to code review for eyecontact code.
|
2013-07-11 10:40:57 -07:00 |
|
ZappoMan
|
9aed3d3cc6
|
enable delta sending by default
|
2013-07-11 10:37:28 -07:00 |
|
Mark Peng
|
083e0e9d06
|
Merge remote-tracking branch 'upstream/master'
|
2013-07-11 10:20:41 -07:00 |
|
ZappoMan
|
dc70675c22
|
removed obsolete ResIn mode
|
2013-07-10 19:04:28 -07:00 |
|
ZappoMan
|
3d3eca9afa
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-07-10 17:45:04 -07:00 |
|
ZappoMan
|
78611e30e7
|
make occlusion culling default
|
2013-07-10 17:21:40 -07:00 |
|
ZappoMan
|
1831cc0de3
|
removed level param from recursion
|
2013-07-10 17:06:22 -07:00 |
|
Mark Peng
|
baf9edecc9
|
Merge remote-tracking branch 'upstream/master'
|
2013-07-10 16:51:53 -07:00 |
|
ZappoMan
|
4afda27ee0
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-07-10 16:28:51 -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 |
|
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 |
|
ZappoMan
|
44357fcfb9
|
add 'level' param to tree recursion
|
2013-07-09 13:17:21 -07: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
|
95ac0a891f
|
Merge
|
2013-07-08 16:17: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 |
|
Stephen Birarda
|
5062ae8965
|
rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning
|
2013-07-08 11:37:39 -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
|
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 |
|
ZappoMan
|
c0d14d2bd4
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-07-03 15:36:41 -07:00 |
|
Stephen Birarda
|
36c6912de8
|
your agents are now nodes
|
2013-07-03 10:35:09 -07:00 |
|
ZappoMan
|
1e19748a1a
|
Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling
|
2013-07-02 15:52:49 -07:00 |
|
atlante45
|
b062295ecb
|
Merge with master
|
2013-07-02 16:22:39 +02:00 |
|
tosh
|
f3ab3b6c83
|
prevents voxel data from being sent or received (read: requested) when voxel rendering is disabled
also adds a menu option under "Tools" to enable/disable the Oscilloscope
|
2013-07-02 12:41:34 +02:00 |
|
Philip Rosedale
|
e7113d26f8
|
Add field of view as an option in preferences
|
2013-07-01 23:00:39 -07:00 |
|
atlante45
|
45e13fda15
|
More UI improvements
|
2013-07-01 16:34:43 +02:00 |
|
tosh
|
639858dfc9
|
Merge branch 'master' of git://github.com/worklist/hifi into 19377
|
2013-07-01 10:29:56 +02:00 |
|
Philip Rosedale
|
d464ae4158
|
Merge pull request #578 from birarda/fervor
add an autoupdater for release OS X builds
|
2013-06-30 23:25:42 -07:00 |
|
tosh
|
f1e5a56347
|
adds code to show bandwidth details upon click and adds a checkbox to the menu to set visibility of the bandwidth bars
|
2013-06-30 17:08:01 +02:00 |
|
tosh
|
c18400f8b7
|
Merge branch 'master' of git://github.com/worklist/hifi into 19377
|
2013-06-29 15:41:56 +02:00 |
|
ZappoMan
|
73ad854235
|
latest version of quadtree coverage map
|
2013-06-28 22:05:32 -07:00 |
|
Mark Peng
|
53543c26fe
|
Added menu toggle for displaying ping
|
2013-06-28 16:02:49 -07:00 |
|
Mark Peng
|
0aa3227228
|
Merge remote-tracking branch 'upstream/master'
|
2013-06-28 15:26:34 -07:00 |
|
Mark Peng
|
293031de6f
|
ping reporter added to interface take 3
|
2013-06-28 13:03:30 -07:00 |
|
Mark Peng
|
ee005f19d9
|
ping reporter added to interface take 2
|
2013-06-28 11:17:52 -07:00 |
|
Mark Peng
|
c5fe8b078e
|
ping reporter added to interface
|
2013-06-28 11:07:01 -07:00 |
|
Stephen Birarda
|
800bfd097b
|
alphabetize some includes in Application header
|
2013-06-26 10:35:17 -07:00 |
|
atlante45
|
52d62185ee
|
Merge branch 'master' of https://github.com/worklist/hifi into 19368
|
2013-06-25 00:24:54 +02:00 |
|
atlante45
|
d6c70ea6ca
|
#19368 - Improve editing/building workflow in Interface
|
2013-06-25 00:24:21 +02:00 |
|
tosh
|
7690ace2c3
|
Merge branch 'master' of git://github.com/worklist/hifi into 19377
Conflicts:
interface/src/Audio.cpp
|
2013-06-22 05:35:31 +02:00 |
|
tosh
|
290c20bfc7
|
introduces bandwidth meter / dialog
|
2013-06-22 04:22:10 +02:00 |
|
Andrzej Kapolka
|
ef7c6ebdc6
|
Basic blinking.
|
2013-06-21 18:11:31 -07:00 |
|
birarda
|
bd0d820fc7
|
Merge pull request #556 from PhilipRosedale/master
Dynamic jitter buffer for less stuttering, fixes to stereo
|
2013-06-21 14:29:45 -07:00 |
|