Alexander Bock df1da946cf Merge remote-tracking branch 'origin/feature/abuffer' into feature/downloadmanager ...

Conflicts:
	include/openspace/abuffer/abufferframebuffer.h
	src/abuffer/abuffer.cpp

2015-06-22 13:43:57 +02:00

..

abuffer

Merge remote-tracking branch 'origin/feature/abuffer' into feature/downloadmanager

2015-06-22 13:43:57 +02:00

engine

Add a time-remaining counter to Launcher

2015-06-18 22:46:24 +02:00

interaction

Remove more warnings

2015-05-23 22:42:51 +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

Enable FrameBuffer-based rendering on Windows

2015-06-18 15:42:41 +02:00

scene

Fixing more memory leaks

2015-05-26 21:44:49 +02:00

scripting

Minor cleanups

2015-06-05 01:45:15 +02:00

util

New Additions:

2015-06-03 19:10:34 -04:00