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

6348 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
3c6fb2914f Use inheritance type flags. Getting closer to the correct transforms. 2013-10-01 15:03:29 -07:00
Andrzej Kapolka
3c3cf0b002 Basic geometry sharing/texture loading. 2013-10-01 10:50:09 -07:00
Philip Rosedale
19e20f64b4 Merge pull request #999 from ZappoMan/master 
fix hang on preference dialog box
 2013-09-30 15:28:20 -07:00
ZappoMan
865bb7555f fix hang on preference dialog box 2013-09-30 15:27:02 -07:00
Philip Rosedale
2a6ad30d96 Merge pull request #998 from birarda/voxel-delete 
add deletion of voxels to VS scripting
 2013-09-30 15:20:39 -07:00
Stephen Birarda
29ae5beb54 add a voxel delete to VoxelScriptingInterface 2013-09-30 15:11:02 -07:00
Stephen Birarda
617b905385 Merge pull request #996 from ey6es/master 
Transformation rejiggery to support Ryan's alien model.
 2013-09-30 14:34:26 -07:00
Stephen Birarda
8b27a4c0a1 Merge pull request #995 from PhilipRosedale/master 
Touch-look much smoother when flying
 2013-09-30 14:32:40 -07:00
Andrzej Kapolka
71d68796f3 Remove whitespace. 2013-09-30 13:27:10 -07:00
Andrzej Kapolka
5dc7b64c03 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-30 13:22:59 -07:00
Andrzej Kapolka
40d195595f Include the neck pivot when we get the eye locations. 2013-09-30 13:20:28 -07:00
Andrzej Kapolka
d4c4cbc981 Get the neck joint and position blend face relative to that. 2013-09-30 13:15:59 -07:00
Philip Rosedale
a22b3d28bf Merge branch 'master' of https://github.com/worklist/hifi 2013-09-30 12:44:07 -07:00
Philip Rosedale
f30ff1704a Fix to make touch-look MUCH smoother for flying around 2013-09-30 12:43:25 -07:00
Andrzej Kapolka
d4203ff3d3 Pivot fix. 2013-09-30 12:01:27 -07:00
Philip Rosedale
7a74432bef Merge pull request #994 from ZappoMan/voxel_geo_shader 
removed old normal support from voxel system only using global normals
 2013-09-30 11:37:09 -07:00
Andrzej Kapolka
1592aac177 Getting closer to the correct set of transforms. 2013-09-30 11:24:41 -07:00
ZappoMan
86b4b7079d Merge pull request #993 from PhilipRosedale/master 
Click on voxels as way of moving around
 2013-09-30 09:30:37 -07:00
ZappoMan
b6fe8befdc removed old normal support from voxel system only using global normals 2013-09-30 09:29:04 -07:00
Philip Rosedale
cb0046b52b Merge remote-tracking branch 'philip/master' 2013-09-28 15:26:57 -07:00
Philip Rosedale
9645cd9831 Click on voxels as way of moving around 2013-09-28 15:18:59 -07:00
Philip Rosedale
abee08c91a Merge pull request #987 from stojce/19422 
Code Review for Job #19422
 2013-09-28 11:52:30 -07:00
stojce
a0f23d409e Merging changes 2013-09-28 13:16:50 +02:00
stojce
bac228bdb8 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-28 12:47:47 +02:00
Andrzej Kapolka
f8d26f207d Include the local transforms from the FBX file when rendering meshes. 2013-09-27 17:57:18 -07:00
Stephen Birarda
6e99955e9d Merge pull request #991 from birarda/master 
initialize _shouldStop for Agent instance to false
 2013-09-27 16:28:14 -07:00
PhilipRosedale
39cf3375e5 small change to README 2013-09-27 16:27:42 -07:00
Stephen Birarda
ad8c676fea sensibly initialize _shouldStop to false 2013-09-27 16:23:07 -07:00
ZappoMan
5dd4d8a8e1 Merge pull request #990 from PhilipRosedale/master 
Smooth flying, fixed spinning problem, top speed about Mach 1
 2013-09-27 16:22:49 -07:00
Freddy
d63ead8727 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-27 15:13:43 -07:00
Philip Rosedale
1189ac2216 Merge pull request #989 from ZappoMan/voxel_geo_shader 
add support for global normals for voxels
 2013-09-27 15:10:53 -07:00
Freddy
c78aa591c5 Fix spinning while flying, top speed now about Mach 1 2013-09-27 15:08:10 -07:00
ZappoMan
8cffa8d872 add support for global normals for voxels 2013-09-27 15:04:44 -07:00
Freddy
d44961a175 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-27 13:50:56 -07:00
Philip Rosedale
549b863665 Merge pull request #988 from ZappoMan/voxel_geo_shader 
voxel rendering performance and debugging improvements
 2013-09-27 13:27:29 -07:00
ZappoMan
dbfc0956c1 added normals to voxel shader 2013-09-27 13:26:58 -07:00
Freddy
89404bb6a2 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-27 11:17:13 -07:00
ZappoMan
605c2f30cf add memory usage debugging 2013-09-27 10:17:10 -07:00
ZappoMan
eb6af1afbf fix byte normals, fix crashes in switching between voxel shader and normal mode 2013-09-27 09:02:51 -07:00
ZappoMan
fb85add6b4 Merge pull request #986 from PhilipRosedale/master 
Faceshift rotates body, slow near others for easier positioning
 2013-09-27 07:01:00 -07:00
Freddy
0816bdcd4a Merge branch 'master' of https://github.com/worklist/hifi 2013-09-27 00:53:56 -07:00
Philip Rosedale
1bd67d3243 Merge pull request #985 from ZappoMan/voxel_geo_shader 
add support for use of Byte normals
 2013-09-27 00:52:12 -07:00
Freddy
f88a3633a5 Slow down when near other avatars for easier positioning 2013-09-27 00:40:41 -07:00
Freddy
6b0f9314ba Faceshift drives body rotation, remove gyro-driven rotation 2013-09-26 23:52:44 -07:00
ZappoMan
2487a55be9 add support for use of Byte normals 2013-09-26 19:04:19 -07:00
Freddy
462d0b90c1 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-26 17:26:59 -07:00
Philip Rosedale
0fbabe9891 Merge pull request #984 from ZappoMan/voxel_geo_shader 
Voxel Geometry Shader Experiment
 2013-09-26 17:22:55 -07:00
Freddy
e74950db24 Merge branch 'master' of https://github.com/worklist/hifi 2013-09-26 17:07:41 -07:00
Philip Rosedale
e02572fdbe Merge pull request #983 from ey6es/atropine 
Pupil dilation controlled by slider in preferences.
 2013-09-26 17:07:16 -07:00
ZappoMan
3ab92a592a fix comments in shaders 2013-09-26 17:05:04 -07:00