Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 02:50:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
4476 commits 71 branches 59 tags 1.2 GiB
Commit graph

4476 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
b14fd1ea68 Merge pull request #619 from ZappoMan/bug_fixes 
Some small bug fixes to voxel server sending
 2013-07-03 14:53:24 -07:00
ZappoMan
430c70875d tweaks to debug messages 
(cherry picked from commit 873144ded3)
 2013-07-03 14:44:33 -07:00
ZappoMan
2fffb15d94 CR feedback 2013-07-03 14:43:01 -07:00
ZappoMan
873144ded3 tweaks to debug messages 2013-07-03 14:40:59 -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
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
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
ZappoMan
dc4a5ea276 added some timing debugging, and bail early if voxel server is slow 
(cherry picked from commit 485c603d4f)
 2013-07-03 12:53:14 -07:00
Stephen Birarda
331351765e remove fvversioncomparator from headers passed to qt4 2013-07-03 12:51:26 -07:00
ZappoMan
485c603d4f added some timing debugging, and bail early if voxel server is slow 2013-07-03 12:42:34 -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
ZappoMan
2d6e522c35 debug stats 2013-07-03 10:59:36 -07:00
ZappoMan
5ef2e2de5d debug statistics for intersect calls 2013-07-03 10:58:30 -07:00
ZappoMan
a05650e74a removed debug code 2013-07-03 10:56:08 -07:00
ZappoMan
c795a37be2 tweak perfstats to not display WARNING! when caller asked it to always print (non-warning case) 2013-07-03 10:55:33 -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
cd1adcfea0 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-02 17:22:20 -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
ZappoMan
f45f0610f5 fixed FOV preference with projection matrix 2013-07-02 16:54:55 -07:00
Andrzej Kapolka
1fdfca727d More work on Kinect-driven joints. 2013-07-02 16:49:07 -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