Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 04:33:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
6249 commits 71 branches 56 tags 1.2 GiB
Commit graph

6249 commits

This branch
This branch
All branches
Author SHA1 Message Date
Freddy
36104d0b06 remove unused older voxel grab thrust 2013-09-23 23:04:27 -07:00
Freddy
027811e37c Increase thrust while holding keys down to allow very fast speeds 2013-09-23 22:53:35 -07:00
Philip Rosedale
297652a83b Merge pull request #974 from ey6es/blendface 
Render blended faces as solid and remove the "Use Faceshift Rig" option (which isn't visible to others).
 2013-09-23 13:25:52 -07:00
Andrzej Kapolka
255e5179ae Let's actually use the variable we initialized. 2013-09-23 13:02:00 -07:00
Andrzej Kapolka
7bedcd3d5a Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-23 12:43:39 -07:00
Andrzej Kapolka
1a55c64299 Scale the normal contributions down. For some reason, their magnitudes are 
higher than one would expect.
 2013-09-23 12:42:58 -07:00
Andrzej Kapolka
807f6aaf14 Temporarily render the normals for debugging. 2013-09-23 12:20:19 -07:00
Andrzej Kapolka
c7bb523fc5 Apply the skin color to the blend face. 2013-09-23 12:15:02 -07:00
Andrzej Kapolka
1893fdba29 Revert "Trying a different method of updating the normals." 
This reverts commit 8e2be380f6.
 2013-09-23 11:47:59 -07:00
Philip Rosedale
319c6a6dab Merge pull request #970 from problem/master 
Changes to README to make it as clear & easy as possible
 2013-09-23 11:30:30 -07:00
Andrzej Kapolka
8e2be380f6 Trying a different method of updating the normals. 2013-09-23 11:17:12 -07:00
ZappoMan
ab098978b6 Merge pull request #973 from birarda/assignment 
changes to assignment to allow for a voxelized game of life
 2013-09-23 11:02:04 -07:00
Andrzej Kapolka
0fa2eca02d Remove option to use Faceshift rig (using the "macaw" model has much the same 
result, and it lets other people see it).
 2013-09-23 10:43:20 -07:00
Andrzej Kapolka
8c963ed6a7 Blend the normals, too. 2013-09-23 10:30:03 -07:00
Stephen Birarda
daa5493973 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-23 09:57:22 -07:00
Stephen Birarda
313410ae0d updates to Agent class needed for game of life 2013-09-23 09:57:05 -07:00
Stephen Birarda
77193dd707 change the placeholder javascript to be 32x32 game of life 2013-09-23 09:56:07 -07:00
Stephen Birarda
dd4215d0fd add a destructive voxel add command to VoxelScriptingInterface 2013-09-23 09:55:31 -07:00
Philip Rosedale
8bf9c37457 Merge pull request #972 from ey6es/blendface 
Cache face models, don't render neck/neck base when face model is displayed.
 2013-09-20 18:02:20 -07:00
Andrzej Kapolka
0daee703d6 Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-20 17:57:18 -07:00
Andrzej Kapolka
24bf1e2036 Don't render neck/neck base when blend face is active. 2013-09-20 17:55:31 -07:00
Andrzej Kapolka
133ba3a00a Set normals based on indices, cache face models. 2013-09-20 17:40:15 -07:00
Stephen Birarda
e774419f8d Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-20 17:39:03 -07:00
Philip Rosedale
8fa4a60d31 Merge pull request #971 from ey6es/blendface 
Fix to allow models other than the pug.
 2013-09-20 17:03:58 -07:00
Andrzej Kapolka
ddb0d916ae Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-20 16:50:38 -07:00
Andrzej Kapolka
9c2d851650 Fixed bug in decoding: newer versions of Qt streaming use whatever precision 
the stream is set at for both floats and doubles.
 2013-09-20 16:38:44 -07:00
ZappoMan
ceaa3722be Merge pull request #969 from birarda/master 
remove the sphere from the ground plane
 2013-09-20 15:56:51 -07:00
Grayson Stebbins
eb0a87cdc1 Made the domain server portion at the end more concise 2013-09-20 15:54:43 -07:00
Grayson Stebbins
52425365cc Several changes to language to make it more clear 2013-09-20 15:49:26 -07:00
Andrzej Kapolka
e54a828b17 Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-20 15:29:11 -07:00
Andrzej Kapolka
120f8f729c Find the mesh that corresponds to the blendshapes. 2013-09-20 15:28:08 -07:00
Stephen Birarda
3d1c77d047 expose the TREE_SCALE to JS 2013-09-20 14:47:36 -07:00
Stephen Birarda
6533d7fcde add method to packet sender to flush queue without sleep 2013-09-20 14:40:09 -07:00
Stephen Birarda
04c4dabd3d unblock socket receive in Agent, add destructive voxel add to VS scripting 2013-09-20 14:35:25 -07:00
Stephen Birarda
f8f0e3db1b remove the sphere from the ground plane 2013-09-20 14:04:18 -07:00
Andrzej Kapolka
137ebc67d5 Merge pull request #968 from ey6es/blendface 
Another slight face fix: clear the face when set, before loading the new...
 2013-09-20 13:47:34 -07:00
Andrzej Kapolka
fe0d93102e Another slight face fix: clear the face when set, before loading the new one. 2013-09-20 13:46:29 -07:00
Andrzej Kapolka
873b56e39f Merge pull request #967 from ey6es/blendface 
Fix for face model sending.
 2013-09-20 13:29:57 -07:00
Andrzej Kapolka
df0b2f4eec Fix for face model sending. 2013-09-20 13:28:50 -07:00
Stephen Birarda
4f3909b682 Merge pull request #964 from ey6es/blendface 
Custom Faceshift faces: either the rig from the TCP interface, or mesh from an FBX file.  Still need normals, etc.
 2013-09-20 10:15:08 -07:00
Andrzej Kapolka
77d9e21162 Meant to include this in the last commit. 2013-09-20 10:06:34 -07:00
Andrzej Kapolka
318b8c38bc Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-20 09:58:54 -07:00
Stephen Birarda
962dc0616d Merge pull request #966 from ZappoMan/multi_VS_assigments 
remove standalone voxel server
 2013-09-20 09:57:38 -07:00
Andrzej Kapolka
2f5a5a4b27 Remove unnecessary, unlucky "13," add note explaining arbitrary translation. 2013-09-20 09:52:15 -07:00
ZappoMan
b682d3612b remove standalone voxel server 2013-09-19 22:09:03 -05:00
Andrzej Kapolka
9d28aaefae Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-19 18:00:46 -07:00
Andrzej Kapolka
96e6b45dad Merge pull request #965 from ey6es/master 
Fix for menu not showing up on Linux: don't parent the info view to the menu.
 2013-09-19 17:59:34 -07:00
Andrzej Kapolka
94d6f00f65 Parenting the info view to the menu is preventing the menu from showing up on 
Linux.  Let's try not doing that.
 2013-09-19 17:47:50 -07:00
Andrzej Kapolka
c049665090 Removed temporary comment. 2013-09-19 16:42:25 -07:00
Andrzej Kapolka
5c841616dc Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-19 16:37:26 -07:00