Emma Broman 16173d7afe Merge branch 'master' into thesis/2019/camera-paths and resolve conflicts ...

# Conflicts:
#	modules/globebrowsing/globebrowsingmodule.cpp
#	modules/globebrowsing/globebrowsingmodule_lua.inl

2021-07-09 15:43:17 +02:00

..

rendering

Adapt to changes in codegen that require specifying the identifier in the codegen::doc function

2021-05-25 23:10:12 +02:00

shaders

Feature/cleanup (#1608)

2021-05-25 14:08:33 +02:00

tasks

Adapt to changes in codegen that require specifying the identifier in the codegen::doc function

2021-05-25 23:10:12 +02:00

CMakeLists.txt

Move habitable zone renderable to space module

2021-01-26 15:09:23 +01:00

exoplanetshelper.cpp

Feature/path normalization (#1674)

2021-07-01 23:46:22 +02:00

exoplanetshelper.h

Add a colored glare to exoplanet stars (#1511)

2021-03-02 09:30:03 +01:00

exoplanetsmodule_lua.inl

Feature/path normalization (#1674)

2021-07-01 23:46:22 +02:00

exoplanetsmodule.cpp

Move camera path code into core and refactor navigation code a bit

2021-06-23 09:12:36 +02:00

exoplanetsmodule.h

Remove hardcoded path to B-V colormap (#1531)

2021-03-15 13:22:41 +01:00

include.cmake

Move habitable zone renderable to space module

2021-01-26 15:09:23 +01:00