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

8289 commits

Author SHA1 Message Date
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
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
d0a1d732c9 updated preferences UI "samples" to "frames" 2014-07-28 14:18:22 -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
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
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
Stephen Birarda
5bc42b9d1c add back the lost QXMPP_STATIC definition 2014-07-24 17:02:30 -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
Stephen Birarda
1d78427e6a only override root dir for interface externals if they don't exist 2014-07-24 14:09:49 -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
AndrewMeadows
509b86f092 Merge pull request #3205 from birarda/select-library 
lowercase the SIXENSE_ROOT_DIR
 2014-07-23 18:01:23 -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
Stephen Birarda
4cf27a0099 check in sixense not Sixense 2014-07-23 17:44:38 -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
Atlante45
e1365a2927 Forgot one change 2014-07-23 14:19:47 -07:00
wangyix
06ed8e4b63 fixed some typos in audio stats; cleaned up code 2014-07-23 13:47:03 -07:00
wangyix
bd8b7eb710 minor spacing issue 2014-07-23 12:44:16 -07:00
wangyix
142bda3ed4 fixed audio stats typos 2014-07-23 12:43:26 -07:00
wangyix
5eaa57b3ad removed more warnings about unused vars 2014-07-23 12:10:25 -07:00
wangyix
ba4403b063 audio stats look good on Mac now 2014-07-23 11:18:25 -07:00
wangyix
5b0b484727 finished new audio stats (looks good on Windows) 2014-07-23 11:00:48 -07:00
Thijs Wenker
9d5c81bd67 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-23 16:59:23 +02:00
Thijs Wenker
b6cb19c2f6 FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors) 2014-07-23 16:55:59 +02:00
Andrzej Kapolka
bbd977777a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-22 19:24:02 -07:00
Andrzej Kapolka
9cf0d6c851 Fix for shadows in close-up inset mirror. 2014-07-22 19:19:13 -07:00
Andrzej Kapolka
02bf76240a Multiply local light colors by material diffuse reflectance. 2014-07-22 18:30:28 -07:00
Andrzej Kapolka
34dfbbedde Merge pull request #3196 from PhilipRosedale/master 
Tweaks to world and avatar lights, add angular acceleration to hair
 2014-07-22 18:16:20 -07:00
Andrzej Kapolka
4f87524821 Switched back to using uniforms for light parameters, as using the fixed 
function state killed my frame rate.  Also cleaned up some of the location
tracking.
 2014-07-22 18:03:13 -07:00
wangyix
d9692e4af4 changed a > to >= in handleAudioInput; added audio input buffer latency to stats; 2014-07-22 17:34:35 -07:00
Philip Rosedale
4f52098da1 tuning tweaks to world and avatar lights 2014-07-22 20:23:23 -04:00
Philip Rosedale
176473b5ba Merge branch 'master' of https://github.com/worklist/hifi 2014-07-22 19:29:42 -04:00
AndrewMeadows
07ce6c9a64 Merge pull request #3192 from ey6es/master 
Fixes for local lights.
 2014-07-22 16:24:17 -07:00
Stephen Birarda
56efa46812 repair for Visage find module base includes 2014-07-22 15:56:22 -07:00
Andrzej Kapolka
d4904f976a Missed the local light stats. 2014-07-22 15:50:08 -07:00
Andrzej Kapolka
aa145c8d20 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-22 15:40:42 -07:00
Andrzej Kapolka
cfc77cd99a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-22 15:24:01 -07:00
wangyix
c8ac1732ec removed audio stats from old location 2014-07-22 14:53:45 -07:00
Stephen Birarda
5c955ca656 fix faceshift definition 2014-07-22 14:48:51 -07:00
Andrzej Kapolka
c085d09835 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-22 14:48:18 -07:00
Andrzej Kapolka
c31dd4df5f Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-22 14:46:43 -07:00
Stephen Birarda
19618182a3 don't show Faceshift option if not present 2014-07-22 14:40:53 -07:00
Stephen Birarda
f325500d14 repairs to stubbed faceshft constructor 2014-07-22 14:38:41 -07:00
wangyix
1b2dc2cbe1 added central audio stats including pipeline latency; old stats still there 2014-07-22 14:21:53 -07:00
Leonardo Murillo
6f0f6488d5 Merge pull request #3182 from birarda/select-library 
dynamic selection of debug and release libraries for externals
 2014-07-22 15:17:48 -06:00
Andrzej Kapolka
be028c2b01 Fixes for local lights. 2014-07-22 14:13:51 -07:00
wangyix
f7381c70bc starvcount and notmixedcount also reset when audiomixer is killed 2014-07-22 11:09:47 -07:00
wangyix
847bc28990 Audio stats now reset when AudioMixer is killed 2014-07-22 10:27:26 -07:00
Philip Rosedale
b7663b93e3 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-22 11:05:01 -04:00
Andrzej Kapolka
0ddd3e650c More point bits (trying a different tack). 2014-07-21 19:00:13 -07:00
Brad Hefta-Gaub
01ebefbffd Merge pull request #3189 from wangyix/master 
Made Audio.cpp always push a whole number of frames to the audio output; added audio input buffer stats to interface
 2014-07-21 17:46:42 -07:00
