Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 13:49:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
15814 commits 75 branches 59 tags 1.2 GiB
Commit graph

7940 commits

Author SHA1 Message Date
wangyix
1eaf175a92 removed disable audio output overflow check menu option 2014-08-05 10:21:53 -07:00
wangyix
748c9e2065 numAudioSamples now calculated to be device samples instead of network samples 2014-08-05 10:13:34 -07:00
Philip Rosedale
4d0474483d Merge pull request #3253 from AndrewMeadows/ragdoll 
Ragdoll Part 8: improved contact points
 2014-08-04 21:33:31 -07:00
Andrzej Kapolka
173e8af126 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-04 18:31:08 -07:00
Brad Hefta-Gaub
d662c0f414 Merge pull request #3248 from Atlante45/dde_face_tracker 
Dde face tracker
 2014-08-04 18:27:15 -07:00
wangyix
332e75453e Merge remote-tracking branch 'upstream/master' into pull_mode_audio_output 2014-08-04 17:58:31 -07:00
wangyix
2b8b15e32d made audioscope easier to see 2014-08-04 17:56:14 -07:00
Atlante45
f0af2f022e Pack/Unpack asymetry fix + added forgotten consts 2014-08-04 17:53:21 -07:00
wangyix
c42af55f2f Merge branch 'inbound_audio_stream' into pull_mode_audio_output 2014-08-04 17:41:03 -07:00
Andrew Meadows
39d3deee90 merge upstream/master into andrew/ragdoll 2014-08-04 17:37:28 -07:00
wangyix
ed3240fbad minor change to _audioOutput->setBufferSize() 2014-08-04 17:31:14 -07:00
wangyix
4355ca8328 minor member rename 2014-08-04 17:24:18 -07:00
wangyix
3fe4c29848 removed heap alloc of receivedSamples; cleaned up code 2014-08-04 17:14:26 -07:00
Andrzej Kapolka
f8afdba922 Allow configurable block sizes, merging children with different resolutions. 2014-08-04 16:56:30 -07:00
wangyix
4d7d6f1e25 changed downstream re-sampling to occur right after parsing packet 2014-08-04 16:23:17 -07:00
Atlante45
d9dde06c14 Various tweaks to referentials 2014-08-04 14:59:15 -07:00
Philip Rosedale
d552b7ca97 Merge pull request #3246 from wangyix/inbound_audio_stream 
Improved SequenceNumberStats handling of out-of-sync seq nums
 2014-08-04 14:30:45 -07:00
Andrzej Kapolka
b1d6977112 Added simple "erase heightfield" tool. 2014-08-04 12:58:01 -07:00
Atlante45
15cbfa0715 Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-08-04 12:45:57 -07:00
Atlante45
d1a1311979 Mode DDE tweaks 2014-08-04 12:44:23 -07:00
Atlante45
0a42968197 DDE tweaks 2014-08-04 12:40:12 -07:00
Atlante45
1a27b4b645 Merge branch 'master' of https://github.com/highfidelity/hifi into dde_face_tracker 2014-08-04 12:24:44 -07:00
Andrzej Kapolka
9ba091f0a1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-04 11:44:24 -07:00
Andrzej Kapolka
46d4172157 Filter terrain, points, spanners by frustum intersection. 2014-08-04 11:41:56 -07:00
Atlante45
1d2cf3536b Coefficients tweaks 2014-08-04 11:20:18 -07:00
wangyix
d394c203b6 improved re-sync handling of SequenceNumberStats 
removed "duplicate" category since it's not 100% accurate
 2014-08-04 11:09:20 -07:00
Atlante45
c80cd0d71d connected blendshapes 2014-08-04 11:04:14 -07:00
Atlante45
cac3983778 Added a few blendshapes 2014-08-04 11:03:58 -07:00
Atlante45
8d1438a44c Plugged in dde face tracker 2014-08-04 10:28:52 -07:00
Atlante45
bbb52fc4aa Added dde face tracker class 2014-08-04 10:28:29 -07:00
Atlante45
38741aed73 Fixed wrong header guard 2014-08-04 10:27:29 -07:00
Philip Rosedale
5a51950771 Merge pull request #3239 from lzuwei/add_cara_face_tracker 
Reduce Jerks in head rotation when using Cara Face Tracker
 2014-08-04 07:55:33 -07:00
Philip Rosedale
69558dc574 Merge pull request #3245 from wangyix/inbound_audio_stream 
Improved SequenceNumberStats
 2014-08-04 07:49:31 -07:00
