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

14410 commits

This branch
This branch
All branches
Author SHA1 Message Date
barnold1953
07f7cc42ad Made spacebar reconnect the oculus. Code cleanup. 2014-06-26 12:58:23 -07:00
wangyix
97139b0bd0 Merge branch 'master' into seqNumberStats 2014-06-26 11:47:00 -07:00
Atlante45
0b0cbdf340 Merge branch 'master' of https://github.com/highfidelity/hifi into sit_on_a_model 2014-06-26 11:35:29 -07:00
wangyix
ad05c53823 moved audiomixer jbuffer stats to expanded section 2014-06-26 11:33:54 -07:00
barnold1953
6fcfde1100 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK 2014-06-26 11:27:47 -07:00
barnold1953
634e0f38e8 Accurate Oculus frame timing 2014-06-26 11:27:17 -07:00
wangyix
7f23a7fbde switched AudioRingBuffer to use _isFull flag instead 2014-06-26 11:26:10 -07:00
Mohammed Nafees
6be4633a97 Merge remote-tracking branch 'upstream/master' into 19801 2014-06-26 23:48:11 +05:30
Clément Brisset
463ac9cc74 Merge pull request #3078 from PhilipRosedale/master 
Improved toy ball, JS calls for palm position, concertCamera.js
 2014-06-26 11:03:48 -07:00
Clément Brisset
cd53b727d0 Merge pull request #3080 from AndrewMeadows/bug-fix 
fix for avatar models with multiple roots
 2014-06-26 10:54:03 -07:00
Philip Rosedale
64c89df5c1 Added another concert view 2014-06-26 10:52:37 -07:00
barnold1953
adb6c445a2 Fixed camera FoV, code cleanup 2014-06-26 10:13:15 -07:00
barnold1953
61b20b2be0 Working 3.2 Oculus SDK 2014-06-26 09:56:19 -07:00
AndrewMeadows
dba9d33f86 Merge pull request #3075 from huffman/19644 
Code Review for Job #19644
 2014-06-26 09:39:20 -07:00
wangyix
ad8fe38a59 removed extra sample in AudioRingBuffer for testing 2014-06-26 09:27:06 -07:00
Andrew Meadows
0d18f2fbab fix for avatar models with multiple roots 2014-06-26 09:12:44 -07:00
Stephen Birarda
5cd2dc594f only post changed values to settings.json, fix for bool values 2014-06-26 08:45:12 -07:00
Philip Rosedale
c72e41dcd2 added Oculus angular velocity, moved sit icon up 2014-06-25 22:27:54 -07:00
Clément Brisset
96e81d5596 Merge pull request #3079 from ey6es/metavoxels 
Basic congestion control on TCP model, with tests; fixed errors in, added tests for SpanList.
 2014-06-25 18:34:07 -07:00
Andrzej Kapolka
014ea2a36f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-25 18:22:33 -07:00
Clément Brisset
e7d3e244fb Merge pull request #3076 from ey6es/master 
Fixes for uninitialized variable warnings, disabled strict aliasing to allow safe type punning (and avoid warnings).
 2014-06-25 18:18:58 -07:00
Andrew Meadows
c12c869cdf add "visible" transforms to JointState 
also stubbery for using them in Model and SkeletonModel
 2014-06-25 18:06:56 -07:00
wangyix
fe2eaa8e4a forgot to increment seqnum in Audio.cpp 2014-06-25 18:02:38 -07:00
wangyix
37ce693153 added seqnum stats to AudioMixerClientData; added seqnums to Audio.cpp 2014-06-25 18:01:34 -07:00
wangyix
2ec04fb756 replaced old seqnum tracking code with SequenceNumberStats 2014-06-25 17:20:57 -07:00
Andrzej Kapolka
f828b0c466 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-25 16:57:07 -07:00
Andrzej Kapolka
5effcd24ff Only increase/decrease rate when we want to send more/have sent more than the 
minimum, respectively.
 2014-06-25 16:56:02 -07:00
Stephen Birarda
13169fa664 replace handlebars with underscore for templating 2014-06-25 16:35:44 -07:00
wangyix
b220b092f4 added SequenceNumberStats and unit test 2014-06-25 16:35:08 -07:00
Andrzej Kapolka
705445ce62 Basic congestion control using TCP-esque strategy. 2014-06-25 15:48:46 -07:00
Philip Rosedale
93b131d520 Fix build warning from wrong init order 2014-06-25 15:41:47 -07:00
Philip Rosedale
72f9346543 Merge pull request #3077 from ctrlaltdavid/19790 
Code Review for Job #19790
 2014-06-25 15:29:28 -07:00
Philip Rosedale
9af2b2b4dc removed commented code 2014-06-25 15:24:21 -07:00
Philip Rosedale
58d460da09 option to turn on/off string hair 2014-06-25 15:14:17 -07:00
Stephen Birarda
4188a4eab1 change unattenuated zone placeholder and offer method to grab JSON settings 2014-06-25 14:16:24 -07:00
Stephen Birarda
6519d4028a populate the settings page correctly with existing values 2014-06-25 13:55:32 -07:00
Andrzej Kapolka
6480c678d2 Disable strict aliasing for safe type punning, fix potentially uninitialized 
variable warning.
 2014-06-25 13:46:13 -07:00
Andrzej Kapolka
41b01dbaed Fix warning and simplify encodeRandomOrder. 2014-06-25 13:00:17 -07:00
wangyix
9b8f8dbf70 removed more more unnecessary changes 2014-06-25 12:05:59 -07:00
wangyix
7dd7422cbf removed more unneccesary changes 2014-06-25 11:57:45 -07:00
Atlante45
cce6132a07 Add sitting points to the model properties display 2014-06-25 11:50:30 -07:00
Atlante45
a8c3501bdd Keep sitting points updated 2014-06-25 11:49:36 -07:00
Atlante45
1d7d970ff6 Added sitting points to modelItem 2014-06-25 11:48:48 -07:00
wangyix
c583f8b023 removed unnecessary changes 2014-06-25 11:48:32 -07:00
David Rowe
9fb64386aa Fix stopping scripts in the script editor 2014-06-25 11:44:58 -07:00
Andrzej Kapolka
8999fcef17 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-25 11:42:55 -07:00
wangyix
dd1c157f3a reverted updateDesiredJitterBufferFrames to what Brad wrote 2014-06-25 11:42:03 -07:00
Andrzej Kapolka
ae1422e0cb Reset the write position when we hear of packet loss (up to once per round 
trip time).
 2014-06-25 11:42:02 -07:00
wangyix
591bfa14b9 added PacketTypeAudioStreamStats for j-buffer stats 
...instead of packing that info into audio packets.
 2014-06-25 11:38:56 -07:00
Stephen Birarda
f8dccad6ec enable persisting of posted settings to a JSON file 2014-06-25 11:20:09 -07:00