Alexander Bock d628c1a667 Merge branch 'master' into feature/DU ...

# Conflicts:
#	data/scene/grids/grids.mod
#	ext/sgct

2017-10-17 17:09:37 -04:00

..

modelgeometry.cpp

Feature/cmake cleanup (#381)

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

modelgeometry.h

Fix byte order mark commits

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

multimodelgeometry.cpp

Fix byte order mark commits

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

multimodelgeometry.h

Fix byte order mark commits

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

renderablemodel.cpp

Feature/cmake cleanup (#381)

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

renderablemodel.h

Remove return values from initialize and deinitialize functions

2017-07-28 17:51:25 -04:00

renderableplane.cpp

Feature/cmake cleanup (#381)

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

renderableplane.h

Remove return values from initialize and deinitialize functions

2017-07-28 17:51:25 -04:00

renderablesphere.cpp

Updated fade-out of Milkyway.

2017-10-12 22:05:48 -04:00

renderablesphere.h

Added Milkyway transition.

2017-10-10 17:42:31 -04:00

renderablesphericalgrid.cpp

Update gitignore to include Mars texture

2017-08-30 14:56:02 -04:00

renderablesphericalgrid.h

Feature/cmake cleanup (#381)

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

renderabletrail.cpp

Feature/cmake cleanup (#381)

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

renderabletrail.h

Remove return values from initialize and deinitialize functions

2017-07-28 17:51:25 -04:00

renderabletrailorbit.cpp

Feature/cmake cleanup (#381)

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

renderabletrailorbit.h

Remove return values from initialize and deinitialize functions

2017-07-28 17:51:25 -04:00

renderabletrailtrajectory.cpp

Feature/cmake cleanup (#381)

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

renderabletrailtrajectory.h

Remove return values from initialize and deinitialize functions

2017-07-28 17:51:25 -04:00

screenspaceframebuffer.cpp

Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296)

2017-10-10 14:16:55 -04:00

screenspaceframebuffer.h

Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296)

2017-10-10 14:16:55 -04:00

screenspaceimagelocal.cpp

Fix loading of RGB screenspace images

2017-10-11 09:13:20 -04:00

screenspaceimagelocal.h

Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296)

2017-10-10 14:16:55 -04:00

screenspaceimageonline.cpp

Fix loading of RGB screenspace images

2017-10-11 09:13:20 -04:00

screenspaceimageonline.h

Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296)

2017-10-10 14:16:55 -04:00

wavefrontgeometry.cpp

Update copyright header to 2017

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

wavefrontgeometry.h

Updated check_style_guide to test for include guards and copyright

2017-02-09 23:55:39 -05:00