Bennett Goble
b634f8d8c0 Merge branch 'master' into 19616 2014-08-03 14:08:09 -04:00
Bennett Goble
bd409f2de4 importVoxels() JS override: specify file and location 2014-08-03 14:01:37 -04:00
Brad Hefta-Gaub
e9286e5700 Merge pull request #3238 from ctrlaltdavid/19824 
Code Review for Job #19824
 2014-08-01 16:35:16 -07:00
Brad Hefta-Gaub
211bed946f Merge pull request #3232 from huffman/19783 
Code Review for Job #19783
 2014-08-01 16:34:50 -07:00
Atlante45
aaf043de60 Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-08-01 16:17:16 -07:00
Andrew Meadows
374e89817b minor optimization of MuscleConstraint::enforce() 2014-08-01 14:46:28 -07:00
Ryan Huffman
d01d605b40 Add ModelItemProperties::copyFromNewModelItem 2014-08-01 13:52:00 -07:00
Ryan Huffman
3e572cdf76 Add SpeechRecognizer to js and speechControl.js 2014-08-01 13:44:40 -07:00
Ryan Huffman
ffb178cb43 Add SpeechRecognizer 2014-08-01 13:44:06 -07:00
Atlante45
00e4e20bcb Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-08-01 11:22:42 -07:00
Andrew Meadows
3305f5edf9 merge upstream/master into andrew/ragdoll 2014-08-01 11:13:18 -07:00
wangyix
cdcc6ece04 fixed compile errors caused by SequenceNumberStats changes 2014-08-01 10:34:19 -07:00
wangyix
e1f905cb36 fixed >100% loss rate bug in SequenceNumberStats 2014-08-01 10:27:51 -07:00
ZappoMan
fa5a2b9a4d reset sent time gap stats on reset 2014-08-01 10:04:35 -07:00
ZappoMan
7e51ebea49 added some additional audio stats 2014-08-01 09:42:31 -07:00
Zu
4aa5fb2795 fix: comments, extra white spaces 2014-08-01 16:12:17 +08:00
Zu
779298b7dc improve: reduce animation jerks in avatar head rotation 2014-08-01 14:12:43 +08:00
David Rowe
f3b4f708a5 Add Script.load() JavaScript method 2014-07-31 21:50:07 -07:00
Thijs Wenker
fe3f1dbe83 forgot to put back one line of code 2014-07-31 22:56:47 +02:00
Atlante45
ee4b7664b0 Merge branch 'master' of https://github.com/highfidelity/hifi into referentials 2014-07-31 13:39:23 -07:00
Thijs Wenker
e6571d334a Oculus SDK 0.4 support for Windows (tested with DK2 HMD) 2014-07-31 22:37:02 +02:00
Leonardo Murillo
c4751d7dd7 Merge pull request #3231 from birarda/domain-server-auth 
add some error messages to PaymentManager
 2014-07-31 13:40:56 -06:00
Andrzej Kapolka
53fc31353d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-31 12:06:01 -07:00
Andrzej Kapolka
a0886d4301 Use raw OpenGL textures rather than QOpenGLTexture, since that we're having 
issues with constants in that class.
 2014-07-31 11:55:52 -07:00
