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

..

lualibrary.h

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

scriptengine.h

Feature/path normalization (#1674)

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

scriptscheduler.h

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

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

systemcapabilitiesbinding.h

Happy new year

2021-01-02 15:26:51 +01:00