Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 09:13:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4292 commits 25 branches 0 tags 1.1 GiB
Commit graph

2353 commits

Author SHA1 Message Date
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
5df09b2932 remove debugging printf 2013-07-03 23:20:55 -07:00
Philip Rosedale
0f312d4c9b Tuned smooth gyro look values to feel better. 2013-07-03 23:17:43 -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
Andrzej Kapolka
43258f9dcd Use 15 blinks per minute as a base/maximum frequency. 2013-07-03 17:12:43 -07:00
Andrzej Kapolka
30f77975cf Trying to get the right rotations, send them on the wire. 2013-07-03 17:07:22 -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
c8b86c651f Merge pull request #622 from birarda/master 
remove an extra g
 2013-07-03 15:06:23 -07:00
Stephen Birarda
8a4dc8446b what is July 3rdg 2013-07-03 15:05:51 -07:00
ZappoMan
f0fdacbba8 Merge pull request #621 from birarda/master 
remove pre-build fervor error, comment out process event bug
 2013-07-03 15:05:46 -07:00
Stephen Birarda
e85e49ef3b add a comment to disable of processEvents 2013-07-03 14:31:28 -07:00
Stephen Birarda
c44e231ab5 Merge pull request #620 from machinelevel/dev4 
[trivial] small bracket fix per request in https://github.com/worklist/h...
 2013-07-03 14:29:59 -07:00
Stephen Birarda
0e68942674 comment out processEvents to remove event receipt bug 2013-07-03 14:27:07 -07:00
Stephen Birarda
23e1fab9be Merge branch 'master' of github.com:worklist/hifi 2013-07-03 14:13:37 -07:00
Eric Johnston
fe46a3f0c9 [trivial] small bracket fix per request in https://github.com/worklist/hifi/pull/618/files 2013-07-03 13:11:26 -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
Stephen Birarda
331351765e remove fvversioncomparator from headers passed to qt4 2013-07-03 12:51:26 -07:00
Eric Johnston
e8ee041f20 Virtual method warning removal. 
Warning was "Delete called on HifiLeapListener that has virtual functions but non-virtual destructor"
 2013-07-03 11:46:53 -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
Andrzej Kapolka
ebab09e535 More work on joints. 2013-07-03 10:13:10 -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
tosh
a542ebc851 bandwidth meter - avoid division by zero 2013-07-03 14:01:09 +02:00
Eric Johnston
cf8257d3e9 fixed curly-braces per request 2013-07-02 17:49:43 -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
Andrzej Kapolka
4ecb4ab3c6 Restore the amplification; blink faster. 2013-07-02 17:14:54 -07:00
Andrzej Kapolka
a1d0f255cc Not crazy about the rotation amplification. 2013-07-02 17:03:37 -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
1fdfca727d More work on Kinect-driven joints. 2013-07-02 16:49:07 -07:00
Stephen Birarda
f2dbad4e57 resolve conflicts on merge with upstream master 2013-07-02 15:42:36 -07:00
Stephen Birarda
1993601389 don't link a NOTFOUND leap library 2013-07-02 15:27:30 -07:00
Andrzej Kapolka
4f01db6dc7 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-02 14:52:22 -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
Andrzej Kapolka
c4deeed121 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-02 14:51:45 -07:00
Andrzej Kapolka
52e7ff9a68 Working on filling in missing joint data. 2013-07-02 14:51:27 -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
Andrzej Kapolka
2a0d3310de Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-02 09:46:07 -07:00
atlante45
b062295ecb Merge with master 2013-07-02 16:22:39 +02:00
atlante45
78aa3ac9f9 Added UI responsivness 2013-07-02 16:17:25 +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
atlante45
05a77bf373 Forgot to add .svg file 2013-07-02 09:29:11 +02: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
Andrzej Kapolka
d2e9686c81 Need to resize this. 2013-07-01 17:52:17 -07:00
Andrzej Kapolka
095782af45 Smooth the joints, get the head position/orientation from there. 2013-07-01 17:46:05 -07: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
Andrzej Kapolka
da6a9a342a Need to wrap the using statement in ifdef, too. 2013-07-01 15:07:10 -07:00
Andrzej Kapolka
182f4e70af More work on skeleton tracking. 2013-07-01 15:01:36 -07:00
tosh
7ebd912788 improves defaults and inline documentation of bandwidth meter layout constants 2013-07-01 23:38:00 +02:00
Andrzej Kapolka
4e9595f794 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-01 09:49:01 -07:00
Andrzej Kapolka
a1cab3ddc6 Working on getting skeleton data. 2013-07-01 09:48:36 -07:00
atlante45
8cc3f202ab Merge with upstream master 2013-07-01 17:12:05 +02:00
atlante45
45e13fda15 More UI improvements 2013-07-01 16:34:43 +02:00
Grayson Stebbins
60bea894d8 UI improvements 2013-07-01 10:32:36 -07:00
tosh
3f62edd68e makes bandwidth details dialog properly close (and reopen) on ESC key 2013-07-01 10:53:49 +02:00
tosh
639858dfc9 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-07-01 10:29:56 +02:00
tosh
98589adef5 Bandwidth meter: Bytes -> bits, number formatting (colors, digits, aligment) on dialog 2013-07-01 10:28:17 +02:00
Philip Rosedale
138b8d7f64 Merge pull request #585 from birarda/owning-agent 
boolean helper for Avatar isMyAvatar check
 2013-06-30 23:26:32 -07: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
fdf9f10e82 increases height of bandwidth meters by 8 pixels 2013-06-30 17:32:44 +02: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
435b958671 polishes bandwidth meter 2013-06-29 20:52:07 +02:00
tosh
46f8136f2e combined bandwidth display at automatic scale 2013-06-29 20:30:12 +02:00
tosh
c88642bac2 keeps audio from crashing when sound device is unavailable 2013-06-29 15:58:25 +02:00
tosh
c18400f8b7 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-06-29 15:41:56 +02:00
Andrzej Kapolka
b4b09b0070 Back up and running, now with OpenNI rather than libfreenect. 2013-06-28 17:31:49 -07:00
Andrzej Kapolka
ea9566596a Build OpenNI/NITE into interface if available. 2013-06-28 16:47:08 -07: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
Stephen Birarda
800bcdfd18 Merge pull request #598 from LionTurtle/master 
Added menu toggle for displaying ping
 2013-06-28 16:26:10 -07:00
Philip Rosedale
c09fa3cc62 Turned avatar balls off 2013-06-28 16:22:56 -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
Andrzej Kapolka
884f14dca1 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-06-28 16:06:58 -07:00
Andrzej Kapolka
f602e1643b Remove references to LibUSB/Freenect. 2013-06-28 16:06:42 -07:00
Mark Peng
53543c26fe Added menu toggle for displaying ping 2013-06-28 16:02:49 -07:00
Stephen Birarda
02b37febad Merge pull request #597 from LionTurtle/master 
fix typo grabbing avatar mixer agent
 2013-06-28 15:57:33 -07:00
Andrzej Kapolka
c4d7cea968 Remove skeltrack from CMakeLists.txt. 2013-06-28 15:57:27 -07:00
Mark Peng
745dc03c72 Fixed AGENT_TYPE typo in Application::displayStats() 2013-06-28 15:42:27 -07:00
Stephen Birarda
eedaf5f76e Merge pull request #593 from LionTurtle/master 
ping reporter added to interface
 2013-06-28 15:34:46 -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