Michal Marcinkowski 759756ccb4 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop ...

Conflicts:
	src/properties/optionproperty.cpp

2014-12-09 14:12:13 -05:00

..

abuffer

OS X compile fixes

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

engine

Store less performance records, do not leak memory in GUI

2014-12-09 16:10:03 +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

More work on performance measuring in imgui

2014-12-09 15:49:54 +01:00

scenegraph

General code cleanup

2014-12-09 18:36:23 +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

Fixing doxygen warnings

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