Alexander Bock 50fd9309ba Merge branch 'master' into feature/NewAtmosphere ...

# Conflicts:
#	src/rendering/renderengine.cpp

2017-10-24 15:30:22 -04:00

..

gui.cpp

Fix featured property display

2017-10-19 22:52:25 -04:00

guicomponent.cpp

Feature/cmake cleanup (#381)

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

guifilepathcomponent.cpp

Feature/cmake cleanup (#381)

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

guiglobebrowsingcomponent.cpp

Fix a variety of warnings

2017-10-21 10:10:40 -04:00

guihelpcomponent.cpp

Feature/cmake cleanup (#381)

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

guiiswacomponent.cpp

Feature/cmake cleanup (#381)

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

guimissioncomponent.cpp

Fix a variety of warnings

2017-10-21 10:10:40 -04:00

guiorigincomponent.cpp

Added first version of mission visualization

2017-10-16 10:23:00 -04:00

guiparallelcomponent.cpp

Feature/cmake cleanup (#381)

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

guiperformancecomponent.cpp

Feature/cmake cleanup (#381)

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

guipropertycomponent.cpp

Fix a variety of warnings

2017-10-21 10:10:40 -04:00

guispacetimecomponent.cpp

Add display for current time and ability to return to today to the space/time component

2017-10-24 02:53:51 -07:00

guitimecomponent.cpp

Feature/cmake cleanup (#381)

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

renderproperties.cpp

Feature/cmake cleanup (#381)

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