Emil Axelsson 2426545a05 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management ...

Conflicts:
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/sceneloader.cpp
	tests/test_concurrentjobmanager.inl
	tests/test_concurrentqueue.inl
	tests/test_sceneloader.inl

2017-08-15 11:43:18 +02:00

..

gdal

Update GDAL test to use new https format

2017-03-14 13:48:26 -04:00

SceneLoaderTest

Refactor scene graph: Move scene loading to separate class.

2016-12-30 17:08:50 +01:00

SpiceTest/spicekernels

Fix OpenSpaceTest compilation and test success

2016-07-08 13:55:59 +02:00

main.cpp

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_aabb.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_angle.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_chunknode.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_common.inl

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

test_concurrentjobmanager.inl

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

2017-08-15 11:43:18 +02:00

test_concurrentqueue.inl

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

2017-08-15 11:43:18 +02:00

test_configurationmanager.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_documentation.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_ellipsoid.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_gdalwms.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_iswamanager.inl

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

test_latlonpatch.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_lrucache.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_luaconversions.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_patchcoverageprovider.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_powerscalecoordinates.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_sceneloader.inl

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

2017-08-15 11:43:18 +02:00

test_screenspaceimage.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_scriptscheduler.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_spicemanager.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_temporaltileprovider.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

test_timeline.inl

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00