wangyix
f6ef61e76a fixed some typos 2014-07-21 17:15:08 -07:00
wangyix
0bcc13aec9 made Audio always push a whole number of frames to the audio output 2014-07-21 17:12:03 -07:00
Philip Rosedale
87659741b5 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-21 16:11:09 -07:00
wangyix
621f0725cc added input ring buffer stats to interface 2014-07-21 15:39:33 -07:00
Brad Hefta-Gaub
fb097c77b5 Merge pull request #3186 from wangyix/master 
made Audio::_ringBuffer size 10 frames for non-Windows builds; improved interface downstream audio framesAvailable stat; disable QAudioOutput overflow check by default
 2014-07-21 14:50:15 -07:00
Andrzej Kapolka
dd7f3703e1 More work on point rendering. 2014-07-21 14:48:54 -07:00
wangyix
05ea5f8d21 changed menu item name for QAudioOutput overflow check 2014-07-21 14:32:44 -07:00
wangyix
603974c8a2 separated ringbuffer and outputbuffer avg framesAvailable stats in interface 2014-07-21 14:27:09 -07:00
Atlante45
029160a60a Merge branch 'master' of https://github.com/highfidelity/hifi into laser_pointer_js 2014-07-21 14:12:17 -07:00
AndrewMeadows
854ca4bc66 Merge pull request #3185 from Barnold1953/OculusOverlay 
Add hydra lasers for menu picking.
 2014-07-21 13:54:07 -07:00
wangyix
a70eb12245 made Audio::_ringbuffer 10 frames for nonWindows; 
fixed/separated framesAvailable stats for _ringBuffer and _audioOutput;
made QAudioOutput overflow check disabled by default
 2014-07-21 13:21:31 -07:00
Mohammed Nafees
17d827b66d Show script instance with script name in Running Scripts Widget 2014-07-22 01:23:05 +05:30
barnold1953
03bc3a9ff8 Added checkable menu option for laser toggle 2014-07-21 12:35:46 -07:00
Philip Rosedale
8460cecf7a Merge branch 'master' of https://github.com/worklist/hifi 2014-07-21 12:28:15 -07:00
barnold1953
98babe1751 Working hydra lazers when not in oculus 2014-07-21 12:17:13 -07:00
Andrzej Kapolka
4ff3222609 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-21 11:26:55 -07:00
ZappoMan
7c5a77ddfe revert back the largest capacity of the client ring buffer back to the smaller default value 2014-07-21 10:29:51 -07:00
Stephen Birarda
b9807dcc4c Merge branch 'master' of https://github.com/highfidelity/hifi into select-library 2014-07-21 08:57:24 -07:00
barnold1953
16fd8f224c Imrpoved repeat texture method, its almost finished 2014-07-18 21:42:20 -07:00
Andrzej Kapolka
38f3f80398 More work on point rendering. 2014-07-18 18:51:01 -07:00
Stephen Birarda
a370156720 add a note for OS X users to use homebrew 2014-07-18 15:39:21 -07:00
Atlante45
35caef1882 Added pointing behaviour 2014-07-18 15:39:12 -07:00
Atlante45
f8772e10a1 Changed enum names 2014-07-18 15:38:36 -07:00
barnold1953
c6bda4bf16 Moved sixense laser stuff to MyAvatar 2014-07-18 15:26:18 -07:00
Stephen Birarda
10ed33cb38 further patching to conditionally build without Faceshift 2014-07-18 14:34:15 -07:00
Stephen Birarda
b2a99edb2e fix conditional builds without Faceshift 2014-07-18 14:27:20 -07:00
Stephen Birarda
e060693856 remove faceshift from repository, make external dependency 2014-07-18 13:54:44 -07:00
Andrzej Kapolka
cda1a7f32a Working on optimized point rendering. 2014-07-18 12:27:51 -07:00
Andrzej Kapolka
1d6f4295c3 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-18 11:45:02 -07:00
Stephen Birarda
9e83040fb4 more find module standardization and cleanup 2014-07-18 10:20:12 -07:00
Stephen Birarda
e619393ac0 link to GLEW_LIBRARIES instead of GLEW_LIBRARY in interface CMakeLists 2014-07-18 10:12:52 -07:00
Stephen Birarda
b0864b01de cleanup the FindPrioVR module and fix GLUT include 2014-07-18 10:05:58 -07:00
Philip Rosedale
c1832bed9c Merge branch 'master' of https://github.com/worklist/hifi 2014-07-17 18:31:52 -07:00
Philip Rosedale
2cee5992a0 Merge pull request #3183 from Atlante45/js_s3_browse 
Js s3 browse
 2014-07-17 18:31:30 -07:00
