Alexander Bock 0c655e98f2 Merge remote-tracking branch 'origin/NewHorizonsMerge' into feature/timelinegui ...

Conflicts:
	src/rendering/renderengine.cpp
	src/util/imagesequencer2.cpp

2015-05-05 11:42:49 +02:00

..

camera.h

Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/dome

2015-02-17 14:41:02 +01:00

constants.h

Solving merge conflicts with develop

2015-04-18 16:10:05 -04:00

decoder.h

completely new imagesequencer class - WIP

2015-04-16 11:57:23 -04:00

factorymanager.h

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

factorymanager.inl

Created classes for PlanetGeometry

2014-05-05 17:28:46 +02:00

hongkangparser.h

Added methods to Hongkang parser that publish the results

2015-05-02 22:24:03 +02:00

imagesequencer2.h

Merge branch 'timeadjustments' into NewHorizonsMerge

2015-04-23 22:51:55 -04:00

imagesequencer.h

Added temp method to get latest image in old imagesequencer

2015-04-17 21:25:33 -04:00

instrumentdecoder.h

Imagesequencer update:

2015-04-22 21:53:28 -04:00

kameleonwrapper.h

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

keys.h

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

labelparser.h

Modifying labelparser and imagesequencer2

2015-05-04 19:40:08 -04:00

powerscaledcoordinate.h

Linux compile fix

2015-02-23 14:18:21 +01:00

powerscaledscalar.h

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

powerscaledsphere.h

Planets shape creation & fixed texture longitude

2015-03-20 19:59:26 -04:00

progressbar.h

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

scannerdecoder.h

Imagesequencer update:

2015-04-22 21:53:28 -04:00

screenlog.h

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

sequenceparser.h

Imagesequencer update:

2015-04-22 21:53:28 -04:00

spicemanager.h

Storing frame-to-body relationship

2015-05-04 19:20:14 -04:00

syncbuffer.h

added <stdint> include to fix compilation issue with int32_t datatype

2015-02-18 10:49:54 +01:00

targetdecoder.h

completely new imagesequencer class - WIP

2015-04-16 11:57:23 -04:00

time.h

Moved networking functions into their own engine class

2015-04-22 18:22:19 +02:00

updatestructures.h

More changes to allow JupiterProjection and PlutoProjection in the same scene

2015-02-24 19:16:15 +01:00