Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 13:36:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14471 commits 25 branches 0 tags 1.1 GiB
Commit graph

14471 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
f179b0e9ca Merge remote-tracking branch 'origin/master' into 19734 
Conflicts:
	cmake/modules/FindLeapMotion.cmake
	interface/CMakeLists.txt
	interface/src/devices/Leapmotion.h
 2014-07-08 12:43:32 -07:00
samcake
4302accafd Improve the LeapMotion support 
- fixed a bug on indexing the bones of the hand in the update of the
LEapmotion

- Still struggling with the correct joint assignment in the javascript,
visiting HIFI later today
 2014-07-08 11:37:11 -07:00
samcake
f5c690cc8d Add Leapmotion support for Apple build 
- Add LEapmotion support in the CMake files
- fix a template syntax in DeviceHEader not compiling on mac
- add a missing #ifdef protection in Leapmotion
 2014-07-07 09:32:46 -07:00
samcake
d56ab21192 Clean file formating 
- Clean the classes declaration and body for
DeviceTracker
MotionTracker
ControllerScriptingInterface / InputController
Leapmotion

- final bug remaining in the LeapOfFaith..js
THe orientation assigned to the skeleton joints doesn't work even though
all looks good.
 2014-07-07 09:24:23 -07:00
samcake
abacefa723 Merge remote-tracking branch 'upstream/master' into 19734 
Conflicts:
	interface/CMakeLists.txt
	interface/src/avatar/SkeletonModel.cpp
 2014-07-05 19:25:46 -07:00
samcake
fca3a6aa13 Merge branch 'master' of https://github.com/highfidelity/hifi into 19734 2014-07-05 18:10:59 -07:00
Brad Hefta-Gaub
b7b46b0a3b Merge pull request #3126 from Atlante45/replace_qnetworkaccessmanager 
Hopeful fix to ACs crash
 2014-07-03 21:48:15 -07:00
Atlante45
b0e83c32ff Hopeful fix to ACs crash 2014-07-03 18:17:01 -07:00
Philip Rosedale
bc3823f1f7 Merge pull request #3125 from birarda/master 
fix the voices inside your head
 2014-07-03 16:55:50 -07:00
Stephen Birarda
ecbd62104c cause sounds within an epsilon distance to be unattenuated 2014-07-03 16:43:12 -07:00
Stephen Birarda
7ff0648d8a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-03 16:32:46 -07:00
Stephen Birarda
438e0b501b fix the voices inside your head 2014-07-03 16:32:38 -07:00
Brad Hefta-Gaub
db5abbc363 Merge pull request #3124 from Atlante45/replace_qnetworkaccessmanager 
Fixed invokeMethod unable to find method + fixed children in different t...
 2014-07-03 14:54:11 -07:00
Clément Brisset
a7be28b547 Merge pull request #3123 from AndrewMeadows/ragdoll 
return to default pose after hydra disconnect
 2014-07-03 14:49:26 -07:00
Atlante45
8e1b8334a1 Fixed invokeMethod unable to find method + fixed children in different thread 2014-07-03 14:46:17 -07:00
Andrew Meadows
662136f01c reset timer as optimization 2014-07-03 14:13:27 -07:00
Andrew Meadows
0f7859bf83 fix return to default pose after hydra disconnect 2014-07-03 14:09:14 -07:00
Andrew Meadows
843a4db650 rotation offset for hydra controllers 2014-07-03 13:50:27 -07:00
Clément Brisset
3729428c2e Merge pull request #3122 from birarda/audio-rolloff 
change the audio rolloff function
 2014-07-03 13:49:59 -07:00
Stephen Birarda
04e7df1a3f change the audio rolloff function 2014-07-03 13:46:38 -07:00
Clément Brisset
4798cad1e5 Merge pull request #3121 from ZappoMan/animationFrameIndex 
adds JavaScript API for getting the current animationDetails (state) for avatar animations
 2014-07-03 13:45:27 -07:00
