Page MenuHomePhabricator (Chris)
Files F102555

No OneTemporary
Actions

Size
11 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/data/gfx/Makefile.am b/data/gfx/Makefile.am
index 49ecf0b..9606cea 100644
--- a/data/gfx/Makefile.am
+++ b/data/gfx/Makefile.am
@@ -1,9 +1,13 @@
## Process this file with automake to produce Makefile.in
gfxdatadir = $(pkgdatadir)/gfx
gfxdata_DATA = \
-Credits.png Foot.png icon.png Story1.png \
-Doodads.png GameOver.png level1.png Mortal.png \
-FighterStats.png icon.bmp level3.png PlayerSelect.png
+Credits.png icon.png \
+level1.png level3_sky.png level4_rock.png \
+Doodads.png level2.png level4.desc level4_saturn.png Mortal.png \
+FighterStats.png level3_city.png level4_earth.png level5.png PlayerSelect.png \
+Foot.png level3.desc level4_ground.png level6.png Story1.png \
+GameOver.png level3_ground.png level4_moon.png level7.png Story2.png \
+icon.bmp level3_moon.png level4_nebula.png
EXTRA_DIST = $(gfxdata_DATA)
diff --git a/data/gfx/Makefile.in b/data/gfx/Makefile.in
index 86b3b56..a50a60b 100644
--- a/data/gfx/Makefile.in
+++ b/data/gfx/Makefile.in
@@ -1,209 +1,214 @@
# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
DESTDIR =
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ../..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_alias = @build_alias@
build_triplet = @build@
host_alias = @host_alias@
host_triplet = @host@
target_alias = @target_alias@
target_triplet = @target@
AUTODIRS = @AUTODIRS@
CXX = @CXX@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
PERL = @PERL@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
VERSION = @VERSION@
perl_embed_ccflags = @perl_embed_ccflags@
perl_embed_ldflags = @perl_embed_ldflags@
gfxdatadir = $(pkgdatadir)/gfx
-gfxdata_DATA = Credits.png Foot.png icon.png Story1.png Doodads.png GameOver.png level1.png Mortal.png FighterStats.png icon.bmp level3.png PlayerSelect.png
+gfxdata_DATA = Credits.png icon.png level1.png level3_sky.png level4_rock.png Doodads.png level2.png level4.desc level4_saturn.png Mortal.png FighterStats.png level3_city.png level4_earth.png level5.png PlayerSelect.png Foot.png level3.desc level4_ground.png level6.png Story1.png GameOver.png level3_ground.png level4_moon.png level7.png Story2.png icon.bmp level3_moon.png level4_nebula.png
EXTRA_DIST = $(gfxdata_DATA)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
CONFIG_CLEAN_FILES =
DATA = $(gfxdata_DATA)
DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps data/gfx/Makefile
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu data/gfx/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
install-gfxdataDATA: $(gfxdata_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(gfxdatadir)
@list='$(gfxdata_DATA)'; for p in $$list; do \
if test -f $(srcdir)/$$p; then \
echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gfxdatadir)/$$p"; \
$(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(gfxdatadir)/$$p; \
else if test -f $$p; then \
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gfxdatadir)/$$p"; \
$(INSTALL_DATA) $$p $(DESTDIR)$(gfxdatadir)/$$p; \
fi; fi; \
done
uninstall-gfxdataDATA:
@$(NORMAL_UNINSTALL)
list='$(gfxdata_DATA)'; for p in $$list; do \
rm -f $(DESTDIR)$(gfxdatadir)/$$p; \
done
tags: TAGS
TAGS:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = data/gfx
distdir: $(DISTFILES)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu data/gfx/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
info-am:
info: info-am
dvi-am:
dvi: dvi-am
check-am: all-am
check: check-am
installcheck-am:
installcheck: installcheck-am
install-exec-am:
install-exec: install-exec-am
install-data-am: install-gfxdataDATA
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am: uninstall-gfxdataDATA
uninstall: uninstall-am
all-am: Makefile $(DATA)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(gfxdatadir)
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
mostlyclean-am: mostlyclean-generic
mostlyclean: mostlyclean-am
clean-am: clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-generic clean-am
distclean: distclean-am
maintainer-clean-am: maintainer-clean-generic distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
.PHONY: uninstall-gfxdataDATA install-gfxdataDATA tags distdir info-am \
info dvi-am dvi check check-am installcheck-am installcheck \
install-exec-am install-exec install-data-am install-data install-am \
install uninstall-am uninstall all-redirect all-am all installdirs \
mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/data/gfx/PlayerSelect.png b/data/gfx/PlayerSelect.png
index dc366a2..8613738 100644
Binary files a/data/gfx/PlayerSelect.png and b/data/gfx/PlayerSelect.png differ
diff --git a/data/gfx/Story2.png b/data/gfx/Story2.png
new file mode 100644
index 0000000..345980c
Binary files /dev/null and b/data/gfx/Story2.png differ
diff --git a/data/gfx/level1.png b/data/gfx/level1.png
index 41ac43a..39d8751 100644
Binary files a/data/gfx/level1.png and b/data/gfx/level1.png differ
diff --git a/data/gfx/level2.png b/data/gfx/level2.png
new file mode 100644
index 0000000..7b6857d
Binary files /dev/null and b/data/gfx/level2.png differ
diff --git a/data/gfx/level3.desc b/data/gfx/level3.desc
new file mode 100644
index 0000000..2a17f1b
--- /dev/null
+++ b/data/gfx/level3.desc
@@ -0,0 +1,9 @@
+4
+level3_sky.png
+0 0 0.068
+level3_moon.png
+330 5 0.2
+level3_city.png
+0 39 0.31
+level3_ground.png
+0 365 1.0
diff --git a/data/gfx/level3.png b/data/gfx/level3.png
deleted file mode 100644
index 1284108..0000000
Binary files a/data/gfx/level3.png and /dev/null differ
diff --git a/data/gfx/level3_city.png b/data/gfx/level3_city.png
new file mode 100644
index 0000000..72e29cb
Binary files /dev/null and b/data/gfx/level3_city.png differ
diff --git a/data/gfx/level3_ground.png b/data/gfx/level3_ground.png
new file mode 100644
index 0000000..6c2b2fb
Binary files /dev/null and b/data/gfx/level3_ground.png differ
diff --git a/data/gfx/level3_moon.png b/data/gfx/level3_moon.png
new file mode 100644
index 0000000..a9fc987
Binary files /dev/null and b/data/gfx/level3_moon.png differ
diff --git a/data/gfx/level3_sky.png b/data/gfx/level3_sky.png
new file mode 100644
index 0000000..f4e8512
Binary files /dev/null and b/data/gfx/level3_sky.png differ
diff --git a/data/gfx/level4.desc b/data/gfx/level4.desc
new file mode 100644
index 0000000..8a3d20b
--- /dev/null
+++ b/data/gfx/level4.desc
@@ -0,0 +1,13 @@
+6
+level4_nebula.png
+0 0 0.25
+level4_saturn.png
+700 0 0.6
+level4_earth.png
+500 38 0.8
+level4_moon.png
+530 50 0.7
+level4_rock.png
+1279 143 1.0
+level4_ground.png
+0 345 1.0
diff --git a/data/gfx/level4_earth.png b/data/gfx/level4_earth.png
new file mode 100644
index 0000000..def2b8d
Binary files /dev/null and b/data/gfx/level4_earth.png differ
diff --git a/data/gfx/level4_ground.png b/data/gfx/level4_ground.png
new file mode 100644
index 0000000..a2487ef
Binary files /dev/null and b/data/gfx/level4_ground.png differ
diff --git a/data/gfx/level4_moon.png b/data/gfx/level4_moon.png
new file mode 100644
index 0000000..2b7c9c3
Binary files /dev/null and b/data/gfx/level4_moon.png differ
diff --git a/data/gfx/level4_nebula.png b/data/gfx/level4_nebula.png
new file mode 100644
index 0000000..a28426c
Binary files /dev/null and b/data/gfx/level4_nebula.png differ
diff --git a/data/gfx/level4_rock.png b/data/gfx/level4_rock.png
new file mode 100644
index 0000000..c51485e
Binary files /dev/null and b/data/gfx/level4_rock.png differ
diff --git a/data/gfx/level4_saturn.png b/data/gfx/level4_saturn.png
new file mode 100644
index 0000000..5edd35a
Binary files /dev/null and b/data/gfx/level4_saturn.png differ
diff --git a/data/gfx/level5.png b/data/gfx/level5.png
new file mode 100644
index 0000000..03bdec9
Binary files /dev/null and b/data/gfx/level5.png differ
diff --git a/data/gfx/level6.png b/data/gfx/level6.png
new file mode 100644
index 0000000..1361e28
Binary files /dev/null and b/data/gfx/level6.png differ
diff --git a/data/gfx/level7.png b/data/gfx/level7.png
new file mode 100644
index 0000000..0f765eb
Binary files /dev/null and b/data/gfx/level7.png differ

File Metadata

Mime Type
text/x-diff
Expires
Wed, Feb 4, 2:11 PM (2 h, 5 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
55626
Default Alt Text
(11 KB)

Event Timeline