Atlante45
c07ba9fec5 Added browser as a tool 2014-07-17 17:50:56 -07:00
Stephen Birarda
cb384ac01b final repairs to LibOVR for multiple include folders 2014-07-17 17:24:47 -07:00
Atlante45
7ab8b5a843 Added S3 browser 2014-07-17 17:12:54 -07:00
Stephen Birarda
3fad0e6ac8 cleanup qxmpp find module, use select_library_confgurations 2014-07-17 16:49:17 -07:00
Stephen Birarda
68f9334628 cleanup Faceplus and Faceshift find modules, fix for OVR stitched include 2014-07-17 16:37:10 -07:00
Stephen Birarda
ffb0ea30f8 Merge branch 'master' of https://github.com/highfidelity/hifi into select-library 2014-07-17 16:12:24 -07:00
Philip Rosedale
2972bc7b45 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-17 16:04:21 -07:00
Philip Rosedale
e8539d0006 Merge pull request #3181 from birarda/master 
foundation of support for signed transactions from interface
 2014-07-17 16:03:28 -07:00
Philip Rosedale
1b265f3adb Merge pull request #3180 from AndrewMeadows/ragdoll 
Ragdoll Part4: ragdoll shapes follow target joints, visible joints follow ragdoll shapes
 2014-07-17 16:00:02 -07:00
Stephen Birarda
45f4e033f3 fix the LibOVR find module to grab a util header 2014-07-17 15:55:10 -07:00
Stephen Birarda
e7269e809e allow use of debug/release leapmotion library with select_library_configurations 2014-07-17 15:41:47 -07:00
Stephen Birarda
03a052d89c add debug/release linking to sixense via select_library_configurations 2014-07-17 15:27:55 -07:00
Stephen Birarda
074d7f40bb add dynamic selection of debug or release for oculus libraries 2014-07-17 15:10:32 -07:00
Stephen Birarda
cebd379b68 don't pass OpenSSL libraries as string 2014-07-17 14:47:45 -07:00
Stephen Birarda
5cad6edb38 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-17 14:06:11 -07:00
Brad Hefta-Gaub
437e3efbc2 Merge pull request #3179 from wangyix/quick_audio_PR 
Lost audio packets are replaced with silent frames in AudioMixer; AudioMixer silent-packet-dropping now enabled no matter what; Moving avg of audio frames available replaces _currentJitterBufferFrames
 2014-07-17 11:44:05 -07:00
Stephen Birarda
45ae9f614d add dialog to Menu to insert wallet private key 2014-07-17 11:43:30 -07:00
Stephen Birarda
0c8c4a2cf9 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-07-17 11:08:35 -07:00
Andrew Meadows
b22652f441 merge upstream/master into andrew/ragdoll 2014-07-17 10:52:27 -07:00
Andrew Meadows
783cde7376 minor tweak to rate at which ragdoll shapes follow joints 2014-07-17 10:51:17 -07:00
Andrew Meadows
25840cad49 fix bug in mixVisibleRotationDelta() 
was using a non-visible rotation
 2014-07-17 10:33:11 -07:00
Philip Rosedale
92cd82c290 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-17 10:00:50 -07:00
Brad Hefta-Gaub
87ff6b9012 Merge pull request #3178 from Atlante45/activity_logger_on_off_option 
Activity logger on off option
 2014-07-17 08:53:47 -07:00
Brad Hefta-Gaub
d8d6d08958 Merge pull request #3145 from samcake/19734 
19734 - Leapmotion support
 2014-07-17 08:45:55 -07:00
Andrzej Kapolka
28dbb60e7e Working on post-visit callback. 2014-07-16 19:14:38 -07:00
Atlante45
6cb5483c21 Added send data option to prefs 2014-07-16 17:56:29 -07:00
Andrzej Kapolka
64c3a623f4 Working on point buffer building. 2014-07-16 17:56:22 -07:00
wangyix
8763b39393 changed format label string a bit 2014-07-16 17:30:18 -07:00
Philip Rosedale
6bd3e99569 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-16 17:26:56 -07:00
Stephen Birarda
cb9a2c615e use OpenSSL to create signed wallet transaction using hard-code key 2014-07-16 15:44:49 -07:00
wangyix
6764ace8eb droppable silent packets are added for dropped packets; 
_currentJitterBufferFrames replaced with moving average of frames
available.  Downstream framesAvailable stat now includes the frames in
QAudioOutput as well as the ringbuffer.
 2014-07-16 14:41:24 -07:00
Stephen Birarda
74a107f9f4 initial rev of SignedWalletTransaction that creates a message 2014-07-16 12:26:24 -07:00
Atlante45
5dca794322 On/Off for activity logger 2014-07-16 12:22:27 -07:00
Brad Hefta-Gaub
8a1484ce68 Merge pull request #3174 from wdings23/fix_new_avatar_light 
Fix new avatar light
 2014-07-16 12:03:21 -07:00