52 files changed, 0 insertions, 73 deletions

diff --git a/assets/bgFarTree.png b/assets/bgFarTree.png
deleted file mode 100644
index 8b78cae..0000000
--- a/assets/bgFarTree.png
+++ /dev/null
diff --git a/assets/bgFrontTree.png b/assets/bgFrontTree.png
deleted file mode 100644
index 2cb54ad..0000000
--- a/assets/bgFrontTree.png
+++ /dev/null
diff --git a/assets/bgMidTree.png b/assets/bgMidTree.png
deleted file mode 100644
index 35f0c14..0000000
--- a/assets/bgMidTree.png
+++ /dev/null
diff --git a/assets/invUI.png b/assets/invUI.png
deleted file mode 100644
index 8647e38..0000000
--- a/assets/invUI.png
+++ /dev/null
diff --git a/assets/lightTest/Makefile b/assets/lightTest/Makefile
deleted file mode 100644
index c4d1042..0000000
--- a/assets/lightTest/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-LIBS = -lGL -lGLEW -lSDL2main -lSDL2 -lfreetype -lSDL2_image -lSDL2_mixer
-
-FLAGS = -m32 -std=c++11 -Iinclude -Iinclude/freetype2
-
-all:
-	@g++ $(FLAGS) -o main main.cpp $(LIBS)
\ No newline at end of file
diff --git a/assets/lightTest/main.cp b/assets/lightTest/main.cp
deleted file mode 100644
index e69de29..0000000
--- a/assets/lightTest/main.cp
+++ /dev/null
diff --git a/assets/lightTest/main.cpp b/assets/lightTest/main.cpp
deleted file mode 100644
index 4091389..0000000
--- a/assets/lightTest/main.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include <GL/glew.h>
-
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_opengl.h>
-#include <SDL2/SDL_image.h>
-#include <SDL2/SDL_mixer.h>
-#include <iostream>
-
-#define SCREEN_WIDTH 1280
-#define	SCREEN_HEIGHT 720
-
-SDL_Window* window;
-SDL_GLContext  mainGLContext = NULL;
-
-int main(void){
-	if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0){
-		std::cout << "SDL was not able to initialize! Error: " << SDL_GetError() << std::endl;
-		return -1;
-	}
-	// Run SDL_Quit when main returns
-    atexit(SDL_Quit);
-
-	    window = SDL_CreateWindow("Ass",
-							  SDL_WINDOWPOS_UNDEFINED,	// Spawn the window at random (undefined) x and y coordinates
-							  SDL_WINDOWPOS_UNDEFINED,	//
-							  SCREEN_WIDTH,
-							  SCREEN_HEIGHT,
-							  SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL
-#ifdef FULLSCREEN
-							  | SDL_WINDOW_FULLSCREEN
-#endif // FULLSCREEN
-                              );
-
-	if(window==NULL){
-		std::cout << "The window failed to generate! SDL_Error: " << SDL_GetError() << std::endl;
-        return -1;
-    }
-
-    if((mainGLContext = SDL_GL_CreateContext(window)) == NULL){
-		std::cout << "The OpenGL context failed to initialize! SDL_Error: " << SDL_GetError() << std::endl;
-        return -1;
-    }
-	
-
-    GLenum err;
-	glewExperimental = GL_TRUE;
-	if((err=glewInit()) != GLEW_OK){
-		std::cout << "GLEW was not able to initialize! Error: " << glewGetErrorString(err) << std::endl;
-		return -1;
-	}
-
-	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-	
-	glViewport(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
-	
-	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-
-	bool gameRunning = true;
-    while(gameRunning){
-
-    }
-    SDL_GL_DeleteContext(mainGLContext);
-    SDL_DestroyWindow(window);
-    return 0;
-}
\ No newline at end of file
diff --git a/assets/maybeplayer.png b/assets/player/maybeplayer.png
index c580ff7..c580ff7 100644
--- a/assets/maybeplayer.png
+++ b/assets/player/maybeplayer.png
diff --git a/assets/player.png b/assets/player/player.png
index 3977092..3977092 100644
--- a/assets/player.png
+++ b/assets/player/player.png
diff --git a/assets/player1.png b/assets/player/player1.png
index edf8bf8..edf8bf8 100644
--- a/assets/player1.png
+++ b/assets/player/player1.png
diff --git a/assets/player2.png b/assets/player/player2.png
index cfd955f..cfd955f 100644
--- a/assets/player2.png
+++ b/assets/player/player2.png
diff --git a/assets/playerk.png b/assets/player/playerk.png
index 7abf012..7abf012 100644
--- a/assets/playerk.png
+++ b/assets/player/playerk.png
diff --git a/assets/playerk1.png b/assets/player/playerk1.png
index 1c4fb49..1c4fb49 100644
--- a/assets/playerk1.png
+++ b/assets/player/playerk1.png
diff --git a/assets/playerk2.png b/assets/player/playerk2.png
index 97f769b..97f769b 100644
--- a/assets/playerk2.png
+++ b/assets/player/playerk2.png
diff --git a/assets/playerk3.png b/assets/player/playerk3.png
index 19b97c4..19b97c4 100644
--- a/assets/playerk3.png
+++ b/assets/player/playerk3.png
diff --git a/assets/playerk4.png b/assets/player/playerk4.png
index c32a9b3..c32a9b3 100644
--- a/assets/playerk4.png
+++ b/assets/player/playerk4.png
diff --git a/assets/playerk5.png b/assets/player/playerk5.png
index fabfa60..fabfa60 100644
--- a/assets/playerk5.png
+++ b/assets/player/playerk5.png
diff --git a/assets/playerk6.png b/assets/player/playerk6.png
index 269fccb..269fccb 100644
--- a/assets/playerk6.png
+++ b/assets/player/playerk6.png
diff --git a/assets/playerk7.png b/assets/player/playerk7.png
index aeac120..aeac120 100644
--- a/assets/playerk7.png
+++ b/assets/player/playerk7.png
diff --git a/assets/playerk8.png b/assets/player/playerk8.png
index ff03a02..ff03a02 100644
--- a/assets/playerk8.png
+++ b/assets/player/playerk8.png
diff --git a/assets/bg.png b/assets/style/classic/bg/bg.png
index 2dbc3f9..2dbc3f9 100644
--- a/assets/bg.png
+++ b/assets/style/classic/bg/bg.png
diff --git a/assets/bgFarMountain.png b/assets/style/classic/bg/bgFarMountain.png
index eb703bb..eb703bb 100644
--- a/assets/bgFarMountain.png
+++ b/assets/style/classic/bg/bgFarMountain.png
diff --git a/assets/bgFarTreeTile.png b/assets/style/classic/bg/bgFarTreeTile.png
index 07546a5..07546a5 100644
--- a/assets/bgFarTreeTile.png
+++ b/assets/style/classic/bg/bgFarTreeTile.png
diff --git a/assets/bgFrontTreeTile.png b/assets/style/classic/bg/bgFrontTreeTile.png
index 7fc7450..7fc7450 100644
--- a/assets/bgFrontTreeTile.png
+++ b/assets/style/classic/bg/bgFrontTreeTile.png
diff --git a/assets/bgMidTreeTile.png b/assets/style/classic/bg/bgMidTreeTile.png
index 126723e..126723e 100644
--- a/assets/bgMidTreeTile.png
+++ b/assets/style/classic/bg/bgMidTreeTile.png
diff --git a/assets/bgfarMountains.png b/assets/style/classic/bg/bgfarMountains.png
index fa6b349..fa6b349 100644
--- a/assets/bgfarMountains.png
+++ b/assets/style/classic/bg/bgfarMountains.png
diff --git a/assets/bgn.png b/assets/style/classic/bg/bgn.png
index 2aa3995..2aa3995 100644
--- a/assets/bgn.png
+++ b/assets/style/classic/bg/bgn.png
diff --git a/assets/dirt.png b/assets/style/classic/bg/dirt.png
index 11252ac..11252ac 100644
--- a/assets/dirt.png
+++ b/assets/style/classic/bg/dirt.png
diff --git a/assets/forestTileBack.png b/assets/style/classic/bg/forestTileBack.png
index 0ea6022..0ea6022 100644
--- a/assets/forestTileBack.png
+++ b/assets/style/classic/bg/forestTileBack.png
diff --git a/assets/forestTileFront.png b/assets/style/classic/bg/forestTileFront.png
index e54f631..e54f631 100644
--- a/assets/forestTileFront.png
+++ b/assets/style/classic/bg/forestTileFront.png
diff --git a/assets/forestTileMid.png b/assets/style/classic/bg/forestTileMid.png
index b23afd2..b23afd2 100644
--- a/assets/forestTileMid.png
+++ b/assets/style/classic/bg/forestTileMid.png
diff --git a/assets/grass.png b/assets/style/classic/bg/grass.png
index e05fb9b..e05fb9b 100644
--- a/assets/grass.png
+++ b/assets/style/classic/bg/grass.png
diff --git a/assets/brazzier.png b/assets/style/classic/brazzier.png
index e332599..e332599 100644
--- a/assets/brazzier.png
+++ b/assets/style/classic/brazzier.png
diff --git a/assets/fountain1.png b/assets/style/classic/fountain1.png
index 46f7c44..46f7c44 100644
--- a/assets/fountain1.png
+++ b/assets/style/classic/fountain1.png
diff --git a/assets/house1.png b/assets/style/classic/house1.png
index ce97a81..ce97a81 100644
--- a/assets/house1.png
+++ b/assets/style/classic/house1.png
diff --git a/assets/house1N.png b/assets/style/classic/house1N.png
index 0285533..0285533 100644
--- a/assets/house1N.png
+++ b/assets/style/classic/house1N.png
diff --git a/assets/house2.png b/assets/style/classic/house2.png
index 7404cd9..7404cd9 100644
--- a/assets/house2.png
+++ b/assets/style/classic/house2.png
diff --git a/assets/lampPost1.png b/assets/style/classic/lampPost1.png
index 24f1807..24f1807 100644
--- a/assets/lampPost1.png
+++ b/assets/style/classic/lampPost1.png
diff --git a/assets/townhall.png b/assets/style/classic/townhall.png
index 7b510e8..7b510e8 100644
--- a/assets/townhall.png
+++ b/assets/style/classic/townhall.png
diff --git a/assets/style/rustic/bg/bg.png b/assets/style/rustic/bg/bg.png
new file mode 100644
index 0000000..2dbc3f9
--- /dev/null
+++ b/assets/style/rustic/bg/bg.png
diff --git a/assets/style/rustic/bg/bgFarMountain.png b/assets/style/rustic/bg/bgFarMountain.png
new file mode 100644
index 0000000..eb703bb
--- /dev/null
+++ b/assets/style/rustic/bg/bgFarMountain.png
diff --git a/assets/style/rustic/bg/bgFarTreeTile.png b/assets/style/rustic/bg/bgFarTreeTile.png
new file mode 100644
index 0000000..07546a5
--- /dev/null
+++ b/assets/style/rustic/bg/bgFarTreeTile.png
diff --git a/assets/style/rustic/bg/bgFrontTreeTile.png b/assets/style/rustic/bg/bgFrontTreeTile.png
new file mode 100644
index 0000000..7fc7450
--- /dev/null
+++ b/assets/style/rustic/bg/bgFrontTreeTile.png
diff --git a/assets/style/rustic/bg/bgMidTreeTile.png b/assets/style/rustic/bg/bgMidTreeTile.png
new file mode 100644
index 0000000..126723e
--- /dev/null
+++ b/assets/style/rustic/bg/bgMidTreeTile.png
diff --git a/assets/style/rustic/bg/bgfarMountains.png b/assets/style/rustic/bg/bgfarMountains.png
new file mode 100644
index 0000000..fa6b349
--- /dev/null
+++ b/assets/style/rustic/bg/bgfarMountains.png
diff --git a/assets/style/rustic/bg/bgn.png b/assets/style/rustic/bg/bgn.png
new file mode 100644
index 0000000..2aa3995
--- /dev/null
+++ b/assets/style/rustic/bg/bgn.png
diff --git a/assets/style/rustic/bg/dirt.png b/assets/style/rustic/bg/dirt.png
new file mode 100644
index 0000000..038aae1
--- /dev/null
+++ b/assets/style/rustic/bg/dirt.png
diff --git a/assets/style/rustic/bg/forestTileBack.png b/assets/style/rustic/bg/forestTileBack.png
new file mode 100644
index 0000000..0ea6022
--- /dev/null
+++ b/assets/style/rustic/bg/forestTileBack.png
diff --git a/assets/style/rustic/bg/forestTileFront.png b/assets/style/rustic/bg/forestTileFront.png
new file mode 100644
index 0000000..8e532bb
--- /dev/null
+++ b/assets/style/rustic/bg/forestTileFront.png
diff --git a/assets/style/rustic/bg/forestTileMid.png b/assets/style/rustic/bg/forestTileMid.png
new file mode 100644
index 0000000..b23afd2
--- /dev/null
+++ b/assets/style/rustic/bg/forestTileMid.png
diff --git a/assets/style/rustic/bg/grass.png b/assets/style/rustic/bg/grass.png
new file mode 100644
index 0000000..6a35d8e
--- /dev/null
+++ b/assets/style/rustic/bg/grass.png
diff --git a/assets/style/rustic/fountain1.png b/assets/style/rustic/fountain1.png
new file mode 100644
index 0000000..ff242bf
--- /dev/null
+++ b/assets/style/rustic/fountain1.png