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

..

abuffer

Windows fix after memory leak fixes

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

engine

Update ghoul reference

2014-12-10 20:57:41 +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 methods for generating Property descriptions

2014-12-12 14:47:08 +01:00

query

Enable querying for Renderables in query.h

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

rendering

Merge branch 'develop' into solarsystem2

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

scenegraph

Added warning for SceneGraphNodes that were not loaded

2014-12-10 15:38:22 +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

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