Brad Hefta-Gaub
b8071d8050 Merge pull request #3113 from birarda/master 
initial pass at MIDI input for scripting
 2014-07-03 13:40:25 -07:00
ZappoMan
8755e2d42e CR feedback 2014-07-03 13:38:52 -07:00
Stephen Birarda
c0d0ca5066 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-rolloff 2014-07-03 13:37:06 -07:00
Brad Hefta-Gaub
dbdce32b68 Merge pull request #3107 from wangyix/master 
prune missing sequence numbers before sending NACK; AudioRingBuffer frame length can now be specified;
 2014-07-03 13:32:31 -07:00
Stephen Birarda
15619b5a98 don't require RtMidi if it isn't present 2014-07-03 13:30:14 -07:00
wangyix
94c0c15c76 fixed more small bugs with AudioRingBuffer constructor 2014-07-03 12:06:18 -07:00
ZappoMan
59e8a98412 added example script 2014-07-03 12:05:18 -07:00
ZappoMan
a53d007c33 add support for getting current animation details for running avatar animations 2014-07-03 11:59:18 -07:00
Stephen Birarda
6665a9427a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-03 11:39:40 -07:00
Clément Brisset
6109b7201a Merge pull request #3120 from birarda/network-fix 
make sure NetworkAccessManager singleton is on main AC thread
 2014-07-03 11:35:36 -07:00
Stephen Birarda
411733feb7 make sure NetworkAccessManager singleton is on main AC thread 2014-07-03 11:34:39 -07:00
wangyix
2c6b2000b2 forgot arg in AudioRingBuffer constructor in PositionalAudioRingBUffer 
changed _currentJitterBufferFrames to be -1 to indicate starved.
 2014-07-03 11:34:16 -07:00
Stephen Birarda
ef9bb85f8a fix so domain-server doesn't open missing config file 2014-07-03 11:16:01 -07:00
Stephen Birarda
6038c33fe6 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-03 11:12:19 -07:00
wangyix
507518f16d removed numFramesCapacity from being exposed everywhere 2014-07-03 11:11:56 -07:00
Stephen Birarda
0235b62324 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-rolloff 2014-07-03 11:05:20 -07:00
Stephen Birarda
fe52787572 implement a new rolloff function 2014-07-03 11:05:12 -07:00
Stephen Birarda
9734446e23 Merge pull request #3119 from birarda/the-voices-inside 
fix for script agent audio missing channel flag
 2014-07-03 11:04:51 -07:00
Stephen Birarda
0a3a8b0693 remove space at the top of the ScriptEngine file 2014-07-03 10:45:43 -07:00
Stephen Birarda
0af79c4d95 fix for script agent audio missing channel flag 2014-07-03 10:45:05 -07:00
wangyix
a2451a9651 moved and updated a comment in SequenceNumberStats 2014-07-03 10:41:54 -07:00
Brad Hefta-Gaub
42fc98161b Merge pull request #3118 from Atlante45/replace_qnetworkaccessmanager 
Replace qnetworkaccessmanager
 2014-07-03 10:38:45 -07:00
wangyix
059628c26a fixed bug in SequenceNumberStats and its unit test; test passes now 2014-07-03 10:37:09 -07:00
Atlante45
6b88724578 Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager 2014-07-03 10:30:39 -07:00
Atlante45
20cdc0e3ca Fix wrong slot names in ModelBrowser 2014-07-03 10:30:21 -07:00
Philip Rosedale
9be7a69e7a Merge pull request #3117 from AndrewMeadows/ragdoll 
apply joint constraints during IK
 2014-07-03 09:51:01 -07:00
Brad Hefta-Gaub
d0478384ae Merge pull request #3116 from ctrlaltdavid/19829 
Code Review for Job #19829
 2014-07-03 09:37:04 -07:00
Andrew Meadows
8c8a29f477 merge upstream/master into andrew/ragdoll 2014-07-03 09:27:52 -07:00
Stephen Birarda
f1e2ba1267 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-03 09:25:03 -07:00