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

15076 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Stephen Birarda
e182f54180 exclude sixense debug on UNIX only, not APPLE 2014-07-23 17:52:50 -07:00
Stephen Birarda
9fcb6735ce Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-23 17:50:18 -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
Stephen Birarda
bc96975700 don't look for debug sixense on UNIX to avoid missing symbol 2014-07-23 17:49:38 -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
barnold1953
3d3b4572e3 Added bot_randomExpression.js to test blendshapes 2014-07-23 17:19:41 -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
Andrew Meadows
b62f04e9fe check for nan's coming out of rotationBetween() 2014-07-23 16:51:53 -07:00
Andrew Meadows
c0e02107c5 minor cleanup 2014-07-23 16:51:26 -07:00
barnold1953
aba031a125 Proper blendshape JS api. 2014-07-23 16:25:45 -07:00
barnold1953
ba9d896856 Revert "Added FacialAnimationData class" 
This reverts commit fc9fb11e4f.
 2014-07-23 15:54:47 -07:00
barnold1953
7c89201ce8 Revert "Moved some FaceShift stuff to FacialAnimationData. Made use of" 
This reverts commit f3ae228030.
 2014-07-23 15:54:45 -07:00
barnold1953
6aa9e6b736 Revert "Ability to modify AC avatar blendshapes from JS" 
This reverts commit 512034fd7c.
 2014-07-23 15:54:40 -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
Stephen Birarda
53d0351f00 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-23 15:23:49 -07:00
barnold1953
512034fd7c Ability to modify AC avatar blendshapes from JS 2014-07-23 15:23:27 -07:00
Thijs Wenker
49fcd302f4 AbstractControllerScriptingInterface matches ControllerScriptingInterface 2014-07-24 00:16:00 +02: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
Stephen Birarda
7afc62db15 Merge pull request #3202 from wangyix/7_23_seq_fix 
fixes seq num errors when spacebar
 2014-07-23 14:30:56 -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
Atlante45
cc2bc1ef78 Merge branch 'master' of https://github.com/highfidelity/hifi into make_scriptEngine_a_qScriptEngine 2014-07-23 14:01:58 -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
4a4d065f00 another parseData change 2014-07-23 12:06:31 -07:00
Stephen Birarda
74d17a094f tweaks to string default handling in DomainServerSettingsManager 2014-07-23 11:47:56 -07:00
wangyix
849c489b4c removed warnings about parseData() overloading in ringbuffer classes 2014-07-23 11:20:30 -07:00
wangyix
ba4403b063 audio stats look good on Mac now 2014-07-23 11:18:25 -07:00
Stephen Birarda
ebf5379275 default voxel costs to free, add a wallet ID for voxel change payments 2014-07-23 11:13:12 -07:00
wangyix
5b0b484727 finished new audio stats (looks good on Windows) 2014-07-23 11:00:48 -07:00
Stephen Birarda
1a13fbb437 add a setting section for voxel costs 2014-07-23 10:54:55 -07:00
Stephen Birarda
70c8ddf961 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-23 10:38:08 -07:00
Thijs Wenker
e36891fdf2 removed unused variable 2014-07-23 18:56:34 +02: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
9cf0d6c851 Fix for shadows in close-up inset mirror. 2014-07-22 19:19:13 -07:00
Philip Rosedale
311e752682 Merge branch 'master' of https://github.com/worklist/hifi 2014-07-22 21:55:04 -04:00
Philip Rosedale
9cee549bf0 Merge pull request #3198 from ey6es/master 
Multiply local light colors by material diffuse reflectance.
 2014-07-22 21:54:22 -04:00
Andrzej Kapolka
02bf76240a Multiply local light colors by material diffuse reflectance. 2014-07-22 18:30:28 -07:00