aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authortaw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5>2008-06-03 22:55:43 +0000
committertaw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5>2008-06-03 22:55:43 +0000
commit33a948139cb6edffeb84cb6234ee9aba90bfda3c (patch)
tree4375df350968b5184e99bf4669577f29d6c905b0 /data
parent0cece1620a0a9132f98d426b35bdf8b26b3974c1 (diff)
Text rendering framework (foundation)
git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@68 84d2e878-0bd5-11dd-ad15-13eda11d74c5
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am2
-rw-r--r--data/textures/font.pngbin0 -> 23985 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index cbeb059..019eba4 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,7 +6,7 @@ shadersdir = $(datadir)/thrust3d/shaders
shaders_DATA = shaders/lighting.vert shaders/lighting.frag shaders/swirlytron.vert shaders/swirlytron.frag
texturesdir = $(datadir)/thrust3d/textures
-textures_DATA = textures/floor1.png textures/tiledwall.png textures/radioactive.png textures/fuel.png
+textures_DATA = textures/floor1.png textures/tiledwall.png textures/radioactive.png textures/fuel.png textures/font.png
roomsdir = $(datadir)/thrust3d/rooms
rooms_DATA = rooms/00-00-00 rooms/00-00-01 rooms/00-00-02 rooms/00-00-03 rooms/00-00-04 rooms/00-01-04 rooms/00-02-04
diff --git a/data/textures/font.png b/data/textures/font.png
new file mode 100644
index 0000000..99c06c0
--- /dev/null
+++ b/data/textures/font.png
Binary files differ