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

Conflicts:
	.gitignore
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/scenegraph/scenegraph.cpp
	src/util/factorymanager.cpp

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

..

abuffer

OS X compile fixes

2014-12-04 11:20:28 +01:00

engine

Started cleaning OpenSpaceEngine

2014-12-08 18:30:18 +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

intermediate commit

2014-12-08 20:44:58 -05: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-08 21:26:38 -05:00

scenegraph

Added support for placing camera att arbitrary position

2014-12-02 11:06:15 +01:00

scripting

Improved the Lua documentation

2014-12-03 14:13:53 +01:00

tests

intermediate commit

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

util

Merge branch 'develop' into solarsystem2

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