Atlante45
c65dc3fb1e Various tweaks to ModelReferentials 2014-07-31 11:55:28 -07:00
Atlante45
5fd3fd9f8f Moved MyAvatar update at the end of Application::update() to have latest data for simulation 2014-07-31 11:54:39 -07:00
Stephen Birarda
7860aa5b87 add some error messages to PaymentManager 2014-07-31 11:41:49 -07:00
Andrzej Kapolka
90ce73823a Attempting to fix the Linux build error. 2014-07-31 11:03:50 -07:00
Ryan Huffman
aa1c9d88dd Cleaup several qDebug calls and commented lines 2014-07-31 10:48:26 -07:00
Ryan Huffman
3e2bb0f168 Add more complete error handling for import/export models 2014-07-31 10:40:45 -07:00
Stephen Birarda
453c37f4b9 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-31 10:05:40 -07:00
Stephen Birarda
eadae8ed1a allow unauthenticated redemptions of signed transactions from octree server 2014-07-31 10:05:26 -07:00
Stephen Birarda
ce4336894a actually send signed transaction from PaymentManager 2014-07-31 09:26:18 -07:00
Stephen Birarda
350c759618 add a method to SignedWalletTransaction to return binary message 2014-07-31 09:18:57 -07:00
Ryan Huffman
68f1ad79d6 Update clipboard call to exportModels to not scale to tree size 2014-07-31 01:14:07 -07:00
Ryan Huffman
a39a7e2356 Update exportModels implementation 2014-07-31 01:13:17 -07:00
Ryan Huffman
01737e18b2 Update LocalModelOverlay to work prorperly with translations 2014-07-30 19:06:10 -07:00
Ryan Huffman
43f61b4718 Add localmodels overlay type 2014-07-30 18:38:42 -07:00
Ryan Huffman
521bf6023e Implement pasteModels in Clipboard 2014-07-30 18:38:09 -07:00
Ryan Huffman
051bbd5d34 Add LocalModelsOverlay 2014-07-30 18:34:22 -07:00
Ryan Huffman
06294b403b Add pasteModels 2014-07-30 18:31:58 -07:00
Andrzej Kapolka
f2a72aa5a9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-30 18:17:28 -07:00
Stephen Birarda
631977bac2 setup a SignedTransaction from PaymentManager 2014-07-30 18:15:20 -07:00
Andrzej Kapolka
c3c2265ddd Hide the unset (black) bits. 2014-07-30 18:14:11 -07:00
Stephen Birarda
ef58453fda turn off verbose octree packet debug 2014-07-30 18:10:11 -07:00
Stephen Birarda
db25cd9d2c call PaymentManager when an OctreeEditPacketSender needs to pay 2014-07-30 18:07:08 -07:00
Brad Hefta-Gaub
d6e6cfd585 Merge pull request #3216 from wangyix/inbound_audio_stream 
Audio ringbuffer classes refactored into subclasses of InboundAudioStream
 2014-07-30 18:00:17 -07:00
Stephen Birarda
9c1dd7c4a4 fix call to connect in Application 2014-07-30 17:35:49 -07:00
Stephen Birarda
99daa062c0 trigger domainSettingsReceived slot when connected to domain 2014-07-30 17:35:33 -07:00
Stephen Birarda
363cef6d8a move satoshi costs to VoxelEditPacketSender 2014-07-30 17:33:37 -07:00
wangyix
7281eca5a4 fixed inj crash; added statcDesired to MixedAudioStream 2014-07-30 17:20:05 -07:00
Atlante45
1138a3a275 Added referentials to AvatarData 2014-07-30 16:50:25 -07:00
Atlante45
bc77630c5b Extanded FBXService + moved ModelReferential 2014-07-30 16:49:04 -07:00
wangyix
24be668d36 added check before pushAudioToOutput to prevent starvecount buildup 2014-07-30 15:47:49 -07:00
wangyix
636b6d3307 Merge branch 'pull_mode_audio_output' into inbound_audio_stream 2014-07-30 15:37:18 -07:00
wangyix
daeb2a898d added staticDesiredJitterBufferFrames feature; AudioMixer crashing 
moved some callbacks from Application::updateAvatar() to
Application::update()
 2014-07-30 15:35:40 -07:00
Andrzej Kapolka
82e442c115 Working on heightfield transmission, merging. 2014-07-30 14:54:38 -07:00
Stephen Birarda
6275dd68ab Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-30 14:15:22 -07:00
Stephen Birarda
4be8a92e52 remove explicit requirement of LibOVR source file in OculusManager 2014-07-30 14:15:14 -07:00
wangyix
a2945eaa96 qaudiooutput overflow check enabled by default 2014-07-30 12:52:35 -07:00
wangyix
efd4b7ad67 switched upstream/downstream stats; added menu item to disable injected stats 2014-07-30 12:04:03 -07:00
wangyix
81e5419287 added CTRL+A shortcut to display audio stats 2014-07-30 11:43:33 -07:00
wangyix
2b77a72aba changed Mac downstream ringbuffer to 100 frames 2014-07-30 11:13:15 -07:00
wangyix
30c17067a1 moved pushAudioOutput to handleAudioInput 2014-07-30 11:02:10 -07:00
Philip Rosedale
f0b64c11bc Merge pull request #3221 from lzuwei/add_cara_face_tracker 
Add cara face tracker
 2014-07-29 20:22:21 -07:00
