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

17212 commits

This branch
This branch
All branches
Author SHA1 Message Date
DaveDubUK
38f0bc9f8d Adding followThroughOverlappingAction script 
The purpose of this project is to validate the principles of animation
into a procedural animation script. To test the theory, we implemented a
simple procedural arm swing animation that is both realtime and that
incorporates Disney's principles of animation (principle of Overlapping
Action and Follow Through). When applied to the arm swing, the
principles make the shoulder rotation lead the elbow rotation which will
lead the wrist rotation. Doing so results in an organic and life-like
effect.
 2014-10-02 07:47:20 +01:00
Philip Rosedale
36e7892826 Merge pull request #3511 from PhilipRosedale/master 
Turn off room limit constraints in headMove.js that were being applied everywhere
 2014-09-30 10:06:07 -07:00
Philip Rosedale
a07a0f4f72 Disable room limits set for demo comedy club 2014-09-30 09:57:05 -07:00
AndrewMeadows
418bf1ec3c Merge pull request #3510 from ey6es/metavoxels 
Use simpler and more reliable Jacobi eigenvalue algorithm to compute SVD.
 2014-09-30 09:00:18 -07:00
Andrzej Kapolka
4cdfe87cf1 Merge pull request #3507 from Atlante45/recording_frames_interpolation 
Recording frames interpolation
 2014-09-29 19:46:11 -07:00
Andrzej Kapolka
3c1f3b77a7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-29 19:14:47 -07:00
Andrzej Kapolka
802b14d5ab Use Jacobi eigenvalue algorithm to get eigenvalues/eigenvectors. 2014-09-29 19:14:17 -07:00
Stephen Birarda
a2d263f978 Merge pull request #3509 from birarda/hydra-crash 
have OS X hydra support be disabled by default
 2014-09-29 17:29:09 -07:00
Stephen Birarda
e512b05e62 add extra debug for hydra library initialization 2014-09-29 17:28:50 -07:00
Stephen Birarda
f047c2dff0 have OS X hydra support be disabled by default 2014-09-29 17:08:06 -07:00
Stephen Birarda
1f5b13d184 Merge pull request #3508 from birarda/hydra-crash 
fix reset password link for login dialog
 2014-09-29 16:38:40 -07:00
Stephen Birarda
2fbd249d9f fix reset password link for LoginDialog 2014-09-29 16:38:10 -07:00
Philip Rosedale
e9cf993c9f Merge branch 'master' of https://github.com/worklist/hifi 2014-09-29 16:11:58 -07:00
Philip Rosedale
3b0214358b Merge pull request #3505 from birarda/hydra-crash 
dynamically load sixense lib on OS X to make avoiding hid_init crash easier
 2014-09-29 16:09:12 -07:00
Stephen Birarda
3c236cc60a resolve conflicts on merge with upstream master 2014-09-29 16:00:50 -07:00
AndrewMeadows
c8882d68dd Merge pull request #3503 from birarda/domain-wizard 
lock changes to settings in the domain-server master config file
 2014-09-29 15:41:29 -07:00
AndrewMeadows
e3e66eddaa Merge pull request #3506 from ey6es/master 
Fix for metavoxel crashes on Windows.  I was expecting the scope of a
 2014-09-29 15:34:19 -07:00
Stephen Birarda
c16ab0a19f remove definition for an unused method 2014-09-29 15:27:45 -07:00
Andrzej Kapolka
4c617c6d55 Stop using the emissive color for glow. 2014-09-29 14:51:45 -07:00
Atlante45
c99047677f Members initialisation 2014-09-29 14:49:55 -07:00
Andrzej Kapolka
b1bd9a27be Merge branch 'master' of https://github.com/highfidelity/hifi 2014-09-29 14:47:27 -07:00
Andrzej Kapolka
72ff908bd3 Fix for metavoxel crashes on Windows. I was expecting the scope of a 
temporary object to last until the next line; turns out VC++ can destroy
it in the middle of evaluating the line.
 2014-09-29 14:37:11 -07:00
