Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Conflicts:
	Escape-the-Dawn/Systems/SoundsSystem.cpp
This commit is contained in:
Adam
2014-03-10 01:59:48 +01:00
14 changed files with 299 additions and 56 deletions
+3 -3
View File
@@ -8,9 +8,9 @@ namespace Components
struct Camera : Component
{
int FOV;
int NearClip;
int FarClip;
float FOV;
float NearClip;
float FarClip;
};
}