Andrzej Kapolka
ff01d4b80d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-29 19:14:08 -07:00
Andrzej Kapolka
1ea9b0ccbc Working on heightfield encoding. 2014-07-29 19:13:43 -07:00
Zu
1e719f1a88 fixed: restyled code for better readability 2014-07-30 10:04:20 +08:00
Zu
113a173577 fix: update code style to conform to hifi convention 2014-07-30 09:30:55 +08:00
Atlante45
9b3cdacf08 Removed microthreading in favor of lazy computation 2014-07-29 18:28:33 -07:00
Zu
dcd7b81426 Merge branch 'master' into add_cara_face_tracker 2014-07-30 08:45:44 +08:00
wangyix
ecfd5c2757 default max frames over desired changed to 10 2014-07-29 17:37:59 -07:00
Andrzej Kapolka
496f4a184e Translation, etc. 2014-07-29 17:36:52 -07:00
wangyix
bcf9a3c20c changed default max frames over desired in client to 20 2014-07-29 17:17:10 -07:00
Andrew Meadows
67b9c185eb formatting and minor tweaks to constraint strengths 2014-07-29 16:48:34 -07:00
Andrew Meadows
34628aef3b separate muscle constraints from joint constraints 2014-07-29 16:47:54 -07:00
Andrzej Kapolka
436727dfdb Added scale field, fixed height/color extraction. 2014-07-29 16:33:36 -07:00
Atlante45
8cd59ab5de Forward declaration of RotationExtractor 2014-07-29 16:08:15 -07:00
Andrzej Kapolka
6824479762 Progress on rendering heightfield buffers. 2014-07-29 16:06:35 -07:00
Atlante45
42ba3ea338 CR lost _transformChanged 2014-07-29 15:59:53 -07:00
wangyix
d49970d010 maxFramesOverDesired added; settable from domain page and preferences 2014-07-29 15:57:32 -07:00
Atlante45
7800ffbf2e Make _rotation extraction asynchronous by default in computeTransform 2014-07-29 15:55:47 -07:00
Atlante45
897481d557 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_simulate_optimisation 2014-07-29 15:39:35 -07:00
Philip Rosedale
fdead9802e Merge pull request #3222 from Atlante45/sit_js_fix 
Sit js fix
 2014-07-29 15:26:51 -07:00
Andrzej Kapolka
2a7847c5b3 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-29 14:28:14 -07:00
Andrzej Kapolka
d04eb6261e More work on heightfields. 2014-07-29 14:27:51 -07:00
wangyix
71c23eac1e added TimeWeightedAvg to InboundAudioStream 
_maxFramesOverDesired hardcoded right now
 2014-07-29 13:51:46 -07:00
Atlante45
75dfb87c8e Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_simulate_optimisation 2014-07-29 13:47:24 -07:00
Atlante45
8354763e36 CR 2014-07-29 13:35:13 -07:00
Atlante45
0bad10b09c Add isLoaded to Overlays 2014-07-29 13:25:42 -07:00
Atlante45
28d4efbad6 Don't display anything if overlays not loaded 2014-07-29 13:15:09 -07:00
Philip Rosedale
1ba8922f0b Merge pull request #3218 from ey6es/metavoxels 
Various metavoxel improvements relating to threading and VBO-based rendering.
 2014-07-29 09:59:55 -07:00
David Rowe
ccf37c6c17 Fix text displayed on Window.form() directory button 2014-07-28 21:53:00 -07:00
Zu
4016f8ca44 Merge branch 'master' into add_cara_face_tracker 2014-07-29 12:21:40 +08:00
Zu
cce962fb16 added: smile, surprise, anger to blendshapes 
fix: roll, yaw direction
added: source comments
removed: debug print outs
 2014-07-29 11:07:04 +08:00
Brad Hefta-Gaub
8e1d4eb0a6 Merge pull request #3210 from Atlante45/add_start_stop_animation_for_scripted_avatar 
Add start stop animation for scripted avatar
 2014-07-28 19:43:58 -07:00
