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

More changes to enable rendering on OS X

2015-04-28 19:32:21 +02:00

engine

Fixing CREDITS file

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

gui

Fixing CREDITS file

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

interaction

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

2015-05-12 23:29:14 -04:00

network

Fix initial message queueing by introducing a sleeping timer

2015-05-13 00:17:46 +02:00

properties

Fixing CREDITS file

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

query

More linux fixes

2015-04-17 13:59:57 +02:00

rendering

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

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

scene

More clang fixes

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

scripting

Fixed bug where ScriptEngine would complain about double-added libraries

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

util

adding capability to clear images on the fly

2015-05-13 15:19:41 -04:00

CMakeLists.txt

Merge branch 'timeadjustments' into NewHorizonsMerge

2015-04-23 22:51:55 -04:00

main.cpp

Fixing various issues that appeared in Mac

2015-05-13 16:52:25 +02:00