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

# Conflicts:
#	src/rendering/abufferrenderer.cpp

2021-08-09 15:21:08 +02:00

..

asset.h

Happy new year

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

assetlistener.h

Happy new year

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

assetloader.h

Feature/filesystem cleanup (#1587)

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

assetmanager.h

Happy new year

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

lightsource.h

Happy new year

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

profile.h

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

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

rotation.h

Happy new year

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

scale.h

Happy new year

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

scene.h

Time manager uses simulated application time during playback-with-frames

2021-07-11 14:43:54 -06:00

scenegraphnode.h

Feature/interactionsphere (#1561)

2021-04-26 13:13:36 +02:00

sceneinitializer.h

Happy new year

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

scenelicensewriter.h

Happy new year

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

timeframe.h

Happy new year

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

translation.h

Happy new year

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