Andrzej Kapolka
aeee369286 Working on heightfield implementation. 2014-07-28 19:10:59 -07:00
Atlante45
6183c4d97e Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_simulate_optimisation 2014-07-28 16:51:09 -07:00
Atlante45
fb670275c2 Don't recompute unchaged transform 2014-07-28 16:42:16 -07:00
Andrzej Kapolka
cc909e2286 Fixed spelling error. 2014-07-28 16:24:49 -07:00
Andrzej Kapolka
3ac4bb6ddd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-28 16:24:43 -07:00
Andrzej Kapolka
e05884d4a3 Simpler rendering. 2014-07-28 16:18:16 -07:00
ZappoMan
fbfd63c429 fix build to work if Qxmpp is not available 2014-07-28 15:17:33 -07:00
wangyix
ed9bfdc503 these didn't commit for some reason 2014-07-28 14:08:45 -07:00
wangyix
145b7f8a0e got Preferences jitter buffer frames override working 2014-07-28 14:05:17 -07:00
wangyix
6fc5c74c0b renamed ringbuffer variables to audiostream 2014-07-28 13:08:53 -07:00
wangyix
32dbc6cbdb renamed audioringbuffer classes to audiostream 2014-07-28 11:52:05 -07:00
wangyix
9bbd055404 added stdev method of jitter calc to InboundAudioStream 2014-07-28 11:41:08 -07:00
Atlante45
3c7375daad Removed unused variable 2014-07-28 10:17:04 -07:00
Brad Hefta-Gaub
f438ae2ddb Merge pull request #3215 from Atlante45/master 
Fix the double entries in models' browsers
 2014-07-28 08:51:49 -07:00
Brad Hefta-Gaub
8b43ddc426 Merge pull request #3212 from birarda/select-library 
standardization of hints used to find external libraries
 2014-07-28 08:51:15 -07:00
Philip Rosedale
acecc17001 Merge pull request #3214 from AndrewMeadows/ragdoll 
Ragdoll Part 6: muscle constraints for driving Ragdoll and also damped velocity integration for verlet simulation
 2014-07-28 08:40:21 -07:00
Andrew Meadows
dd515f6bb9 fix bad variable name 2014-07-28 07:06:36 -07:00
David Rowe
49e0d07ac8 Add directory picker button option to JavaScript Window.form() 2014-07-25 20:32:44 -07:00
Andrzej Kapolka
4f5448f529 Basic rendering working again. 2014-07-25 18:19:50 -07:00
Andrzej Kapolka
57ca606491 Various kinds of progress towards generic rendering. 2014-07-25 16:59:48 -07:00
Atlante45
1849ec8e07 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels_zFighting 
Conflicts:
	examples/editVoxels.js
 2014-07-25 16:39:39 -07:00
Atlante45
b5dd9141a3 Fix the double entries in models' browsers 2014-07-25 16:12:40 -07:00
Ryan Huffman
d777e4be53 Merge branch 'master' of git://github.com/highfidelity/hifi into 19783 
Conflicts:
	interface/src/scripting/WindowScriptingInterface.cpp
	interface/src/scripting/WindowScriptingInterface.h
 2014-07-25 15:53:36 -07:00
Andrew Meadows
d3ba00770f merge upstream/master into andrew/ragdoll 2014-07-25 15:34:32 -07:00
Andrew Meadows
b8b1df5799 MuscleConstraints for ragdoll; velocity for verlet points 2014-07-25 15:24:44 -07:00
Andrew Meadows
c8405d192d create MuscleConstraint for driving ragdolls 2014-07-25 15:24:14 -07:00
wangyix
fd9d7baa06 updated Agent with audiostream; added initial packets discard to audiostream 2014-07-25 15:14:10 -07:00
wangyix
f7e043f52d cleaned up code 2014-07-25 14:52:39 -07:00
wangyix
a9d26b3934 fixed repeat-popping in audiomixer 2014-07-25 12:58:10 -07:00
Clément Brisset
f5dbc54b1c Merge pull request #3208 from binaryking/19701 
Code Review for Job #19701
 2014-07-25 12:09:14 -07:00
Clément Brisset
53b345d4cd Merge pull request #3209 from AndrewMeadows/ragdoll 
Ragdoll Part 5: send visible transforms when using ragdoll
 2014-07-25 11:50:15 -07:00
Atlante45
72a31ec8fc Removed magic number to use DEFAULT_NEAR/FAR_CLIP 2014-07-25 10:56:44 -07:00
AndrewMeadows
73ec862474 Merge pull request #3207 from PhilipRosedale/master 
Velocity filter head position for less jitter in camera
 2014-07-25 09:50:21 -07:00
wangyix
059007c99c cleaned up code (removed old code that was commented out) 2014-07-25 09:43:08 -07:00
Zu
1bc6d4bf0f fix: tuned the roll and pitch jitter, round to nearest 1 dp instead of whole number 2014-07-25 18:05:17 +08:00
Zu
98bb995aba added: noise filtering to reduce rotation jitter 2014-07-25 17:32:04 +08:00
Zu
2d921924bf added: Cara Face Tracker 
added: decode cara udp packets
added: head rotation
added: hook into hifi interface
 2014-07-25 16:52:29 +08:00
