Michal Marcinkowski f032b4e3b0 Merge branch 'develop' into solarsystem2 ...

Conflicts:
	.gitignore
	include/openspace/rendering/renderablefov.h
	src/CMakeLists.txt
	src/rendering/model/renderablemodel.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/rendering/renderabletrail.cpp
	src/util/factorymanager.cpp

2014-12-15 13:23:30 -05:00

..

camera.h

Added SyncBuffer class

2014-10-22 16:37:54 +02:00

constants.h

Merge branch 'develop' into solarsystem2

2014-12-08 21:26:38 -05:00

factorymanager.h

More cleanup

2014-10-24 13:34:03 +02:00

factorymanager.inl

Created classes for PlanetGeometry

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

kameleonwrapper.h

Cleanup for KameleonWrapper

2014-11-11 13:43:38 +01:00

powerscaledcoordinate.h

fixing stupid git mistake.

2014-11-28 17:15:13 -05:00

powerscaledscalar.h

Removing Jenkins warnings

2014-09-26 17:53:18 +02:00

powerscaledsphere.h

Continued work on memory leaks and proper isReady usage

2014-12-11 16:48:49 +01:00

progressbar.h

Added separete ProgressBar class

2014-11-07 14:48:03 +01:00

screenlog.h

Added ScreenLog

2014-10-17 12:20:23 +02:00

spicemanager.h

intermediate commit prior to merge

2014-12-12 11:52:31 -05:00

syncbuffer.h

Added SyncBuffer class

2014-10-22 16:37:54 +02:00

time.h

Fixing doxygen warnings

2014-12-09 19:11:49 +01:00

updatestructures.h

Initial work on performance measuring

2014-12-09 01:41:42 +01:00