Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 11:22:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14649 commits 71 branches 56 tags 1.2 GiB
Commit graph

14649 commits

This branch
This branch
All branches
Author SHA1 Message Date
Clément Brisset
3f24feeb1d Merge pull request #3143 from PhilipRosedale/master 
Add Low Velocity Filter for hand movement as menu option
 2014-07-08 23:22:46 -07:00
Clément Brisset
2003dc41df Merge pull request #3138 from ctrlaltdavid/19836 
Code Review for Job #19836
 2014-07-08 23:16:32 -07:00
Philip Rosedale
f8185dec75 removed some debug logs 2014-07-08 22:26:11 -07:00
Philip Rosedale
c50d9ae3e4 Hand low velocity filter as a menu option 2014-07-08 22:22:27 -07:00
David Rowe
305623d8a7 Add option to hide focus indicators 2014-07-08 21:37:08 -07:00
Clément Brisset
e648c3475b Merge pull request #3139 from PhilipRosedale/master 
Another improvement to clapping to match animation pace with keystrokes
 2014-07-08 21:34:04 -07:00
Philip Rosedale
32eb51a224 Merge pull request #3141 from ey6es/metavoxels 
Fixes, congestion control for metavoxel streaming.
 2014-07-08 21:30:13 -07:00
Brad Hefta-Gaub
90d720face Merge pull request #3142 from mpursley/master 
adding "export QT_CMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.2.1/lib/cmake" for qt5.2.1
 2014-07-08 21:12:10 -07:00
David Rowe
51f7e8904d Integrate UI toggling menu item and Hydra UI toggling 
They work together and both fade the UI in / out.
 2014-07-08 21:04:30 -07:00
David Rowe
1e7a18e625 Guard _framebufferObject deletion 2014-07-08 21:02:32 -07:00
Philip Rosedale
b2912552f6 switched to better sounds for clapping 2014-07-08 21:00:02 -07:00
barnold1953
b5a9f50ae7 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-07-08 17:15:35 -07:00
barnold1953
f8fdd2d11f Minor adjustments 2014-07-08 17:15:11 -07:00
Philip Rosedale
a7ad803a7f Merge branch 'master' of https://github.com/worklist/hifi 2014-07-08 17:09:50 -07:00
Philip Rosedale
272e8c6e97 Merge pull request #3140 from ctrlaltdavid/script_error_reporting 
Fix script errors not being reported
 2014-07-08 16:56:26 -07:00
Andrzej Kapolka
2dbe72a818 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-08 16:49:14 -07:00
David Rowe
bc785115a9 Fix script errors not being reported 
Script.update event needs to be emitted after reporting any script errors.
 2014-07-08 16:33:31 -07:00
barnold1953
87ad87e10f Actual stereoscopic 3D UI. Looks better now. 2014-07-08 16:25:21 -07:00
Andrzej Kapolka
1b890a9e48 Use congestion control for client sends, too. 2014-07-08 15:37:59 -07:00
Andrzej Kapolka
b6570dc4ee Use congestion control on server. 2014-07-08 15:10:05 -07:00
Philip Rosedale
40ad03dbf5 Another improvement to clapping to match animation pace with keystrokes 2014-07-08 14:53:41 -07:00
Andrzej Kapolka
5636171836 Timing fix. 2014-07-08 14:41:16 -07:00
Andrzej Kapolka
e579be82a2 Merge pull request #3137 from PhilipRosedale/master 
Better clapping and hand squeezing scripts, started new hair class to hold vertlet hair
 2014-07-08 14:20:03 -07:00
Andrzej Kapolka
7163db7586 Merge pull request #3136 from birarda/master 
use compiler default C++ standard library on OS X, tweak RtMidi find module
 2014-07-08 14:16:22 -07:00
