Merge branch 'developer' into revertLoadingscreenShit

# Conflicts:
#	Weapon.cpp
#	World.cpp

Crystal.cpp

@@ -40,7 +40,7 @@ Crystal::~Crystal()
 
 void Crystal::draw()
 {	
-	crystalRot -= 3.0f;
+	crystalRot -= 0.5f;
 	rotation = Vec3f(0, crystalRot, 0);
 	Entity::draw();	
 }

Weapon.cpp

@@ -91,27 +91,11 @@ void Weapon::draw(){
         glRotatef(rotationWeapon.z, 0, 0, 1);
         glRotatef(rotationWeapon.y, 0, 1, 0);
         glRotatef(rotationWeapon.x, 1, 0, 0);
-/*
-        glColor3ub(255, 255, 0);
-        glBegin(GL_LINES);
-        glVertex2f(0, 4);
-        glVertex2f(0, -4);
-        glVertex2f(4, 0);
-        glVertex2f(-4, 0);
-        glEnd();*/
-
         glTranslatef(-ankerPoint.x, -ankerPoint.y, -ankerPoint.z);
 
-        weaponmodel->draw();
+        glScalef(scale, scale, scale);
-
-        //Test code for finding anchor point
-        glTranslatef(collisionPoint.x, collisionPoint.y, collisionPoint.z);
-
-        float matrix[16];
-        glGetFloatv(GL_MODELVIEW_MATRIX, matrix);
-
-        Vec3f point = multiply(matrix, Vec3f(1,1,1));
 
+		weaponmodel->draw();
 
         glPopMatrix();
 

World.cpp

@@ -248,7 +248,6 @@ float World::getHeight(float x, float y)
 
 void World::draw()
 {
-
 	player->setCamera();
 
 	float lightPosition[4] = { 0, 2, 1, 0 };