Fix incorrect indexing of cubemaps.
Merge branch 'skybox' of github.com:fluffyfreak/pioneer into skybox
Remove the offset as I no longer need it.
Merge branch 'box-layout'
get textstress building again
Changed all colors to Color4ub - Compiles and appears to be working. Needs some more testing.
Fix include SDL_stdinc.h include so it compiles properly on MSVC.
Removed "final" keyword which prevents the build on VS2010.
Changed the C style cast into static_cast.
Some final changes Color4ub -> Color.
Merge branch 'color4ub'
decals for the manufacturers
smaller opli decal
add table row alignment controls
Merge remote-tracking branch 'robn/table-row-alignment'
convert luminance back to a float for star fading. fixes #2580
simplify Color4ub::GetLuminance()
Merge remote-tracking branch 'johnbartholomew/issue-2580'
getting started on the new station view
start of the lobby screen. not really sure what to put on it