wangyix
e732436783 added _starveCount, _silentFramesDropped 2014-07-08 14:13:42 -07:00
Brad Hefta-Gaub
29a2a9aaa2 Merge pull request #3135 from wangyix/quick_audio_PR 
changed Audio.cpp to not overflow _audioOutput buffer; fixed premature injector stream deletion; disabled silent-frame dropping in non-dyanimic-jitter-buffers mode
 2014-07-08 13:56:31 -07:00
Andrzej Kapolka
02cf1f006e Change tests to reflect transmission changes and fixed issue with reprocessing 
already-handled reliable delta.
 2014-07-08 13:41:42 -07:00
wangyix
df1b4107fd moved qAudioOutput buffer overflow debug option to existing audio menu 2014-07-08 13:01:05 -07:00
TonyPeng
e212f9f42e Change fog start to use default value. 2014-07-08 12:48:01 -07:00
barnold1953
0ce7b178b0 Made Oculus UI framebuffer resize when window resizes 2014-07-08 12:47:41 -07:00
TonyPeng
4e04cecd8c Use glFog for haze (better performance). 2014-07-08 12:28:44 -07:00
wangyix
6ee52e97c8 added dev menu option to disable _audioOutput overflow check 2014-07-08 12:23:43 -07:00
Stephen Birarda
8c5979813f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-08 12:17:15 -07:00
Stephen Birarda
d1afe127c3 updates to RtMidi find module to look for static or dynamic lib 2014-07-08 12:06:43 -07:00
Stephen Birarda
84aa4b9cda use compiler default C++ Standard Library on OS X 2014-07-08 11:59:10 -07:00
Philip Rosedale
e75b9dc832 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-08 11:43:45 -07:00
barnold1953
cc63f706a7 Functional sixense "laser" oculus selection mode. 2014-07-08 11:43:24 -07:00
Philip Rosedale
0e117966f7 better clapping 2014-07-08 11:43:06 -07:00
wangyix
2e73ac8bc1 changed Audio.cpp to not overflow _audioOutput buffer, and 2 other things 
added _consecutiveNotMixedCount to prevent premature injector stream
deletion;  made silent-frame drop only occur in dynamic jitter buffer
mode
 2014-07-08 11:16:39 -07:00
TonyPeng
34e973c516 Merge branch 'master' of https://github.com/highfidelity/hifi into light_and_haze 
Merge in from highfidelity.
 2014-07-08 10:37:46 -07:00
TonyPeng
1baa187a66 add javascript example for changing avatar's local lights. 2014-07-08 10:37:42 -07:00
AndrewMeadows
e34f592a83 Merge pull request #3132 from birarda/master 
fix stubbing of MIDIManager if HAVE_RTMIDI not defined
 2014-07-08 10:36:05 -07:00
Stephen Birarda
e33b07819c wrap a missed midi method 2014-07-08 10:24:21 -07:00
Andrzej Kapolka
db1a9fa09b Fix for streaming error. 2014-07-08 10:14:41 -07:00
Clément Brisset
4f756c31f2 Merge pull request #3133 from huffman/19819 
Code Review for Job #19819
 2014-07-08 10:07:26 -07:00
Clément Brisset
0a30251411 Merge pull request #3131 from ey6es/metavoxels 
Basic incremental streaming of metavoxel data through a reliable channel (first attempts unreliable channel, then moves it over if too big).
 2014-07-08 10:00:57 -07:00
Stephen Birarda
286d50f4f2 fix if/endif in MIDIManager header 2014-07-08 09:55:03 -07:00
Stephen Birarda
171660ded7 fix stubbing of MIDIManager if HAVE_RTMIDI not defined 2014-07-08 09:52:50 -07:00
TonyPeng
94e81da557 Added local lights to avatar. Added haze to voxel. 2014-07-08 09:44:28 -07:00
Clément Brisset
5d0ab08054 Merge pull request #3130 from huffman/19828 
Code Review for Job #19828
 2014-07-08 09:40:32 -07:00