michal 845469b15d Merge branch 'develop' into solarsystem2 ...

Conflicts:
	openspace.cfg
	shaders/generated/constants.hglsl
	src/engine/openspaceengine.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/rendering/renderabletrail.cpp
	src/util/spicemanager.cpp

2014-11-26 13:42:36 -05:00

..

abuffer

Added support for pixelData for ABuffer

2014-11-13 15:41:10 +01:00

engine

Allow access to the console through OpenSpaceEngine

2014-11-18 19:39:25 +01:00

interaction

Linux fixes

2014-11-20 09:33:07 +01:00

interface

Compile fixes of SpiceManager for Mac

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

properties

Load common module automatically without the need to declare it in the scenefile

2014-10-11 14:45:34 +02:00

query

More work towards a unified interface for accessing properties

2014-08-30 10:01:11 +02:00

rendering

Merge branch 'develop' into solarsystem2

2014-11-26 13:42:36 -05:00

scenegraph

Cleaned up code

2014-10-11 13:40:52 +02:00

scripting

More work in preparing for lua-based keyboard controller

2014-10-14 00:08:26 +02:00

tests

intermediate commit

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

util

Merge branch 'develop' into solarsystem2

2014-11-26 13:42:36 -05:00