Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 21:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22484 commits 25 branches 0 tags 1.1 GiB
Commit graph

282 commits

Author SHA1 Message Date
Seth Alves
bee895ba0a capture network bandwidth stats from NodeList rather than various places 2015-01-31 20:02:04 -08:00
Seth Alves
620efb2bbe change display style of bandwidth detail dialog, include a totals line 2015-01-30 13:43:28 -08:00
Seth Alves
2999a77f87 merge from master 2015-01-30 11:15:01 -08:00
Seth Alves
f0edba9a6b Start on refactoring of bandwidth metrics 2015-01-30 11:11:17 -08:00
ZappoMan
4a6cc5c6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/ui/overlays/ImageOverlay.cpp
 2015-01-27 16:44:11 -08:00
Andrzej Kapolka
b8a15f0726 Another tweak. 2015-01-22 22:04:10 -08:00
Andrzej Kapolka
c124dffd6a Another slight improvement. 2015-01-22 21:26:08 -08:00
Andrzej Kapolka
e65090bab9 Another slight stitching improvement. 2015-01-22 21:08:48 -08:00
Andrzej Kapolka
805d5ace13 Another slight stitching improvement. 2015-01-22 14:55:14 -08:00
Andrzej Kapolka
0d8380a288 Put the indices for our extra triangles into the spatial hash. 2015-01-21 17:47:13 -08:00
Andrzej Kapolka
8bd944e32e Incremental improvement to stitching. 2015-01-21 16:10:00 -08:00
ZappoMan
d3ae9af8ed Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-21 15:18:41 -08:00
Andrzej Kapolka
8636f0c48e Simplification. 2015-01-21 12:57:24 -08:00
Andrzej Kapolka
87e3339791 Fix for normal selection with degenerate triangles. 2015-01-21 12:28:05 -08:00
Andrzej Kapolka
10c4408d94 Slight stitching tweak. 2015-01-20 21:52:56 -08:00
Andrzej Kapolka
79e18b161d Simplification. 2015-01-20 18:42:40 -08:00
Andrzej Kapolka
460a307ebe Better stitching. 2015-01-20 18:12:00 -08:00
Andrzej Kapolka
b2079ab849 Go ahead and generate mipmaps for the terrain color texture. 2015-01-20 14:42:48 -08:00
Andrzej Kapolka
b4cd13f0be Fix for misaligned color/material textures when resolution is greater than the 
height map.
 2015-01-20 13:07:35 -08:00
Andrzej Kapolka
16de6a130b Scratch that last change; it wasn't the problem. 2015-01-19 17:29:43 -08:00
Andrzej Kapolka
a16b54a34a Let's try not using the "augmented" data, since we don't need it. 2015-01-19 17:23:31 -08:00
ZappoMan
283ab6dd0c Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/MetavoxelSystem.cpp
 2015-01-19 14:13:46 -08:00
Andrzej Kapolka
52641bd20f Fix for buffer crash. 2015-01-18 15:17:45 -08:00
Andrzej Kapolka
27255fbb4a Hermite display fix. 2015-01-18 01:04:45 -08:00
Andrzej Kapolka
393d537c16 Edge fix. 2015-01-18 00:26:43 -08:00
Andrzej Kapolka
61cbafadd4 More corner cases. 2015-01-18 00:18:35 -08:00
Andrzej Kapolka
debc9b735d Fixed edge issue, increased default grid size to correspond to default 
heightfield import.
 2015-01-17 16:33:35 -08:00
Andrzej Kapolka
2497b2fe39 If there's no directly intersecting spanner, find the closest heightfield that 
we can project onto.
 2015-01-16 15:41:08 -08:00
Andrzej Kapolka
45b36b383c More progress on stitching, etc. 2015-01-16 14:32:15 -08:00
Andrzej Kapolka
b6c843497d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-16 11:56:04 -08:00
Andrzej Kapolka
f81c117ae5 Stitching progress. 2015-01-15 17:59:55 -08:00
ZappoMan
db94949649 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-01-14 17:55:03 -08:00
ZappoMan
e6388a65b9 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
Atlante45
476e2124b7 Moved DM::get() calls to auto 2015-01-13 20:51:02 -08:00
Andrzej Kapolka
d002359989 Stitching improvement. 2015-01-09 16:43:51 -08:00
Andrzej Kapolka
8b2baf65e8 Color/material fix. 2015-01-08 14:13:23 -08:00
Andrzej Kapolka
ec32739689 CSG improvements. 2015-01-08 12:52:52 -08:00
Andrzej Kapolka
4c3163fae8 Closer to working stitching. 2015-01-07 17:24:26 -08:00
Andrzej Kapolka
1abf111d7f Index fix. 2015-01-07 11:19:40 -08:00
Andrzej Kapolka
48fb9a27ba Progress on heightfield/voxel interface. 2015-01-06 17:55:04 -08:00
Andrzej Kapolka
a20b12ad44 Material painting for stacks. 2015-01-06 14:25:26 -08:00
Andrzej Kapolka
5a46f3e20d Material/ray testing bits. 2015-01-05 18:37:47 -08:00
Andrzej Kapolka
808cb2e4bc Substantial cleanup, working on interface between heightfields and dual 
contour surfaces.
 2015-01-05 14:33:40 -08:00
Andrzej Kapolka
547c6db0a4 Slight simplification. 2015-01-02 17:43:41 -08:00
Andrzej Kapolka
a504d03b14 Normal fix. 2015-01-02 17:14:17 -08:00
Andrzej Kapolka
3959f99910 Fixed voxel textures. 2015-01-02 13:57:27 -08:00
Andrzej Kapolka
e242459ea2 More render progress. 2014-12-31 17:33:43 -08:00
Andrzej Kapolka
08dfd28ec0 More rendering bits. 2014-12-31 15:53:38 -08:00
Andrzej Kapolka
83967d49cf More rendering bits. 2014-12-30 18:16:49 -08:00
Andrzej Kapolka
de4776ef08 More progress on rendering. 2014-12-30 15:36:22 -08:00