Push to rename
Merge branch 'master' of https://github.com/Ethanmn/CPE476Final
loljk it was already fixed
Differentiating the trees.
Merge branch 'master' of github.com:Ethanmn/CPE476Final
removed free/delete inconsistency in texture.
fixed issue where future collision box was not calculated the same as old collision box
hopefully a model that works on mac (for collisions)
trying to render differed texture onto final
using the box.dae model for bounding rectangles
trying to render to final
merged master, trying to get final to render deferred pass textures