Emil Axelsson a71f4974fe Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/planetradius ...

Conflicts:
	modules/space/rendering/simplespheregeometry.h

2017-04-13 21:31:40 +02:00

..

planetgeometry.cpp

Move the PropertyOwner name specification into the constructor and adjust accordingly

2017-03-02 18:25:13 -05:00

planetgeometry.h

Various cleanup

2017-03-02 19:50:05 -05:00

renderableconstellationbounds.cpp

…

renderableconstellationbounds.h

…

renderableplanet.cpp

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/planetradius

2017-04-13 21:31:40 +02:00

renderableplanet.h

Update Ghoul repository to have the factory return unique_ptrs

2017-03-01 22:03:48 -05:00

renderablerings.cpp

Remove some power scaled coordinates. Remove spice dependency from sphere

2017-04-13 21:27:49 +02:00

renderablerings.h

- Remove documentation.h include and replace with forward declaration

2017-03-01 18:13:15 -05:00

renderablestars.cpp

Updating Ghoul repository

2017-03-10 09:32:16 -05:00

renderablestars.h

- Remove documentation.h include and replace with forward declaration

2017-03-01 18:13:15 -05:00

simplespheregeometry.cpp

Remove some power scaled coordinates. Remove spice dependency from sphere

2017-04-13 21:27:49 +02:00

simplespheregeometry.h

Remove some power scaled coordinates. Remove spice dependency from sphere

2017-04-13 21:27:49 +02:00