OpenSpace

mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-09 21:21:19 -06:00

Files

Alexander Bock 88cf7926ae Merge branch 'master' into feature/loadingscreen-refactor

# Conflicts:
#	modules/galaxy/rendering/renderablegalaxy.cpp

2017-11-09 10:51:56 -05:00

planetgeometry.cpp

2017-08-14 09:38:32 -04:00

planetgeometry.h

2017-07-17 15:54:00 -04:00

renderableconstellationbounds.cpp

2017-11-02 14:27:35 -04:00

renderableconstellationbounds.h

2017-11-08 19:10:59 -06:00

renderableplanet.cpp

2017-11-09 10:51:56 -05:00

renderableplanet.h

2017-11-08 19:10:59 -06:00

renderablerings.cpp

2017-11-08 19:10:59 -06:00

renderablerings.h

2017-11-02 14:27:35 -04:00

renderablestars.cpp

2017-11-09 10:51:56 -05:00

renderablestars.h

2017-11-02 14:27:35 -04:00

simplespheregeometry.cpp

2017-08-14 09:38:32 -04:00

simplespheregeometry.h

2017-08-14 09:38:32 -04:00