Michal Marcinkowski 44e02465a1 Merge branch 'develop' into solarsystem2 ...

Conflicts:
	include/openspace/util/powerscaledsphere.h
	src/rendering/renderablefov.cpp
	src/rendering/renderablesphericalgrid.cpp
	src/rendering/renderabletrail.cpp
	src/util/powerscaledsphere.cpp
	src/util/spicemanager.cpp

2015-01-22 10:31:40 -05:00

..

abuffer

Windows fix after memory leak fixes

2014-12-11 14:12:01 +01:00

engine

Move imgui file to its own folder

2014-12-18 17:21:20 +01:00

gui

Added Vec4Property to imgui

2015-01-21 15:12:54 +01:00

interaction

Let the LuaConsole use a permanent cached file for the history

2014-12-05 16:43:16 +01:00

interface

Compile fixes of SpiceManager for Mac

2014-08-19 12:14:34 +02:00

properties

Add stepping value into Property description

2014-12-18 13:46:18 +01:00

query

Enable querying for Renderables in query.h

2014-12-03 17:19:18 +01:00

rendering

Merge branch 'develop' into solarsystem2

2015-01-22 10:31:40 -05:00

scenegraph

Remove cppcheck warnings

2014-12-16 21:54:53 +01:00

scripting

Fix memory leaks and proper deinitialization

2014-12-11 10:13:10 +01:00

tests

intermediate commit

2014-11-26 12:12:03 -05:00

util

Merge branch 'develop' into solarsystem2

2015-01-22 10:31:40 -05:00