Stephen Birarda
a847c2d80d move url handling to after settings load debug 2014-09-29 13:15:28 -07:00
Stephen Birarda
3fbf141686 handle avatar location changes after avatar position has been reloaded 2014-09-29 13:14:25 -07:00
Stephen Birarda
1f4c0b6340 wrap sixenseExit call in HAVE_SIXENSE ifdef 2014-09-29 13:09:25 -07:00
Stephen Birarda
db0bfd53ae make the sixense library name a constant 2014-09-29 12:58:40 -07:00
Stephen Birarda
f7a17b7dec dynamically load sixense lib on OS X to make avoiding hid_init crash easier 2014-09-29 12:58:01 -07:00
Philip Rosedale
c4be35fa8a Merge pull request #3504 from ey6es/master 
Don't bother using a callback to render the eye vectors; just rely on th...
 2014-09-29 12:33:34 -07:00
Atlante45
6d15728283 frame interpolation for recordings 2014-09-29 12:30:10 -07:00
Andrzej Kapolka
9855fbcfb4 Don't bother using a callback to render the eye vectors; just rely on the 
post-lighting call to Avatar::render, like everything else.  This should fix
the crash that Philip was seeing (presumably due to avatars' being deleted
during the draw process).
 2014-09-29 11:45:12 -07:00
Philip Rosedale
4b8003948a Merge branch 'master' of https://github.com/worklist/hifi 2014-09-29 10:52:19 -07:00
Stephen Birarda
eb7ee36168 use two dashes for url as command line option 2014-09-29 10:29:40 -07:00
Stephen Birarda
bd4a32551b fix for settings save without organization 2014-09-29 10:09:33 -07:00
Stephen Birarda
46258ae78f add a tooltip to say why locked settings cannot be changed 2014-09-29 10:02:01 -07:00
Stephen Birarda
58b03c7ef2 disable form inputs for values set by master config 2014-09-29 09:53:27 -07:00
Stephen Birarda
ec0805acc5 add locked settings to json return for auth'ed settings 2014-09-29 09:34:04 -07:00
Stephen Birarda
5e2870ac5f require a distinction between master config and user config 2014-09-29 09:30:08 -07:00
Brad Hefta-Gaub
a701bcea7b Merge pull request #3502 from ctrlaltdavid/20055 
Make default eye model calculation be reliable
 2014-09-28 12:06:03 -07:00
Clément Brisset
6d3bdd862b Merge pull request #3501 from ey6es/metavoxels 
Use the rather elaborate technique described in the Rice papers to find the minimizing point for each cell.
 2014-09-27 19:52:42 -07:00
David Rowe
dbf6daf80c Fix default eye model calculation to be reliable 2014-09-27 11:25:37 -07:00
Brad Hefta-Gaub
e751605647 Merge pull request #3500 from Atlante45/fix_chat_shortcut 
Fix chat shortcut
 2014-09-26 20:39:07 -07:00
Andrzej Kapolka
681bb60d03 Could extra comments. 2014-09-26 20:24:24 -07:00
Andrzej Kapolka
1cbbcdaedc Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-09-26 20:11:47 -07:00
Atlante45
7d78584aee Fix chat shortcut 2014-09-26 20:11:14 -07:00
Andrzej Kapolka
533d59becc Merge pull request #3499 from Atlante45/radio_js 
Stereo fix
 2014-09-26 20:04:55 -07:00
Atlante45
5a8b9082b2 Check _currentSendPosition instead of overriding 2014-09-26 19:47:26 -07:00
Andrzej Kapolka
8ebb2a7fb4 Ridiculously complicated minimization code. 2014-09-26 19:32:41 -07:00
Atlante45
dfe70ed2e3 Initialize InjectedAudioStream with correct stereo value 2014-09-26 19:23:36 -07:00
Philip Rosedale
11395a0e10 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-26 17:03:44 -07:00
Philip Rosedale
9b228c9e37 Merge pull request #3497 from ZappoMan/entityPropsRescale 
add rescale support to entity properties UI
 2014-09-26 16:42:15 -07:00