Merge remote-tracking branch 'origin/master'

d

Conflicts:
	include/World.h
	include/common.h
	include/entities.h
	src/UIClass.cpp
	src/World.cpp
	src/entities.cpp
	src/main.cpp

1 files changed, 28 insertions, 0 deletions

diff --git a/include/entities.h b/include/entities.h
index cb10bcf..89d9ec3 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #ifndef ENTITIES_H
 #define ENTITIES_H
 
@@ -26,4 +27,31 @@ public:
 	~Player();
 };
 
+=======
+#ifndef ENTITIES_H
+#define ENTITIES_H
+
+#include <common.h>
+
+
+class Entities{
+public:
+	float width;
+	float height;
+	float speed;
+	int type;
+	vec2 loc;
+
+	void spawn(float, float);
+
+
+};
+
+class Player : public Entities{
+public:
+	Player();
+	~Player();
+};
+
+>>>>>>> origin/master
 #endif //ENTITIES_H
\ No newline at end of file