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

7184 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
843e9da873 merge conflict fix 2013-11-05 10:47:05 -08:00
ZappoMan
581e0adecf Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-05 10:45:30 -08:00
ZappoMan
09dab892d3 first cut at new voxel scene stats 2013-11-05 10:29:56 -08:00
Philip Rosedale
27ed53301b Merge pull request #1178 from ZappoMan/bugfixes 
Possible fix to crash in voxel server
 2013-11-05 06:59:23 -08:00
Philip Rosedale
8bb3cb0c9f Merge pull request #1179 from ey6es/master 
Fix for Squigglevision effect on meshes at high(er) translation magnitudes.
 2013-11-04 19:59:15 -08:00
Andrzej Kapolka
b2ed29dbff Work around precision issues with multiplying matrices with high translation 
magnitudes (by using relative translation).
 2013-11-04 16:49:12 -08:00
ZappoMan
7daff4c279 coding standard cleanup 2013-11-04 15:36:46 -08:00
ZappoMan
9e88cfe953 initlaize sortedChildren[] array to help prevent possible crashes 2013-11-04 15:33:28 -08:00
ZappoMan
e89079e86c add server config to the status page 2013-11-04 15:32:53 -08:00
Andrzej Kapolka
4cc650835d Merge pull request #1177 from ey6es/master 
Fix for jittery eyes.
 2013-11-04 14:31:50 -08:00
Andrzej Kapolka
361f1f6adf Don't override the lookat positions we receive for others. 2013-11-04 14:07:05 -08:00
Andrzej Kapolka
490194c747 Rescale eye positions to compensate for growing heads. 2013-11-04 13:53:39 -08:00
Philip Rosedale
11e6982a9d Merge pull request #1176 from ZappoMan/bugfixes 
fix oversending bug
 2013-11-04 13:36:47 -08:00
ZappoMan
e0d5f2476c tweak 2013-11-04 13:21:30 -08:00
ZappoMan
e8a1a383a3 fix oversending bug 2013-11-04 13:19:42 -08:00
ZappoMan
45ba3641a8 Merge pull request #1175 from birarda/master 
guard for JurisdictionListener kill for missing UUID
 2013-11-04 12:09:18 -08:00
Stephen Birarda
5c3075401a add a guard for JurisdictionListener kill for missing UUID 2013-11-04 12:03:04 -08:00
Philip Rosedale
0f93c7417a Merge pull request #1174 from ey6es/321contact 
Use Faceshift gaze data to deflect the existing mouse lookat behavior.
 2013-11-04 11:58:14 -08:00
Andrzej Kapolka
33c61937ab Remove unused parameters. 2013-11-04 11:31:05 -08:00
Andrzej Kapolka
acaac714e6 More smoothing. 2013-11-04 11:20:56 -08:00
Andrzej Kapolka
ce1ebf8d11 The Faceshift eye rotations are indeed relative to the head. 2013-11-04 10:57:29 -08:00
Andrzej Kapolka
65907a75a3 Merge branch 'master' of https://github.com/worklist/hifi into 321contact 
Conflicts:
	interface/src/Application.cpp
 2013-11-04 10:40:02 -08:00
Philip Rosedale
a57f13e78d Merge pull request #1173 from ZappoMan/bugfixes 
Fix FPS stutter on rotating in place
 2013-11-04 10:09:25 -08:00
ZappoMan
9bd27e2b2a fix stutter on rotating 2013-11-03 21:11:08 -08:00
ZappoMan
c18de72dd4 work on debugging stutter behavior, mostly debugging and cleanup 2013-11-03 19:06:06 -08:00
Philip Rosedale
0fe09aa327 Merge pull request #1172 from ZappoMan/point_shader 
fix thinning in voxels as points
 2013-11-03 11:46:04 -08:00
ZappoMan
c4a2b3c49b fix thinning in voxels as points by using correct points to calculate width of voxel based on camera position relative to voxel 2013-11-03 11:10:00 -08:00
Andrzej Kapolka
def3707041 I don't think Faceshift's gaze data is actually head-relative. 2013-11-01 18:28:35 -07:00
Andrzej Kapolka
a7683fa07f More tweaks to eye offsets. 2013-11-01 18:15:43 -07:00
Andrzej Kapolka
e4bf5358eb Attempt to use Faceshift eye data to deflect the default eye behavior. 2013-11-01 17:58:41 -07:00
Philip Rosedale
79fb92f195 Merge pull request #1170 from ZappoMan/point_shader 
first cut a variable point size point rendering
 2013-11-01 17:02:28 -07:00
ZappoMan
508b8f4678 change in comment to kick off build 2013-11-01 16:29:49 -07:00
ZappoMan
b103f9dacf clean up 2013-11-01 15:32:17 -07:00
ZappoMan
e62322b805 clean up comment 2013-11-01 15:28:54 -07:00
ZappoMan
61b6d6a4a4 added comment about fixing point selection 2013-11-01 15:27:57 -07:00
ZappoMan
cab87c3a97 added comment about fixing point selection 2013-11-01 15:27:25 -07:00
Andrzej Kapolka
6f53701095 Merge pull request #1171 from ey6es/master 
Sanity check to prevent crash in Model::simulate.
 2013-11-01 14:48:17 -07:00
Andrzej Kapolka
966f75db9b Sanity check to prevent crash in Model::simulate. 2013-11-01 14:47:25 -07:00
ZappoMan
13b558c033 removed dead code 2013-11-01 14:40:58 -07:00
ZappoMan
56aafabacd fixed up comments and style guide items 2013-11-01 14:39:55 -07:00
ZappoMan
6fd3c9714f fixed header file merge conflict 2013-11-01 14:37:46 -07:00
ZappoMan
f5d09c0218 fix comments and style 2013-11-01 14:36:20 -07:00
ZappoMan
b3aac56d29 first cut a variable point size point rendering 2013-11-01 14:33:06 -07:00
Andrzej Kapolka
1fc40f5814 Merge pull request #1169 from ey6es/master 
Fix for GuyFinal rotation.
 2013-11-01 14:26:04 -07:00
Andrzej Kapolka
d04b36bf48 Fix for GuyFinal rotation. 2013-11-01 14:25:26 -07:00
Andrzej Kapolka
f3bc633dea Merge pull request #1168 from ey6es/master 
Fix for heads on shoulders of new skeletons.
 2013-11-01 13:44:27 -07:00
Andrzej Kapolka
62381e19b5 Only use hacky model translation with the old skeleton. 2013-11-01 13:33:50 -07:00
Philip Rosedale
da1383ef7b Merge pull request #1164 from ey6es/master 
Fix for texture coordinates and normals (seams on Macaw head, Brad's eyes and lips).
 2013-11-01 11:27:39 -07:00
Andrzej Kapolka
c3e0f8bc1f Bump up the maximum eye angle slightly. 2013-11-01 10:48:09 -07:00
Stephen Birarda
9276a1abb9 Merge branch 'master' of github.com:worklist/hifi 2013-11-01 10:31:46 -07:00