Commit Graph

6 Commits

Author SHA1 Message Date
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
Alexander Bock
7401b7d48b Enable FrameBuffer-based rendering on Windows 2015-06-18 15:42:41 +02:00
Alexander Bock
8de6d9db05 Moving global blackout factor into RenderEngine
Cleanup of Abuffer implementations
2015-06-05 14:25:35 +02:00
Alexander Bock
a6ebddb8eb Updated copyright header in all files 2015-02-17 14:20:03 +01:00
Jonas Strandstedt
d7487f601c OS X compile fixes 2014-12-04 11:20:28 +01:00
Jonas Strandstedt
f85e18dc18 OS X now doesn't crash for volumes
- Fixed a few warnings
2014-11-05 17:11:27 +01:00