Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 08:13:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4150 commits 71 branches 56 tags 1.2 GiB
Commit graph

4150 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
04a28d3ab5 Merge pull request #617 from PhilipRosedale/master 
Smooth gyro look that won't make you throw up
 2013-07-03 13:11:50 -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
fc3ce26c70 Merge pull request #618 from machinelevel/dev4 
Fixed two-finger touch delay, and all other hidden event-pile-up.
 2013-07-03 12:09:46 -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
Eric Johnston
010fe7fadd 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:27:15 -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
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
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
Stephen Birarda
58ca268b34 Merge pull request #613 from ZappoMan/bug_fixes 
fixed FOV preference to work with view frustum code properly
 2013-07-02 17:07:19 -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
Leonardo Murillo
e85f498ef3 Merge pull request #612 from birarda/domain-stats 
flip mixer and domain server stat to timer to avoid logstash/graphite bug
 2013-07-02 16:43:06 -07:00
Stephen Birarda
a5bd8cf3cd DS node count is a timer stat for now 2013-07-02 16:41:46 -07:00
Stephen Birarda
c2076e8520 flip the audio-mixer-frame-time-usage back to STAT_TYPE_TIMER 2013-07-02 16:40:27 -07:00
ZappoMan
caff7dc9ab Merge pull request #586 from birarda/opencv-warnings 
suppress warnings from OpenCV headers
 2013-07-02 15:45:22 -07:00
Stephen Birarda
f2dbad4e57 resolve conflicts on merge with upstream master 2013-07-02 15:42:36 -07:00
ZappoMan
8d2aea5417 Merge pull request #611 from birarda/leap-error 
cmake fix for build error when leap library is missing
 2013-07-02 15:40:03 -07:00
Stephen Birarda
1993601389 don't link a NOTFOUND leap library 2013-07-02 15:27:30 -07:00
Stephen Birarda
010e6e5570 Merge pull request #610 from birarda/domain-stats 
rename argument for Logstash stat stash
 2013-07-02 15:05:18 -07:00
Stephen Birarda
11e06dbed2 rename the stat type argument in Logstash 2013-07-02 15:04: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
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
ZappoMan
f36d7e7677 Merge pull request #607 from heracek/19385 
Code Review for Job #19385
 2013-07-02 14:16:13 -07:00
Tomáš Horáček
6f6f0423a0 Merge remote-tracking branch 'worklist/master' into 19385 2013-07-02 23:05:50 +02:00
Tomáš Horáček
a9f8b586ee re #19385: CR changes 2013-07-02 23:04:06 +02:00
Stephen Birarda
08c1d54cf3 send count of alive nodes to logstash from DS 2013-07-02 12:18:16 -07:00
Stephen Birarda
64f3b55aaa split logstash stash methods to stat types 2013-07-02 12:10:46 -07:00
Stephen Birarda
2a4d9c98ee add return of number of alive agents from AgentList 2013-07-02 10:34:57 -07:00
Stephen Birarda
ef8c48245e remove a couple of unused variables in the domain-server 2013-07-02 10:05:28 -07:00
Tomáš Horáček
5f9f2fee71 re #19385: use righ axis name 2013-07-02 11:47:53 +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
Philip Rosedale
6a3833359e Merge pull request #600 from tschw/19377 
Code Review for Job #19377
 2013-07-01 22:24:36 -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
2eeb0d9bb9 re #19385: importing voxels should be destructive 2013-07-02 01:16:20 +02:00
Tomáš Horáček
71c54586ba re #19385: use right neighbour voxels 2013-07-02 01:16:20 +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
f49e63f842 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-07-02 00:06:10 +02:00