no message
Merge branch 'master' of https://github.com/marouen-lamiri/COMP371-Project

Conflicts:
	GLM/Source.cpp
Camera and falcon movement
Added ship spotlight.
gitignore the project preferences file
Added first and third person camera
Merge branch 'master' into Work_on_Camera

Conflicts:
	GLM/Source.cpp
Added movement, (arrows for moving above landscape and roll rotating the ship when turning), and awsd keys for moving the actual ship coordinates on the terrain, for debug.
Added placing basic pilars on the landscape, (they are glut cubes for now).
Added lighting controls, and some lighting param changes
gitignore --> put the project prefs fileas tracked again, seems to create problems if not there, so we'll have to modify it manually if someone else changed it.
Copied from other branches:
Added collision detection
Added sandstorm
Added smoke
Added files for texture and texture call -- not finished.
Added texture ot ship + white area light
Added Textures to the terrain, but pillars and smoke are incompatible with texture mapping since we use the glutSolidCube function. Enjoy the Textures
Added particle System for explosion effect
Commented out smoke() in the renderScene function to replace it with the explosion
Added an explosion texture for the particles
rotated the millenium falcon 180 degrees so it flies forward
fixed light issue
Added a spotlight to see if problem still there -- unfortunately the flipped camera or lighting problem is still there
Added collision detection for pillars (the explosion is not always visible if you're flying inside a pillar, but the log for collision detect always works)
Added drawing buildings with vertices -- finally got rid of the problem (!!!) yeyyy
Added a cap on the ship's flying altitude, to force flying around pilars / buildings