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

3658 commits

Author SHA1 Message Date
ZappoMan
c18de72dd4 work on debugging stutter behavior, mostly debugging and cleanup 2013-11-03 19:06:06 -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
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
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
d04b36bf48 Fix for GuyFinal rotation. 2013-11-01 14:25:26 -07:00
Andrzej Kapolka
62381e19b5 Only use hacky model translation with the old skeleton. 2013-11-01 13:33:50 -07:00
Andrzej Kapolka
c3e0f8bc1f Bump up the maximum eye angle slightly. 2013-11-01 10:48:09 -07:00
Andrzej Kapolka
4a011e0624 Pull out the weight access. 2013-10-31 17:10:35 -07:00
Andrzej Kapolka
fdc44f5ec4 Have the hand fall to the side when the mouse is hidden. 2013-10-31 16:06:42 -07:00
Andrzej Kapolka
1809c525f4 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 15:39:39 -07:00
Stephen Birarda
ddcaa513a1 fix broken build from merge in Skeleton 2013-10-31 15:38:00 -07:00
Andrzej Kapolka
b3b4c6e397 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 15:20:05 -07:00
Ryan
4db3d9606f Merge remote-tracking branch 'origin/master' 2013-10-31 14:55:00 -07:00
Andrzej Kapolka
70485a0ba9 Fix for meshes with no texture coordinates. 2013-10-31 14:52:36 -07:00
Andrzej Kapolka
55de8ceb85 Use blue default texture when we fail to load a normal map. 2013-10-31 14:46:51 -07:00
Andrzej Kapolka
070e755368 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 14:26:38 -07:00
Andrzej Kapolka
1a532be845 Smooth the normals. 2013-10-31 14:26:06 -07:00
ZappoMan
848e78aded CR feedback 2013-10-31 13:58:12 -07:00
ZappoMan
a04cd8e95c added menu item to enable extra debugging to help debug hq VS issue 2013-10-31 13:54:10 -07:00
Andrzej Kapolka
a15bff3857 Closer to mesh fix. 2013-10-31 13:49:06 -07:00
Andrzej Kapolka
09babeca5d Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 12:44:07 -07:00
Andrzej Kapolka
06713a44bf Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 12:42:05 -07:00
Andrzej Kapolka
bc796c63e3 Working on mesh fix. 2013-10-31 12:41:40 -07:00
ZappoMan
db08b20405 added more logging 2013-10-31 12:36:48 -07:00
ZappoMan
42b44064d3 CR feedback 2013-10-31 12:19:18 -07:00
ZappoMan
724ac4888f Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2013-10-31 12:13:04 -07:00
ZappoMan
af1047f5e0 fix to how voxel servers are queried when they have no known jurisdiction 2013-10-31 12:06:18 -07:00
Stephen Birarda
7b9eb55bda fix the dialog mouselook bug 2013-10-31 11:32:19 -07:00
Ryan
8b781bf9cd Merge remote-tracking branch 'origin/master' 2013-10-31 08:59:09 -07:00
Ryan
1279f3c3bb Made the stick and ball radius much smaller so they don’t break through the new meshes. 2013-10-31 08:55:37 -07:00
Philip Rosedale
edf36f2a9e Merge pull request #1142 from lordwaym/starfield-fix 
Starfield fix and Milky Way
 2013-10-30 21:58:03 -07:00
Philip Rosedale
e47f433444 Merge pull request #1150 from ZappoMan/bugfixes 
Several Bug Fixes and Improvements
 2013-10-30 17:02:54 -07:00
ZappoMan
256428c6ae CR feedback 2013-10-30 16:55:39 -07:00
ZappoMan
054f49808f Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 
Conflicts:
	libraries/voxel-server-library/src/VoxelSendThread.cpp
 2013-10-30 16:48:50 -07:00
Andrzej Kapolka
4ef3500096 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-30 16:45:09 -07:00
Andrzej Kapolka
9c5ebfcf77 If the skeleton has meshes, don't render the balls and sticks. 2013-10-30 16:44:40 -07:00
ZappoMan
606a6349c7 added abandoned voxels to stats, improved sizing behavior of voxel stats dialog 2013-10-30 15:28:44 -07:00
ZappoMan
14ddb89341 improve behavior of too more than _maxVoxels 2013-10-30 14:28:32 -07:00
ZappoMan
3f9631dd53 fix voxels as points menu to work correctly on startup 2013-10-30 14:14:34 -07:00
ZappoMan
0bbbd7efce fix Voxel Server Protocol menu options to work again 2013-10-30 14:00:56 -07:00
ZappoMan
d1fbe242ab Merge branch 'master' of https://github.com/worklist/hifi into lod_slider 2013-10-30 12:27:50 -07:00
Andrzej Kapolka
719a014118 Merge pull request #1149 from ey6es/master 
This should fix Stephen's crash on init.
 2013-10-30 12:27:17 -07:00
ZappoMan
e9d366fb80 Merge pull request #1147 from ey6es/ick 
Support for normap maps on loaded models.
 2013-10-30 12:26:56 -07:00
Andrzej Kapolka
d820611618 Looks like setCentralWidget is ending up calling the init functions in newer 
versions of Qt.  Initialize the network access manager before that happens.
 2013-10-30 12:25:43 -07:00
ZappoMan
375ef34bd5 Merge pull request #1141 from stojce/19447 
Code Review for Job #19447
 2013-10-30 12:23:32 -07:00