Malin Ejdbo 9f7b8aa32b Merge branch 'master' into feature/jwst ...

* Resolve conflict

2021-05-31 15:45:10 +02:00

..

atmosphere

Feature/side by side (#1613)

2021-05-28 23:31:10 +02:00

base

Merge branch 'master' into feature/jwst

2021-05-31 15:45:10 +02:00

cefwebgui

Feature/cleanup (#1608)

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

debugging

Feature/numeric slider updates (#1609)

2021-05-28 17:00:55 +02:00

digitaluniverse

Feature/numeric slider updates (#1609)

2021-05-28 17:00:55 +02:00

exoplanets

Feature/numeric slider updates (#1609)

2021-05-28 17:00:55 +02:00

fieldlines

Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string

2021-05-17 00:23:15 +02:00

fieldlinessequence

Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string

2021-05-17 00:23:15 +02:00

fitsfilereader

…

gaia

Correctly filter the display methods not supported on MacOS

2021-05-29 20:21:22 +02:00

galaxy

Haphazardly address #1455 by setting the stereo distance to some insane value but keeping the adaptive stereo separation

2021-05-30 16:59:04 +02:00

globebrowsing

Reduce risk of font rendering errors from user interaction (#1206 hotfix) (#1616)

2021-05-31 10:46:21 +02:00

imgui

Fix to properly support ImGui with exponents that caused an assertion in Debug mode

2021-05-30 16:45:37 +02:00

iswa

Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string

2021-05-17 00:23:15 +02:00

kameleon

Feature/filesystem cleanup (#1587)

2021-05-16 20:26:49 +02:00

kameleonvolume

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

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

multiresvolume

Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string

2021-05-17 00:23:15 +02:00

server

Remove warnings

2021-05-25 22:06:49 +02:00

space

add fixed time for spice translations, update insight asset to use (#1614)

2021-05-30 13:09:58 -04:00

spacecraftinstruments

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

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

spout

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

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

sync

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

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

touch

Feature/cleanup (#1608)

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

toyvolume

Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string

2021-05-17 00:23:15 +02:00

vislab

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

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

volume

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

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

webbrowser

Windows fix

2021-05-25 20:11:26 +02:00

webgui

Address MacOS compile issues, make ISS model scene graph node visible

2021-05-25 17:50:31 +02:00

CMakeLists.txt

…