Commit 34b88826 authored by Holger Levsen's avatar Holger Levsen

This is work in progress! Font loading is a hack atm and needs more work, see below!

      - renamed to tuxtype (from tuxtype2), also modified the logo :)
      - Solving the sound file licence issues (removed one, updated
        README_SOUNDS.TXT - this is not finished yet!!!!
      - removed all fonts. The font-handling is still a hack,
        see loaders.c - it only uses fonts from ttf-freefont
        and not yet from ttf-dejavu (for non-latini fonts) - and it only
        works on Debian probably (fixed path, not suitable for Windows,
        MacOS and probably other linux distributions)





git-svn-id: svn://svn.debian.org/svn/tux4kids/tuxtype/trunk@86 47d30e19-490b-0410-9d18-e851f4e465b3
parent ceb596bf
v1.5.5 development version, not yet released
<<<<<<< .mine
v1.5.5 development version, not yet released (still font+sound issues)
[ Calvin Arndt ]
- closing all the mem leaks I know of
- remove redundant print_phrase()
- remove hard coded xy positions in print_at() (calculate wrapped y position)
- remove uneeded cast in Phrases()
[ Holger Levsen ]
- renamed to tuxtype (from tuxtype2), also modified the logo :)
- Solving the sound file licence issues (removed one, updated
README_SOUNDS.TXT - this is not finished yet!!!!
- removed all fonts. The font-handling is still a hack,
see loaders.c - it only uses fonts from ttf-freefont
and not yet from ttf-dejavu (for non-latini fonts) - and it only
works on Debian probably (fixed path, not suitable for Windows,
MacOS and probably other linux distributions)
v1.5.4 - Added Norwegian Bokmål translation. Improved Norwegian
Nynorsk translation.
......
SUBDIRS = tuxtype
EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO tuxtype.lsm tuxtype.spec tuxtype.spec.in README.Win32 config.h autorun.inf tuxtype2.ico autogen.sh
EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO tuxtype.lsm tuxtype.spec tuxtype.spec.in README.Win32 config.h autorun.inf tuxtype.ico autogen.sh
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/$(PACKAGE)
......@@ -19,7 +19,7 @@ install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/$(PACKAGE)
$(INSTALL_DATA) $(srcdir)/tuxtype.lsm $(DESTDIR)$(prefix)/doc/$(PACKAGE)/tuxtype.lsm
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)
$(INSTALL_DATA) $(srcdir)/tuxtype2.ico $(DESTDIR)$(prefix)/share/$(PACKAGE)/tuxtype2.ico
$(INSTALL_DATA) $(srcdir)/tuxtype.ico $(DESTDIR)$(prefix)/share/$(PACKAGE)/tuxtype.ico
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)
$(INSTALL_DATA) $(srcdir)/autorun.inf $(DESTDIR)$(prefix)/share/$(PACKAGE)/autorun.inf
......@@ -33,10 +33,12 @@ uninstall-local:
-rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/tuxtype.lsm
-rm -rf $(DESTDIR)$(prefix)/doc/$(PACKAGE)
-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/autorun.inf
-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/tuxtype2.ico
-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/tuxtype.ico
-rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)
AUTOMAKE_OPTIONS = foreign dist-bzip2
#AUTOMAKE_OPTIONS = foreign dist-bzip2
AUTOMAKE_OPTIONS = foreign
# Rule to build tar-gzipped distribution package
$(PACKAGE)-$(VERSION).tar.gz: distcheck
......
Tux Typing 2 Preview:
Tux Typing:
An Educational Typing Tutor Game Starring Tux, the Linux Penguin
----------------------------------------------------------------
......
[autorun]
OPEN=TUXTYPE2.EXE
ICON=TUXTYPE2.ICO
OPEN=TUXTYPE.EXE
ICON=TUXTYPE.ICO
This diff is collapsed.
......@@ -53,28 +53,28 @@
#define HAVE_UNISTD_H 1
/* Name of package */
#define PACKAGE "tuxtype2"
#define PACKAGE "tuxtype"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT ""
/* Define to the full name of this package. */
#define PACKAGE_NAME "tuxtype2"
#define PACKAGE_NAME "tuxtype"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "tuxtype2 1.5.4"
#define PACKAGE_STRING "tuxtype 1.5.5"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "tuxtype2"
#define PACKAGE_TARNAME "tuxtype"
/* Define to the version of this package. */
#define PACKAGE_VERSION "1.5.4"
#define PACKAGE_VERSION "1.5.5"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
#define VERSION "1.5.4"
#define VERSION "1.5.5"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
......
This diff is collapsed.
# Process this file with autoconf to produce a configure script.
AC_INIT(tuxtype2, 1.5.4, )
AC_INIT(tuxtype, 1.5.5, )
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE(tuxtype2, 1.5.4)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(tuxtype, 1.5.5)
AC_CONFIG_SRCDIR([tuxtype/funcs.h])
......@@ -57,7 +57,6 @@ CPPFLAGS="$CPPFLAGS -DDATA_PREFIX=\\\"\$(prefix)\\\""
AC_CONFIG_FILES([Makefile
tuxtype/Makefile
tuxtype/data/Makefile
tuxtype/data/fonts/Makefile
tuxtype/data/images/Makefile
tuxtype/data/images/backgrounds/Makefile
tuxtype/data/images/cities/Makefile
......@@ -71,7 +70,6 @@ tuxtype/data/scripts/Makefile
tuxtype/data/sounds/Makefile
tuxtype/data/themes/Makefile
tuxtype/data/themes/armenian/Makefile
tuxtype/data/themes/armenian/fonts/Makefile
tuxtype/data/themes/armenian/images/Makefile
tuxtype/data/themes/bokmal/Makefile
tuxtype/data/themes/bokmal/words/Makefile
......@@ -93,7 +91,6 @@ tuxtype/data/themes/euskara/words/Makefile
tuxtype/data/themes/french/Makefile
tuxtype/data/themes/french/words/Makefile
tuxtype/data/themes/greek/Makefile
tuxtype/data/themes/greek/fonts/Makefile
tuxtype/data/themes/greek/words/Makefile
tuxtype/data/themes/italian/Makefile
tuxtype/data/themes/italian/words/Makefile
......@@ -101,7 +98,6 @@ tuxtype/data/themes/jamaican/Makefile
tuxtype/data/themes/jamaican/images/Makefile
tuxtype/data/themes/jamaican/words/Makefile
tuxtype/data/themes/lithuanian/Makefile
tuxtype/data/themes/lithuanian/fonts/Makefile
tuxtype/data/themes/lithuanian/images/Makefile
tuxtype/data/themes/lithuanian/images/status/Makefile
tuxtype/data/themes/lithuanian/sounds/Makefile
......@@ -113,7 +109,6 @@ tuxtype/data/themes/nynorsk/images/Makefile
tuxtype/data/themes/nynorsk/images/status/Makefile
tuxtype/data/themes/nynorsk/words/Makefile
tuxtype/data/themes/russian/Makefile
tuxtype/data/themes/russian/fonts/Makefile
tuxtype/data/themes/russian/images/Makefile
tuxtype/data/themes/russian/images/status/Makefile
tuxtype/data/themes/russian/words/Makefile
......
.cvsignore
Makefile
tuxtype2
.deps
Makefile.in
bin_PROGRAMS = tuxtype2
bin_PROGRAMS = tuxtype
tuxtype2_SOURCES = \
tuxtype_SOURCES = \
playgame.c \
main.c \
titlescreen.c \
......
......@@ -5,13 +5,13 @@ COMP = -Wall -g
Hs = globals.h funcs.h
OBJs = laser.o loaders.o main.o playgame.o setup.o titlescreen.o alphabet.o theme.o audio.o pause.o practice.o gettext.o snow.o scripting.o
all: tuxtype2
all: tuxtype
tuxtype2: $(OBJs)
gcc $(COMP) -o tuxtype2 $(OBJs) $(LINKS)
tuxtype: $(OBJs)
gcc $(COMP) -o tuxtype $(OBJs) $(LINKS)
clean:
rm $(OBJs) tuxtype2 tuxtype2.exe
rm $(OBJs) tuxtype tuxtype.exe
scripting.o: scripting.c scripting.h $(Hs)
gcc -c $(COMP) $(INCLUDES) $(DEFINES) scripting.c
......
.cvsignore
Makefile
Makefile.in
SUBDIRS = fonts images scripts sounds themes words
SUBDIRS = images scripts sounds themes words
EXTRA_DIST = keyboard.lst
......
.cvsignore
Makefile
Makefile.in
......@@ -8,11 +8,9 @@ root directory of this archive). These images were created
either natively in the GIMP (http://www.gimp.org/) or were hand
drawn, scanned, and manipulated via the GIMP.
Tux was originally drawn by Larry Ewing
<ltlewing@isc.tamu.edu>. Certain images used in this game were
modified from his original Tux images found at
http://www.isc.tamu.edu/~lewing/linux/
Tux was originally drawn by Larry Ewing <ltlewing@isc.tamu.edu>.
Certain images used in this game were modified from his original
Tux images found at http://www.isc.tamu.edu/~lewing/linux/
The remainder of the images, are from a number of public domain
sources. Specifically, they are from the National Oceanic and
......@@ -51,15 +49,6 @@ wcas3_2.gif
wcas3_3.gif
wcas3_4.gif
The fonts used in this game (and in GIMP) were either
copyright-free public domain, Gnu GPL, or royalty free
fonts. They were largely obtained from the following sites
(truthfully, over the course of several years):
http://www.gimp.org/fonts.html
http://rufus.w3.org/linux/RPM/
http://www.1001freefonts.com/
I'm pretty sure that covers everything that may potentially
cause problems... but just in case I left something out, I can
assure you that any image used in this game was freely
......
.cvsignore
Makefile
Makefile.in
.cvsignore
Makefile
Makefile.in
tuxtype/data/images/title1.png

18.6 KB | W: | H:

tuxtype/data/images/title1.png

15.3 KB | W: | H:

tuxtype/data/images/title1.png
tuxtype/data/images/title1.png
tuxtype/data/images/title1.png
tuxtype/data/images/title1.png
  • 2-up
  • Swipe
  • Onion skin
.cvsignore
Makefile
Makefile.in
.cvsignore
Makefile
Makefile.in
......@@ -2,27 +2,25 @@
<page>
<img src="line2.png" x="5" y="0"></img>
<text size="6"></text>
<text size="18" align="center" color="#000000">Tuxtype2 Project Information Center</text>
<text size="18" align="center" color="#000000">Tuxtype Project Information Center</text>
<text size="6" align="center"></text>
<text size="14" align="center">Please visit one of the Tuxtype2 discussion forums at: </text>
<text size="14" align="center">Please visit one of the Tuxtype discussion forums at: </text>
<text size="16" align="center">http://tuxtype.sf.net/forums</text>
<text size="16" align="center">mailto://tuxtype-dev@tux4kids.net</text>
<text size="16" align="center">irc://freenode/tuxtype</text>
<text size="16" align="center">mailto://tuxtype-dev@tux4kids.net or irc://freenode/tuxtype</text>
<text size="6" align="center"></text>
<text size="16" align="center">Tuxtype2 is brought to you by the good people</text>
<text size="16" align="center">of tux4kids. http://tux4kids.com</text>
<text size="16" align="center">Tuxtype is brought to you by the good people of tux4kids. http://tux4kids.com</text>
<text size="6" align="center"></text>
<text size="16" align="center">Our development Server is located at http://tux4kids.net</text>
<text size="16" align="center">Our development Server is located at http://svn.tux4kids.net</text>
<text size="6" align="center"></text>
<text size="16" align="center">Tutype was the brainchild of Sam Hart of the Univ of Arizona. The current project</text>
<text size="16" align="center">Lead and maintainer is Jesse D. Andrews, hailing out of the Univ. of KY.</text>
<text size="16" align="center">Tutype was the brainchild of Sam Hart of the Univ of Arizona. It was then taken</text>
<text size="16" align="center">over by Jesse D. Andrews, from of the Univ. of KY.</text>
<text size="16" align="center">Many other people have contributed to Tuxtype please see the AUTHORS file.</text>
<text size="4" align="center"></text>
<text size="32" align="center" color="#ff003f">BUGS:</text>
<text size="16" align="center">Please report any bugs you find or any suggestions you have</text>
<text size="16" align="center">to any of the discussion forums listed above.</text>
<text size="4" align="center"></text>
<text size="22" align="center" color="#ff7f3f">Tuxtype2 is GPL licensed Free software.</text>
<text size="22" align="center" color="#ff7f3f">Tuxtype is GPL licensed Free software.</text>
<text size="22" align="center" color="#ff7f3f">Please see the COPYING file</text>
<text size="22" align="center" color="#000000">Hit SPACE to CONTINUE!!!</text>
<waitforinput/>
......
.cvsignore
Makefile
Makefile.in
......@@ -19,7 +19,6 @@ pop.wav\
run.wav\
shieldsdown.wav\
splat.wav\
tickle.wav\
tock.wav\
win.wav\
winfinal.wav\
......@@ -68,8 +67,6 @@ install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds
$(INSTALL_DATA) $(srcdir)/splat.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/splat.wav
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds
$(INSTALL_DATA) $(srcdir)/tickle.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tickle.wav
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds
$(INSTALL_DATA) $(srcdir)/tock.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tock.wav
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds
$(INSTALL_DATA) $(srcdir)/win.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/win.wav
......@@ -104,7 +101,6 @@ uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/run.wav
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/shieldsdown.wav
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/splat.wav
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tickle.wav
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tock.wav
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/win.wav
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/winfinal.wav
......
......@@ -8,6 +8,44 @@ this archive. Those files are:
excuseme.wav
bite.wav
run.wav
splat.wav
Sam got the following two files from a CD with copyright-free stuff
("they were sounds you could legally use to sample, remix, use
elsewhere, without having to get permission or any acknowledgement
back to the author"):
win.wav
winfinal.wav
The following files are taken from tuxmath and where made by
Bill Kendrick <bill@newbreedsoftware.com> - the files are also
place under the GPL:
explosion.wav -> also used in tuxmath
alarm.wav -> also used in tuxmath
buzz.wav -> also used in tuxmath
game.mod
game2.mod
game3.mod
laser.wav
lose.wav -> also used in tuxmath
pause.wav
pop.wav -> also used in tuxmath
shieldsdown.wav -> also used in tuxmath
tock.wav
tuxi.ogg
Problematic files:
click.wav -> no clue, maybe from kde
funkbrt.it -> from one of those sites
kmus1.wav -> from wavplace?.com (which is offline)
kmus2.wav -> from wavplace?.com (which is offline)
kmus3.wav -> from wavplace?.com (which is offline)
kmus4.wav -> from wavplace?.com (which is offline)
The remainder files were gathered from the following sources (I
tried out so many files that I forget where each specifically
......
.cvsignore
Makefile
Makefile.in
SUBDIRS = \
fonts\
images
EXTRA_DIST = lang.po
......
This diff is collapsed.
This diff is collapsed.
......@@ -14,140 +14,140 @@ msgstr ""
"X-Generator: KBabel 1.11\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: tuxtype2/tuxtype/pause.c:79
#: tuxtype/tuxtype/pause.c:79
msgid "Sound Effects Volume"
msgstr "Lydeffekter"
#: tuxtype2/tuxtype/pause.c:85
#: tuxtype/tuxtype/pause.c:85
msgid "Music Volume"
msgstr "Musikk"
#: tuxtype2/tuxtype/pause.c:93
#: tuxtype/tuxtype/pause.c:93
msgid "Sound & Music Disabled"
msgstr "Lyd og musikk avsltt"
#: tuxtype2/tuxtype/pause.c:100
#: tuxtype/tuxtype/pause.c:100
msgid "Paused!"
msgstr "Pause!"
#: tuxtype2/tuxtype/pause.c:106
#: tuxtype/tuxtype/pause.c:106
msgid "Press escape again to return to menu"
msgstr "Trykk Escape for g tilbake til hovedmenyen."
#: tuxtype2/tuxtype/pause.c:112
#: tuxtype/tuxtype/pause.c:112
msgid "Press space bar to return to game"
msgstr "Trykk mellomrom for g tilbake til spillet."
#: tuxtype2/tuxtype/playgame.c:295
#: tuxtype/tuxtype/playgame.c:295
msgid "Level"
msgstr "Niv"
#: tuxtype2/tuxtype/playgame.c:296
#: tuxtype/tuxtype/playgame.c:296
msgid "Lives"
msgstr "Liv"
#: tuxtype2/tuxtype/playgame.c:297
#: tuxtype/tuxtype/playgame.c:297
msgid "Fish"
msgstr "Fisk"
#: tuxtype2/tuxtype/playgame.c:299
#: tuxtype2/tuxtype/titlescreen.h:23
#: tuxtype/tuxtype/playgame.c:299
#: tuxtype/tuxtype/titlescreen.h:23
msgid "Easy"
msgstr "Lett"
#: tuxtype2/tuxtype/playgame.c:300
#: tuxtype2/tuxtype/titlescreen.h:24
#: tuxtype/tuxtype/playgame.c:300
#: tuxtype/tuxtype/titlescreen.h:24
msgid "Medium"
msgstr "Middels"
#: tuxtype2/tuxtype/playgame.c:301
#: tuxtype2/tuxtype/titlescreen.h:25
#: tuxtype/tuxtype/playgame.c:301
#: tuxtype/tuxtype/titlescreen.h:25
msgid "Hard"
msgstr "Vanskelig"
#: tuxtype2/tuxtype/playgame.c:302
#: tuxtype2/tuxtype/titlescreen.h:25
#: tuxtype/tuxtype/playgame.c:302
#: tuxtype/tuxtype/titlescreen.h:25
msgid "Practice"
msgstr "ving"
#: tuxtype2/tuxtype/playgame.c:313
#: tuxtype/tuxtype/playgame.c:313
msgid "Congratulations"
msgstr "Gratulerer!"
#: tuxtype2/tuxtype/playgame.c:317
#: tuxtype/tuxtype/playgame.c:317
msgid "Oh No!"
msgstr "Uff!"
#: tuxtype2/tuxtype/titlescreen.c:191
#: tuxtype/tuxtype/titlescreen.c:191
msgid "Work In Progress!"
msgstr "Uferdig!"
#: tuxtype2/tuxtype/titlescreen.c:192
#: tuxtype/tuxtype/titlescreen.c:192
msgid "This feature is not ready yet"
msgstr "Denne funksjonen er ikke klar enn."
#: tuxtype2/tuxtype/titlescreen.c:193
#: tuxtype/tuxtype/titlescreen.c:193
msgid "Discuss the future of TuxTyping at"
msgstr "Diskuter neste versjon av Tux Typing p"
#: tuxtype2/tuxtype/titlescreen.c:735
#: tuxtype2/tuxtype/titlescreen.c:736
#: tuxtype/tuxtype/titlescreen.c:735
#: tuxtype/tuxtype/titlescreen.c:736
msgid "Alphabet"
msgstr "Alfabetet"
#: tuxtype2/tuxtype/titlescreen.h:23
#: tuxtype/tuxtype/titlescreen.h:23
msgid "Fish Cascade"
msgstr "Fiskefall"
#: tuxtype2/tuxtype/titlescreen.h:23
#: tuxtype/tuxtype/titlescreen.h:23
msgid "Space Cadet"
msgstr "Nybegynner"
#: tuxtype2/tuxtype/titlescreen.h:23
#: tuxtype/tuxtype/titlescreen.h:23
msgid "Edit Word Lists"
msgstr "Rediger ordliste"
#: tuxtype2/tuxtype/titlescreen.h:24
#: tuxtype/tuxtype/titlescreen.h:24
msgid "Comet Zap"
msgstr "Kometknusing"
#: tuxtype2/tuxtype/titlescreen.h:24
#: tuxtype/tuxtype/titlescreen.h:24
msgid "Pilot"
msgstr "Erfaren"
#: tuxtype2/tuxtype/titlescreen.h:24
#: tuxtype/tuxtype/titlescreen.h:24
msgid "Lessons"
msgstr "Opplring"
#: tuxtype2/tuxtype/titlescreen.h:25
#: tuxtype/tuxtype/titlescreen.h:25
msgid "Ace"
msgstr "Profesjonell"
#: tuxtype2/tuxtype/titlescreen.h:25
#: tuxtype/tuxtype/titlescreen.h:25
msgid "Project Info"
msgstr "Prosjektinfo"
#: tuxtype2/tuxtype/titlescreen.h:26
#: tuxtype/tuxtype/titlescreen.h:26
msgid "Options"
msgstr "Oppsett"
#: tuxtype2/tuxtype/titlescreen.h:26
#: tuxtype/tuxtype/titlescreen.h:26
msgid "Instructions"
msgstr "Hjelp"
#: tuxtype2/tuxtype/titlescreen.h:26
#: tuxtype/tuxtype/titlescreen.h:26
msgid "Commander"
msgstr "Ekspert"
#: tuxtype2/tuxtype/titlescreen.h:26
#: tuxtype/tuxtype/titlescreen.h:26
msgid "Setup Language"
msgstr "Sprk"
#: tuxtype2/tuxtype/titlescreen.h:27
#: tuxtype/tuxtype/titlescreen.h:27
msgid "Quit"
msgstr "Avslutt"
#: tuxtype2/tuxtype/titlescreen.h:27
#: tuxtype/tuxtype/titlescreen.h:27
msgid "Main Menu"
msgstr "Hovedmeny"
This diff is collapsed.
.cvsignore
Makefile
Makefile.in
.cvsignore
Makefile
Makefile.in
SUBDIRS = \
fonts\
words
EXTRA_DIST = keyboard.lst lang.po
......