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

6281 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
4dec183262 Enlarge heads when they're moused over. 2013-09-26 12:07:13 -07:00
Andrzej Kapolka
3ccf276137 Merge branch 'master' of https://github.com/worklist/hifi into grower 2013-09-25 18:06:27 -07:00
Andrzej Kapolka
83e9f9685b Merge pull request #981 from ey6es/master 
Fix to load Ryan's alien model (handle per-vertex normals).
 2013-09-25 17:59:06 -07:00
Andrzej Kapolka
0ae614fa7b Fix to load Ryan's alien model (handle per-vertex normals). 2013-09-25 17:55:22 -07:00
Andrzej Kapolka
63efeccb13 Renaming for clarity. 2013-09-25 17:38:37 -07:00
Philip Rosedale
c626856ff5 Merge pull request #980 from ey6es/blendface 
Render the eye textures and draw the eye vectors from the correct locations.
 2013-09-25 16:48:05 -07:00
Andrzej Kapolka
736dae0c81 Use shaders for eyes (like the ones for the iris). 2013-09-25 15:26:29 -07:00
Andrzej Kapolka
7d14aaeea4 Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-25 14:39:43 -07:00
Andrzej Kapolka
7a567e214c Merge pull request #979 from ey6es/master 
Faceshift starts reporting failure to track under load, so determine act...
 2013-09-25 14:39:22 -07:00
Andrzej Kapolka
6e8df9584e Faceshift starts reporting failure to track under load, so determine active 
state based on the amount of time elapsed since last successful tracking data
received.
 2013-09-25 14:37:53 -07:00
Andrzej Kapolka
402f65fc00 Use the blend face eye locations for the eye vectors, when possible. 2013-09-25 14:12:50 -07:00
Andrzej Kapolka
9a16d44a47 Render the eye textures. 2013-09-25 13:47:03 -07:00
Andrzej Kapolka
4567b8afdf Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-25 11:40:16 -07:00
Andrzej Kapolka
f538727631 Merge pull request #978 from ey6es/master 
Slight fix: make sure we set isEye on each mesh.
 2013-09-25 11:38:52 -07:00
Andrzej Kapolka
2c7bb1a3d9 Slight fix: make sure we set isEye on each mesh. 2013-09-25 11:38:00 -07:00
Andrzej Kapolka
85ab9b7576 Use the texture coordinates when rendering the eyes. 2013-09-25 11:35:02 -07:00
Andrzej Kapolka
c0c542f1c3 Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-25 11:03:19 -07:00
Andrzej Kapolka
7ff5167bb7 Read in the texture coordinates, too. 2013-09-25 11:02:56 -07:00
Philip Rosedale
695f0eba14 Merge pull request #977 from ZappoMan/svofilldown 
implement SVO fill down in voxel-edit
 2013-09-25 11:01:15 -07:00
Philip Rosedale
2db8985c63 Merge pull request #976 from ey6es/blendface 
Include other meshes (eyes, teeth) from the FBX files.
 2013-09-25 10:59:27 -07:00
ZappoMan
02bc25f797 implement SVO fill down in voxel-edit 2013-09-25 09:51:15 -07:00
Andrzej Kapolka
71ec6f75e5 Move the eyeball meshes according to the lookat direction (not really visible 
yet since the eyeballs have no textures).
 2013-09-24 18:57:37 -07:00
Andrzej Kapolka
452eb9be47 Extract the pivot points from the limb nodes, make sure we extract the vector 
elements in the right order.
 2013-09-24 16:50:38 -07:00
Andrzej Kapolka
b44e962ac7 Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-24 14:30:57 -07:00
Andrzej Kapolka
4666c736d8 Remove unused variable. 2013-09-24 14:24:57 -07:00
Andrzej Kapolka
1b9444cb39 As a temporary hack, render the mesh with the most blendshapes with the head 
color (other meshes white).
 2013-09-24 14:22:01 -07:00
Andrzej Kapolka
fd41a075ed Added support for multiple blended meshes. 2013-09-24 13:53:19 -07:00
Andrzej Kapolka
ad69a9547f Remove the pose bits, at least for now. 2013-09-24 11:12:59 -07:00
ZappoMan
cde5ffbbf9 Merge pull request #975 from PhilipRosedale/master 
Increase thrust while holding keys down to allow very fast speeds
 2013-09-24 07:30:36 -07:00
Freddy
6bbe34a8c4 missing space 2013-09-23 23:06:32 -07:00
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
Andrzej Kapolka
aa6eb7b3d8 Render the "other" meshes as separate, static, white. 2013-09-23 16:34:28 -07:00
Andrzej Kapolka
9034eb1e72 Experimenting with the simplest method of including the other meshes. 2013-09-23 14:37:48 -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