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

..

cloc

Jenkins compile fix, removing double language definition

2015-02-13 11:23:51 +01:00

cmake

Add ability to define external libraries which will cause DLLs to be copied to application directories automatically

2016-08-26 23:47:08 +02:00

coding

Updated convert_tabs script

2016-04-27 14:24:41 +02:00

cppcheck

Removing more CppCheck warnings

2016-07-28 20:31:53 +02:00

doxygen

Move the doxygen files from doxygen to support/doxygen

2014-12-04 16:29:39 +01:00

jenkins

Add dependency calculation to the buildAllModuleCombination Jenkins script (closing #116)

2016-08-01 14:34:36 +02:00

mission

Add node helper script for generating mission file from spice kernels

2016-08-23 12:47:41 -04:00

run

Add optional params -size and -cols for run_multiple_nodes script

2016-09-03 23:33:00 -04:00

server

Add server request script used for the DownloadManager

2016-09-07 16:32:19 +02:00