Alexander Bock 329986c0c6 Merge branch 'develop' into feature/globebrowsing ...

Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp

2016-09-20 15:52:01 +02:00

..

tileprovider

Merge branch 'feature/globebrowsing' into syncing

2016-09-20 14:48:28 +02:00

asynctilereader.cpp

Rebase to feature/globebrowsing

2016-08-17 19:16:01 -04:00

asynctilereader.h

Rebase to feature/globebrowsing

2016-08-17 19:16:01 -04:00

layeredtextures.cpp

Remove texture cateory HeightMapOverlays

2016-09-14 20:08:33 -04:00

layeredtextures.h

Remove texture cateory HeightMapOverlays

2016-09-14 20:08:33 -04:00

layeredtextureshaderprovider.cpp

Document LayeredTextureShaderProvider

2016-09-15 15:22:39 -04:00

layeredtextureshaderprovider.h

Document LayeredTextureShaderProvider

2016-09-15 15:22:39 -04:00

pixelregion.cpp

Add PixelRegion methods

2016-07-09 17:37:36 -04:00

pixelregion.h

Add PixelRegion methods

2016-07-09 17:37:36 -04:00

tile.cpp

Separate Tile and TileProvider. Remove necessary includes

2016-08-30 19:26:22 -04:00

tile.h

Add doxygen comments for struct Tile

2016-09-13 21:12:11 -04:00

tiledataset.cpp

Update SGCT

2016-09-20 10:11:59 +02:00

tiledataset.h

More work into removing gdal dependency to libOpenspace

2016-08-29 02:12:33 +02:00

tiledatatype.cpp

Move tile datatype related stuff to separate file

2016-06-28 11:59:19 -04:00

tiledatatype.h

Move tile datatype related stuff to separate file

2016-06-28 11:59:19 -04:00

tiledepthtransform.h

More work into removing gdal dependency to libOpenspace

2016-08-29 02:12:33 +02:00

tilediskcache.cpp

Compile fix in globebrowsing

2016-08-29 10:00:45 +02:00

tilediskcache.h

Compile fix in globebrowsing

2016-08-29 10:00:45 +02:00

tileioresult.cpp

Move tile datatype related stuff to separate file

2016-06-28 11:59:19 -04:00

tileioresult.h

More work into removing gdal dependency to libOpenspace

2016-08-29 02:12:33 +02:00

tileprovidermanager.cpp

Fix bug that caused black screen when unable to load gdal dataset.

2016-09-15 12:49:34 -04:00

tileprovidermanager.h

More work into removing gdal dependency to libOpenspace

2016-08-29 02:12:33 +02:00

tileselector.cpp

More work into removing gdal dependency to libOpenspace

2016-08-29 02:12:33 +02:00

tileselector.h

More work into removing gdal dependency to libOpenspace

2016-08-29 02:12:33 +02:00