...
Merge branch 'master' into Qt-Integration
Updated the QT Graphics Project folder
Engine Consolidation, glsl 1.2 compatibility
Moving binaries toward using the consolidated engine initialization routine,
for purposes of consistency and unification of methodology.

Also to pretend like I was productive for this class this weekend.
Sorry, Physics II beckoned :(
Merge branch 'Particle-Effect-Development'
Texture management fix: should 'just work.'
Merge branch 'master' of https://github.com/UMLComputerGraphics/GraphicsProject
Cleaning up particle merge.
attempt 1

failed
Fix init of rel path code when get is called before init
Resolve issues with InitShader by making dondeestalosshaders a global.
Added a new liquor bottle model, bottle_liquor_high2.obj. The new model is a closer representation of the bottle in class, although it does not yet have bumps.
Added a candle model. There are 3 files, one with both the candle and the candlestick, and one for each separately.
Changed name of object in wine .obj file
Additions to monolith to bring up to speed with the working but flawed morphing without quadtree
Fancy particle test!
QT dicking-with
Far out, man.
Merge branch 'master' of https://github.com/UMLComputerGraphics/GraphicsProject
Oh my god this is so beautiful
Inclusion of new models in demo and monolith. Triangle spliting and quad mapping to come
Timer fix, Scene Graph WIP