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
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
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
Stephen Birarda
4a804a9960
Merge pull request #615 from ey6es/master
...
Fixes for gyros/webcam: restore rotation amplification, don't bother with gyro position or fusing webcam roll, blink faster.
2013-07-02 17:33:11 -07:00
Eric Johnston
5d59bcbec7
(changed per requests and re-merged) Two Leap-related crashes fixed, plus Leap improvements
...
1. Fixed thread-crash at terminate() time by terminating the LeapManager properly
2. Fixed an intermittent thread-crash when Leap active by removing auto-connection between controller and listener
3. Added fingerRoot positions to display and data packet
4. Introduced a vec3-based convention so that more finger data may be added without causing trouble for old clients and servers
5. My avatar's fingers are different color from others
2013-07-02 17:03:32 -07:00
Andrzej Kapolka
b660336b2a
Fix for camera movement with webcam enabled; don't bother using roll from
...
webcam if we have the gyros; reinstate head orientation scaling; don't bother
using gyro position.
2013-07-02 16:59:03 -07:00
ZappoMan
af1de263a4
fixed FOV preference to work with view frustum code properly
2013-07-02 16:58:31 -07:00
Andrzej Kapolka
bf4757663c
Merge pull request #609 from birarda/domain-stats
...
rework Logstash to handle various stat types, add domain server node count stat
2013-07-02 14:52:08 -07:00
Stephen Birarda
f7f321663a
DRY up multiple stat type sending
2013-07-02 14:42:31 -07:00
ZappoMan
147f090d56
Merge pull request #599 from PhilipRosedale/master
...
3P transition turned off, field of view now in preferences
2013-07-02 14:19:09 -07:00
Tomáš Horáček
6f6f0423a0
Merge remote-tracking branch 'worklist/master' into 19385
2013-07-02 23:05:50 +02:00
Stephen Birarda
64f3b55aaa
split logstash stash methods to stat types
2013-07-02 12:10:46 -07:00
Philip Rosedale
e7113d26f8
Add field of view as an option in preferences
2013-07-01 23:00:39 -07:00
Philip Rosedale
6fbab462f0
Merge branch 'master' of https://github.com/worklist/hifi
2013-07-01 22:30:06 -07:00
tosh
f062319c2b
introduces named constants for bandwidth meter channel indices / max. drag length
2013-07-02 03:53:49 +02:00
Tomáš Horáček
66de431d67
re #19385 : add hot-fix to allow import of big PNGs
...
sendVoxelsOperation() is sending data too fast, printf slows it down.
Better fix is required.
2013-07-02 02:57:55 +02:00
Tomáš Horáček
b5e5806988
re #19385 : fill gaps between neighbourhood voxels
2013-07-02 01:16:20 +02:00
Tomáš Horáček
c4c2d46847
re #19385 : first version of PNG import
...
works for size <= 128px
2013-07-02 01:16:20 +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
46f8136f2e
combined bandwidth display at automatic scale
2013-06-29 20:30:12 +02:00
tosh
c18400f8b7
Merge branch 'master' of git://github.com/worklist/hifi into 19377
2013-06-29 15:41:56 +02:00
Philip Rosedale
5025e89c25
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-28 16:36:08 -07:00
Philip Rosedale
c2ef960a9e
Changed horizontal field of view to a constant, made it 90 degrees
2013-06-28 16:31:59 -07:00
Philip Rosedale
8bac3b6a2b
Merge branch 'master' of https://github.com/worklist/hifi
2013-06-28 16:20:23 -07:00
Mark Peng
be2e6518a1
Fixed if statement formatting in displayStats() and timer() in Application.cpp
2013-06-28 16:20:05 -07:00
Mark Peng
53543c26fe
Added menu toggle for displaying ping
2013-06-28 16:02:49 -07:00
Mark Peng
745dc03c72
Fixed AGENT_TYPE typo in Application::displayStats()
2013-06-28 15:42:27 -07:00
Mark Peng
a5c6cee433
Renamed getPingTime() to getPingMs() in Agent.h, etc.
2013-06-28 15:33:08 -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
Philip Rosedale
a0e6c2869d
merge fix
2013-06-28 11:54:25 -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
Eric Johnston
1c797405da
Hand rework in preparation for adding send/receive hand data
...
- Added Hand.cpp, Hand.h, HandData.cpp, HandData.h, roughly matching the equivalent Head files
- Cleaned up Avatar by moving hand work into Hand files
- Added fixed-point data packing, for use in sending hand offsets
2013-06-28 07:57:02 -07:00
Philip Rosedale
27266ee3b2
Third person camera transition doesn't happen on movement.
2013-06-27 17:11:25 -07:00
