added gem.dae
Merge branch 'master' of https://github.com/Ethanmn/CPE476Final
added sky textures
Merge branch 'master' into music_interaction
have a song path from the center
Merge branch 'music_interaction' of github.com:ethanmn/CPE476Final into music_interaction
added skybox.dae
daycycle isDaytime query added
Merge branch 'music_interaction' into deferredLighting
added cone.dae
added log.dae
updated skies to be solid
ray of box
working on transparency, but only the  god ray is affected
working on transparency
Merge branch 'master' into deferredLighting
before framebuffer stuff