Anton Arbring 30dfc77d81 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop ...

Conflicts:
	src/rendering/model/renderablemodel.cpp
	src/rendering/renderablecrawlingline.cpp
	src/rendering/renderableplaneprojection.cpp

2015-05-13 16:44:03 -04:00

..

abuffer

Updated copyright header in all files

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

engine

Fixing CREDITS file

2015-05-13 19:33:34 +02:00

gui

Add Gui component for manipulating time

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

interaction

Fixing CREDITS file

2015-05-13 19:33:34 +02:00

network

Fix initial message queueing by introducing a sleeping timer

2015-05-13 00:17:46 +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 'develop' of openspace.itn.liu.se:/openspace into develop

2015-05-13 16:44:03 -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

More clang fixes

2015-05-13 19:48:41 +02:00

version.h

Set OpenSpace version string to prerelease-5

2015-05-07 23:40:31 +02:00