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

559 commits

Author SHA1 Message Date
Atlante45
27459ba861 Settings update 2015-02-03 12:27:30 -08:00
Andrew Meadows
026c39e010 Merge pull request #4131 from Atlante45/pull_out_menu_mess 
Settings - Part I
 2015-01-27 16:23:23 -08:00
Andrzej Kapolka
34110b6745 Partial subdivision implementation. 2015-01-23 18:19:45 -08:00
Andrzej Kapolka
bc0fa0ed24 Push granularity option down the line in preparation for selectively 
increasing resolution.
 2015-01-23 13:58:51 -08:00
Atlante45
e1725d1eee Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-20 17:41:08 -08:00
Atlante45
6a00dcbf0a More switches to new Settings 2015-01-20 00:30:29 -08:00
Andrzej Kapolka
35bd1cda89 I believe this should fix some problems with flickering/crashing on edits: 
don't reapply properties that we've already read (thus clearing cached data,
stepping on other threads, etc.)
 2015-01-19 21:52:56 -08:00
Andrzej Kapolka
f8f9c25d38 Back to JPG compression for heightfield colors. 2015-01-19 14:59:28 -08:00
Atlante45
43597ea29d Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
 2015-01-19 14:18:22 -08:00
Andrzej Kapolka
ed287e9bb2 This function isn't used, either. 2015-01-19 12:16:06 -08:00
Andrzej Kapolka
422e4fb85d Use the closest point on an approximative sphere, rather than the center of 
the node, to determine the LOD distance.
 2015-01-19 12:12:31 -08:00
Andrzej Kapolka
8d4707a874 Removed unused function. 2015-01-19 11:53:53 -08:00
Atlante45
967028e5cf Removed more QSettings references 2015-01-18 19:29:27 -08:00
Andrzej Kapolka
2ed6835426 Use alpha channel to indicate holes when importing terrain images. 2015-01-18 16:30:46 -08:00
Andrzej Kapolka
a9f7533477 Set/erase brushes. 2015-01-18 16:20:55 -08:00
Andrzej Kapolka
61cbafadd4 More corner cases. 2015-01-18 00:18:35 -08:00
Andrzej Kapolka
5bb441b6ef Added a "voxelize" brush for debugging. 2015-01-17 20:17:28 -08:00
Andrzej Kapolka
3dbbbb72b0 Fixes for deltas when root hasn't changed, range updates. 2015-01-16 16:49:22 -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
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
Atlante45
8415098fc2 Set different caches size depending on cache type 2015-01-12 15:36:36 -08:00
Andrzej Kapolka
5f7a304c85 Crash fix. 2015-01-12 12:00:01 -08:00
Andrzej Kapolka
d002359989 Stitching improvement. 2015-01-09 16:43:51 -08:00
Andrzej Kapolka
dfbc3502fa Use ray intersection code to get heightfield height. 2015-01-09 15:06:47 -08:00
Andrzej Kapolka
70890c68aa "Fill" brush (removes dual contour data). 2015-01-09 14:19:13 -08:00
Andrzej Kapolka
d82f269263 Don't show grid for tools where it isn't needed, started on "fill" tool. 2015-01-09 11:46:40 -08:00
Andrzej Kapolka
0dc4b26367 Basic stack merging. 2015-01-08 21:37:53 -08:00
David Rowe
a5b3ae397a Code review 2015-01-08 18:20:23 -08:00
David Rowe
07b30da2ac Fix miscellaneous types and casts 2015-01-08 13:44:51 -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
48fb9a27ba Progress on heightfield/voxel interface. 2015-01-06 17:55:04 -08:00
Andrzej Kapolka
78c4bcd2ec Heightfield conversion Hermite bits. 2015-01-06 15:39:06 -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
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
Andrzej Kapolka
135e3bf574 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-30 13:25:57 -08:00
Andrzej Kapolka
c9b3b5ff7d Scale back on first dropped packet, use Qt send/receive buffer size options 
rather than setsockopt/getsockopt.
 2014-12-30 12:30:38 -08:00
Andrzej Kapolka
fbd4ca5c08 More work on rendering. 2014-12-29 18:37:06 -08:00
Andrzej Kapolka
c78d38b925 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-29 14:38:17 -08:00