Michal Marcinkowski abb114c334 Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz ...

Conflicts:
	src/util/imagesequencer.cpp

2015-02-19 11:16:22 -05:00

..

abuffer

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

engine

Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz

2015-02-19 16:24:01 +01:00

gui

Added Lua-based GUI for the rest of the implemented properties

2015-02-17 19:04:26 +01:00

interaction

Merge branch 'develop' into plutoViz

2015-02-18 15:52:35 +01:00

interface

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

properties

Correctly read Lua script for VectorProperties

2015-02-17 19:01:57 +01:00

query

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

rendering

Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz

2015-02-19 16:24:01 +01:00

scenegraph

Merge branch 'develop' into plutoViz

2015-02-19 14:45:11 +01:00

scripting

Fixed synchronization bug when master runs at a different FPS than slaves.

2015-02-19 10:02:07 +01:00

tests

Updated copyright header in all files

2015-02-17 14:20:03 +01:00

util

Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz

2015-02-19 11:16:22 -05:00

CMakeLists.txt

Move imgui file to its own folder

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

main.cpp

updates to matrix calculations

2015-02-19 15:40:08 +01:00