Philip Rosedale
a5d6b2282e Merge pull request #3201 from wangyix/master 
moved audio stats to own overlay; audio stats now reset when audiomixer is killed;
 2014-07-24 21:40:43 -07:00
Philip Rosedale
9a83be618a Merge pull request #3191 from Atlante45/make_scriptEngine_a_qScriptEngine 
ScriptEngine now inherit from QScriptEngine
 2014-07-24 21:38:13 -07:00
David Rowe
eecdc2dc7b Increase initial width of the edit fields in JavaScript Window.form() 2014-07-24 19:00:41 -07:00
Philip Rosedale
e272d0be75 Merge pull request #3203 from Atlante45/laser_pointer_js 
Laser pointer js
 2014-07-24 17:28:08 -07:00
Atlante45
9ca00b55a5 Spelling 2014-07-24 17:19:49 -07:00
wangyix
473cbf2afe client audio now updated with stream class; seems fine for now 2014-07-24 17:15:46 -07:00
David Rowe
040254a119 Add optional Cancel button to JavaScript Window.form() 2014-07-24 17:04:02 -07:00
Andrzej Kapolka
605b3282e7 Working on render bits. 2014-07-24 17:01:15 -07:00
Stephen Birarda
6fdd64c9fc change to new style of signal slot connection for XmppClient 2014-07-24 16:52:18 -07:00
Stephen Birarda
d1b050dea8 remove extra wrapping HAVE_QXMPP if 2014-07-24 16:17:34 -07:00
Stephen Birarda
bcdfc9dd78 fix HAVE_QXMPP wrappings in XmppClient 2014-07-24 16:16:39 -07:00
Stephen Birarda
5cbd1492f2 more Cmake cleanup to grab externals 2014-07-24 15:09:41 -07:00
Andrzej Kapolka
5bd3d1fe20 Working on renderer attribute. 2014-07-24 13:16:18 -07:00
Andrew Meadows
2ddca4fbf9 split independent classes out of Ragdoll files 2014-07-24 09:50:16 -07:00
Andrew Meadows
1d124ebc61 fix comments 2014-07-24 08:49:41 -07:00
Andrew Meadows
2aaa628a67 send visible joint state when colliding as ragdoll 2014-07-24 08:42:34 -07:00
Mohammed Nafees
99ba0c6641 Merge remote-tracking branch 'upstream/master' into 19701 2014-07-24 20:28:23 +05:30
Philip Rosedale
a1b74c5272 remove unused code 2014-07-23 23:07:37 -07:00
Philip Rosedale
5aecbe690d made calculateAverageEyePosition private, changed to getEyePosition() where used outside head 2014-07-23 22:56:59 -07:00
Philip Rosedale
00fdc37822 add velocity filtering to eyePosition to reduce camera jitter from faceshift 2014-07-23 22:45:50 -07:00
Andrzej Kapolka
0da46a5bc5 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-23 18:20:34 -07:00
Andrzej Kapolka
27f88e9f80 Progress on threading. 2014-07-23 18:20:00 -07:00
Andrew Meadows
924cc600b0 merge upstream/master into andrew/ragdoll 2014-07-23 18:03:09 -07:00
Philip Rosedale
f05855dcc2 Merge pull request #3199 from ey6es/master 
Fix for shadows in close-up inset mirror.
 2014-07-23 17:49:55 -07:00
Clément Brisset
279a107272 Merge pull request #3200 from thoys/feature-multiple-JS-cursors 
Feature multiple js cursors
 2014-07-23 17:46:56 -07:00
Andrew Meadows
7f2eb88fc2 merge upstream/master into andrew/ragdoll 2014-07-23 17:01:43 -07:00
Andrew Meadows
559188cace parent-relative linear slaving of verlet shapes 2014-07-23 17:00:17 -07:00
Andrew Meadows
72c7498454 add JointState::getDistanceToParent() 2014-07-23 16:56:40 -07:00
wangyix
e2f957d6dc added InboundAudioStream class 2014-07-23 16:46:23 -07:00
wangyix
a36c9e872e merged with upstream 2014-07-23 15:36:37 -07:00
wangyix
3abd383cd3 cleaned up code more 2014-07-23 15:26:49 -07:00
Atlante45
0d039b1cdb Fixed invokeMethod bug + removed debug 2014-07-23 14:38:37 -07:00
wangyix
663cbb76dd removed seq num reset from Audio::reset() 2014-07-23 14:37:11 -07:00
wangyix
3ac4dfa333 gg 2014-07-23 14:28:32 -07:00