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

..

documentation

Updating Ghoul repository

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

engine

Feature/virtualproperty (#286)

2017-04-13 14:38:28 -04:00

interaction

Updating Ghoul repository

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

mission

- Remove documentation.h include and replace with forward declaration

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

network

Updating Ghoul repository

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

performance

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

properties

Rename None to Hidden, to avoid collision with X11 and reset data path

2017-03-06 10:33:30 +01:00

query

Update copyright header to 2017

2017-02-06 18:02:01 -05:00

rendering

Remove some power scaled coordinates. Remove spice dependency from sphere

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

scene

Remove some power scaled coordinates. Remove spice dependency from sphere

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

scripting

- Add check in style guide that prevents ‘using namespace’ in header files

2017-03-01 21:02:33 -05:00

util

Remove some power scaled coordinates. Remove spice dependency from sphere

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

openspace.h

Updating version number in preparation for Earth Day event

2017-04-12 14:21:13 -04:00