Alexander Bock 0c655e98f2 Merge remote-tracking branch 'origin/NewHorizonsMerge' into feature/timelinegui ...

Conflicts:
	src/rendering/renderengine.cpp
	src/util/imagesequencer2.cpp

2015-05-05 11:42:49 +02:00

..

abuffer

Updated copyright header in all files

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

engine

Added methods to Hongkang parser that publish the results

2015-05-02 22:24:03 +02:00

gui

Add Gui component for manipulating time

2015-02-23 23:01:57 +01:00

interaction

More work on SceneGraphLoader

2015-04-09 21:43:13 +02:00

network

Added methods to Hongkang parser that publish the results

2015-05-02 22:24:03 +02:00

properties

Enable operator<< overloading for TemplateProperties

2015-03-03 14:28:08 +01:00

query

More work on SceneGraphLoader

2015-04-09 21:43:13 +02:00

rendering

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

2015-05-04 20:27:52 -04:00

scene

Fixes to trails, fov and adding some keybindings

2015-05-04 20:15:34 -04:00

scripting

Fixed bug where ScriptEngine would complain about double-added libraries

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

util

Merge remote-tracking branch 'origin/NewHorizonsMerge' into feature/timelinegui

2015-05-05 11:42:49 +02:00

version.h

Updated the OpenSpace version

2015-02-27 15:46:24 +01:00