timer; added texture mip-mapping
changed rock size
texture back in
comments next to booleans
before merging to master
Merge branch 'master' into addingTexture
Merge branch 'master' into lightingAdjustments
working with deferred lighting, now has depth component