Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-06 16:09:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
4279 commits 69 branches 57 tags 1.2 GiB
Commit graph

482 commits

Author SHA1 Message Date
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
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
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
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
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
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
Stephen Birarda
73a8882a9e resolve conflicts on merge with upstream master 2013-06-27 15:22:21 -07:00
Eric Johnston
b4f5df17ab (re-commit) Added support for Leap finger-sensing device. 
Note that the actual Leap SDK can't be in the repo for IP reasons, so there's a stub-version of the header. When the actual SDK is put into the Leap folder, cake will find it automatically and switch over.
 2013-06-27 10:54:36 -07:00
Philip Rosedale
6cd25294b4 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-26 18:22:16 -07:00
Philip Rosedale
4a241d6220 turned off voxel grabbing 2013-06-26 18:21:40 -07:00
Stephen Birarda
1c0b256f92 remove echo cancellation from audio code 2013-06-26 16:22:54 -07:00
Stephen Birarda
383b6ecec2 use correct future appcast URL 2013-06-26 11:27:55 -07:00
Stephen Birarda
949395348f switch to silent update checking 2013-06-26 10:42:07 -07:00
Stephen Birarda
0b243ec881 add fervor updater and run during launch if OS X release 2013-06-26 10:36:32 -07:00
atlante45
ee15739e7e few fixes on the job 19368 2013-06-25 01:28:31 +02: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
4f692aeb56 improves bandwidth meter layout / simplifies & fixes rendering 2013-06-22 05:07:01 +02:00
tosh
290c20bfc7 introduces bandwidth meter / dialog 2013-06-22 04:22:10 +02: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
Philip Rosedale
12ef87e073 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-21 14:23:49 -07:00
Andrzej Kapolka
483407a3f2 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 14:09:38 -07:00
Andrzej Kapolka
0000eac95f Implementation parameter name should match interface parameter name. 2013-06-21 14:02:35 -07:00
Eric Johnston
6825274b65 Re-issue of change which adds two-finger touch look to avatar. 
The option is un-checked by default because of an unsolved problem: We're getting the events into Qt very slowly, so input from several seconds ago is still active when the user has stopped the touch action. This needs to be fixed before this can be turned on full-time.
Corrections were made per feedback, and the change has been merged with the latest.
 2013-06-21 13:43:23 -07:00
Philip Rosedale
6eafd6582e Merge branch 'master' of https://github.com/worklist/hifi 2013-06-21 11:42:29 -07:00
Philip Rosedale
1f6fd31b52 Merge pull request #568 from ey6es/opencv 
Head roll, lean from webcam data.
 2013-06-21 11:41:21 -07:00
Andrzej Kapolka
0e223b90d9 Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-21 11:35:23 -07:00
Andrzej Kapolka
00eba63e4e Added various options to test for voxel avatars, manual third person mode 
(also, cleaned up the camera switching a little).
 2013-06-21 11:33:38 -07:00
Philip Rosedale
13b729d9b4 Fixed problems with ring buffer not handling stereo right, reset audio buffers on spacebar. 2013-06-20 18:49:05 -07:00
Stephen Birarda
8b7b0d542a send the interface startup time to log stash 2013-06-20 15:34:17 -07:00
Andrzej Kapolka
b0dd5223e1 Avatar head roll/lean based on webcam data. 2013-06-20 14:20:03 -07:00
Andrzej Kapolka
b14a0c1554 Reset webcam along with other sensors on spacebar, added settings config for 
non-Apple.
 2013-06-20 11:44:47 -07:00
Philip Rosedale
c740400224 Merge fixes plus auto jitter buffer 2013-06-20 10:54:58 -07:00
Philip Rosedale
2c8c34f9bd set jitter buffer on application start to 1/2 of a packet 2013-06-20 09:08:37 -07:00
ZappoMan
517ff0f3cf Merge pull request #565 from tschw/19371 
Code Review for Job #19371
 2013-06-19 21:08:55 -07:00
Philip Rosedale
5dae92d610 Merge pull request #560 from ZappoMan/occlusion_culling 
Occlusion culling optimizations
 2013-06-19 19:26:56 -07:00
tosh
72a29979d0 Merge branch 'master' of git://github.com/worklist/hifi into 19371 
Conflicts:
	interface/CMakeLists.txt
 2013-06-20 03:46:25 +02:00
ZappoMan
cadd596508 implement partitioned CoverageRegions in CoverageMap to further optimize polygon compares 2013-06-19 17:52:01 -07:00
Philip Rosedale
3304f0eb2e Merge branch 'master' of https://github.com/worklist/hifi 2013-06-19 16:03:20 -07:00
Philip Rosedale
bc374d0183 More audio tweaks 2013-06-19 16:02:56 -07:00
tosh
651dc19427 separates echo cancellation from loopback test (intermediate commit) 2013-06-19 23:55:15 +02:00
Andrzej Kapolka
68371f8c3f Merge branch 'master' of https://github.com/worklist/hifi into opencv 2013-06-19 11:04:12 -07:00
Andrzej Kapolka
352f7ca3cf Provide option to enable/disable webcam (disabled by default). 2013-06-19 10:46:54 -07:00
Andrzej Kapolka
dbde66cbd5 Use trigger to change the state of the menu actions; that way, we get the 
callbacks.
 2013-06-19 10:32:55 -07:00
tosh
7342b7a774 Merge branch 'master' of git://github.com/worklist/hifi into 19371 2013-06-19 16:15:38 +02:00
Andrzej Kapolka
9e92ea03da Rather than copying to a QImage, just send the pointer. Also, put the render 
code in Webcam itself.
 2013-06-18 12:13:40 -07:00
ZappoMan
46d7ada753 code cleanup 2013-06-18 10:21:47 -07:00
ZappoMan
8331fc1acb removed some old debug code 2013-06-18 10:19:49 -07:00
ZappoMan
7fe6c0e3b3 added occlusion culling menu option 2013-06-18 09:34:12 -07:00
Philip Rosedale
002f8c736f Added adjustable audio jitter buffer (in preferences), and simple lowPassFilter (for pert testing compared to LPF) 2013-06-17 18:30:02 -07:00
Andrzej Kapolka
a771f53df3 Read the webcam frames in a separate thread, since the call blocks. 2013-06-17 18:07:53 -07:00
Andrzej Kapolka
3c58f0c0a7 Must init webcam after OpenGL. 2013-06-17 16:24:47 -07:00
Andrzej Kapolka
c7ddc89803 Basic frame grab from camera; not currently working yet, but let's try on 
OS X!
 2013-06-17 15:06:40 -07:00
tosh
e3da925e46 Merge branch 'master' of git://github.com/worklist/hifi into 19371 2013-06-17 07:18:19 +02:00
tosh
66f350d846 echo cancellation: ui, calibration, visualization 2013-06-17 07:16:29 +02:00
ZappoMan
c9e1c898c2 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-14 19:50:38 -07:00
Philip Rosedale
04736fefb5 Merge branch 'master' of https://github.com/worklist/hifi 2013-06-13 15:04:41 -07:00
Philip Rosedale
f6e6ceddfe Head camera scaling always one if gyros off so that mouse look works. 2013-06-13 14:53:10 -07:00
Philip Rosedale
1556886a64 fixing reversed lookat, rendering for all avatars 2013-06-13 14:33:09 -07:00
Philip Rosedale
687966c486 Other people's avatar's look where they are mousing 2013-06-13 14:04:51 -07:00