Alexander Bock b78d1dd033 Merge branch 'master' into feature/memory-allocations ...

# Conflicts:
#	include/openspace/scene/scenegraphnode.h
#	modules/imgui/include/gui.h

2020-08-05 19:06:04 +02:00

..

asset.h

Some more cleanup

2020-05-10 14:03:42 +02:00

assetlistener.h

Some more cleanup of the assets

2020-05-06 16:21:47 +02:00

assetloader.h

Cleanup of asset handling and move more functionality to the Profile

2020-06-18 23:09:26 +02:00

assetmanager.h

Cleanup of asset handling and move more functionality to the Profile

2020-06-18 23:09:26 +02:00

lightsource.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

profile.h

Intermediate commit for meta information

2020-06-23 10:32:51 +02:00

rotation.h

Moving over more allocations to the memory pool

2020-08-05 11:19:09 +02:00

scale.h

Moving over more allocations to the memory pool

2020-08-05 11:19:09 +02:00

scene.h

Create SceneGraphNodes in memory pool

2020-08-05 10:46:16 +02:00

scenegraphnode.h

Merge branch 'master' into feature/memory-allocations

2020-08-05 19:06:04 +02:00

sceneinitializer.h

Update the copyright header to 2020

2020-02-10 21:51:01 +01:00

scenelicensewriter.h

Add loading of meta information from assets

2020-05-05 00:29:46 +02:00

timeframe.h

Moving over more allocations to the memory pool

2020-08-05 11:19:09 +02:00

translation.h

Moving over more allocations to the memory pool

2020-08-05 11:19:09 +02:00