Alexander Bock 2ebacb6f93 Merge branch 'master' into thesis/2018/dsn ...

# Conflicts:
#	ext/ghoul

2018-12-03 18:10:28 -05:00

..

documentation

Address clang tidy complaints

2018-11-30 15:34:09 -05:00

engine

Coordinate Axes

2018-11-13 08:09:14 -05:00

interaction

Address clang tidy complaints

2018-11-30 15:34:09 -05:00

mission

Adapt to removal of Singleton

2018-11-05 14:17:42 -05:00

network

Address clang tidy complaints

2018-11-30 15:34:09 -05:00

performance

Address clang tidy complaints

2018-11-30 15:34:09 -05:00

properties

Feature/gaia mission merge (#766)

2018-11-20 18:19:08 -05:00

query

Code cleanup branch (#618)

2018-06-10 04:47:34 +00:00

rendering

Address clang tidy complaints

2018-11-30 15:34:09 -05:00

scene

Address clang tidy complaints

2018-11-30 15:34:09 -05:00

scripting

Misc coding style cleanups

2018-11-06 12:02:56 -05:00

util

Merge branch 'master' into thesis/2018/dsn

2018-12-03 18:10:28 -05:00

json.h

Rename DashboardGlobeLocation to DashboardItemGlobeLocation

2018-07-05 12:00:32 -04:00