diff --git a/.gitignore b/.gitignore index 7099fcc5..6736d0f2 100644 --- a/.gitignore +++ b/.gitignore @@ -39,5 +39,7 @@ win32/*.suo deushax/deushax deushax/editor monsterz/monsterz +test/lol-test +test/quad tools/make-font # Our data diff --git a/Makefile.am b/Makefile.am index 5a518eb8..880ea64c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ -SUBDIRS = src test deushax monsterz tools art gfx -DIST_SUBDIRS = $(SUBDIRS) maps +SUBDIRS = src test deushax monsterz tools gfx +DIST_SUBDIRS = $(SUBDIRS) EXTRA_DIST = bootstrap build-linux build-mingw AUTOMAKE_OPTIONS = dist-bzip2 diff --git a/configure.ac b/configure.ac index 964096a5..d4397b39 100644 --- a/configure.ac +++ b/configure.ac @@ -193,14 +193,19 @@ AC_CONFIG_FILES([ Makefile src/Makefile test/Makefile - monsterz/Makefile - deushax/Makefile - tools/Makefile - art/Makefile - art/test/Makefile gfx/Makefile gfx/font/Makefile - maps/Makefile + tools/Makefile +]) +AC_CONFIG_FILES([ + monsterz/Makefile +]) +AC_CONFIG_FILES([ + deushax/Makefile + deushax/art/Makefile + deushax/art/test/Makefile + deushax/gfx/Makefile + deushax/maps/Makefile ]) AC_OUTPUT diff --git a/doc/clipping.png b/doc/clipping.png deleted file mode 100644 index c03174c6..00000000 Binary files a/doc/clipping.png and /dev/null differ diff --git a/doc/clipping.svg b/doc/clipping.svg deleted file mode 100644 index fe076580..00000000 --- a/doc/clipping.svg +++ /dev/null @@ -1,1478 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Whole map - Screen area - - - Needsrendering - Ignored - - diff --git a/doc/collisions-bg.png b/doc/collisions-bg.png deleted file mode 100644 index 0ff0bab6..00000000 Binary files a/doc/collisions-bg.png and /dev/null differ diff --git a/doc/collisions.png b/doc/collisions.png deleted file mode 100644 index cbadec53..00000000 Binary files a/doc/collisions.png and /dev/null differ diff --git a/doc/collisions.svg b/doc/collisions.svg deleted file mode 100644 index b387990c..00000000 --- a/doc/collisions.svg +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - Collision primitives - diff --git a/doc/layers-bg.png b/doc/layers-bg.png deleted file mode 100644 index 5b894aeb..00000000 Binary files a/doc/layers-bg.png and /dev/null differ diff --git a/doc/layers.png b/doc/layers.png deleted file mode 100644 index 14aed5bc..00000000 Binary files a/doc/layers.png and /dev/null differ diff --git a/doc/layers.svg b/doc/layers.svg deleted file mode 100644 index d505c379..00000000 --- a/doc/layers.svg +++ /dev/null @@ -1,174 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - Ground 0 - Ground Decal 0 - Object 0 - Wall 0 - Wall Decal 0 - Ground 1 - Final - - Layer naming - diff --git a/doc/zsort-bg.png b/doc/zsort-bg.png deleted file mode 100644 index b0bd92d2..00000000 Binary files a/doc/zsort-bg.png and /dev/null differ diff --git a/doc/zsort.png b/doc/zsort.png deleted file mode 100644 index 9e8edc62..00000000 Binary files a/doc/zsort.png and /dev/null differ diff --git a/doc/zsort.svg b/doc/zsort.svg deleted file mode 100644 index d4b1ad26..00000000 --- a/doc/zsort.svg +++ /dev/null @@ -1,503 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - cameradirection(45⁰) - z - y - - z - y = constant - 1 - 2 - 3 - 4 - - - - - - - 5 - - Render step 1 - Render step 2 - Render step 3 - Render step 4 - Render step 5 - - - - - - - - - - - - - - tile size(screen) - - diff --git a/gfx/font/ascii.png b/gfx/font/ascii.png index d1d09161..bf7baca1 100644 Binary files a/gfx/font/ascii.png and b/gfx/font/ascii.png differ