Joakim Kilby
|
3d04af03a3
|
Merge branch 'develop' into plutoViz
Conflicts:
include/openspace/rendering/planets/simplespheregeometry.h
include/openspace/util/powerscaledsphere.h
openspace.cfg
shaders/pscstandard_fs.glsl
src/engine/openspaceengine.cpp
src/rendering/planets/renderableplanet.cpp
src/rendering/renderablefov.cpp
src/rendering/renderabletrail.cpp
src/rendering/renderengine.cpp
src/scenegraph/scenegraph.cpp
|
2015-02-18 15:52:35 +01:00 |
|
Alexander Bock
|
3a18d0c763
|
More fixed for RenderableStars
Added screenshot button for F4
|
2015-02-09 08:35:06 +01:00 |
|
Michal Marcinkowski
|
238aa09381
|
Refinements to image sequencing class and other, adaptation to the pluto setup
|
2015-01-29 13:01:31 -05:00 |
|
jonasstrandstedt
|
6b164f0b36
|
Added camera offset support
|
2015-01-06 12:43:16 +01:00 |
|
Alexander Bock
|
01e71f2fc0
|
More work on performance measuring in imgui
|
2014-12-09 15:49:54 +01:00 |
|
Alexander Bock
|
31191106fc
|
Rebind keys to toggle GUI with F1 key
|
2014-12-08 20:26:13 +01:00 |
|
Jonas Strandstedt
|
31c76f3e3c
|
Added key binding from Lua possible
- Possible to add key bindings from Lua possible. This calls Lua scripts
from key commands.
- Temporary fixed a small bug for volume rendering
|
2014-11-17 17:02:40 +01:00 |
|