Emma Broman 8063b54fb8 Merge branch 'master' into thesis/2019/camera-paths ...

# Conflicts:
#	src/navigation/navigationhandler.cpp

2021-06-23 16:31:14 +02:00

..

camera

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

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

documentation

Remove warnings

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

engine

Add the ability to specify RenderEngine font sizes in the configuration file (closes #1653)

2021-06-17 15:39:16 +02:00

interaction

Merge branch 'master' into thesis/2019/camera-paths

2021-06-23 16:31:14 +02:00

mission

Happy new year

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

navigation

Move path creation code into path class file

2021-06-23 15:58:48 +02:00

network

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

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

properties

Feature/numeric slider updates (#1609)

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

query

Happy new year

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

rendering

Add the ability to specify RenderEngine font sizes in the configuration file (closes #1653)

2021-06-17 15:39:16 +02:00

scene

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

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

scripting

Merge branch 'master' into thesis/2019/camera-paths

2021-06-23 16:31:14 +02:00

util

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

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

json.h

Happy new year

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