[Tux4kids-commits] r1550 - in tuxtype/trunk: data/images data/words doc

Wed Sep 23 21:11:11 UTC 2009

Author: secretlondon-guest
Date: 2009-09-23 21:11:11 +0000 (Wed, 23 Sep 2009)
New Revision: 1550

Added:
   tuxtype/trunk/data/words/fruit.txt
   tuxtype/trunk/data/words/numbers.txt
   tuxtype/trunk/data/words/shapes.txt
Modified:
   tuxtype/trunk/data/images/README_IMAGES.TXT
   tuxtype/trunk/data/words/Makefile.am
   tuxtype/trunk/data/words/colors.txt
   tuxtype/trunk/doc/AUTHORS
   tuxtype/trunk/doc/TODO
Log:
Tidied up images docs, rem 9 letter words (game is 8 max) from colors
and added 3 new word lists.


Modified: tuxtype/trunk/data/images/README_IMAGES.TXT
===================================================================

--- tuxtype/trunk/data/images/README_IMAGES.TXT	2009-09-21 22:50:59 UTC (rev 1549)
+++ tuxtype/trunk/data/images/README_IMAGES.TXT	2009-09-23 21:11:11 UTC (rev 1550)
@@ -12,43 +12,8 @@
 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
-Atmospheric Administration (NOAA) and the U.S. Fish and Wildlife
-Service (FWS). The archives for these services were accessed
-through the GIMP-Savvy web-site at
+The remainder of the images are featured images from Wikimedia Commons. 
 
-http://gimp-savvy.com/PHOTO-ARCHIVE/
-
-Those images which were obtained from either of these US
-government agencies were:
-
-kcas1_1.gif
-kcas1_2.gif
-kcas1_3.gif
-kcas1_4.gif
-kcas2_1.gif
-kcas2_2.gif
-kcas2_3.gif
-kcas2_4.gif
-kcas3_1.gif
-kcas3_2.gif
-kcas3_3.gif
-kcas3_4.gif
-
-wcas1_1.gif
-wcas1_2.gif
-wcas1_3.gif
-wcas1_4.gif
-wcas2_1.gif
-wcas2_2.gif
-wcas2_3.gif
-wcas2_4.gif
-wcas3_1.gif
-wcas3_2.gif
-wcas3_3.gif
-wcas3_4.gif
-
 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

Modified: tuxtype/trunk/data/words/Makefile.am
===================================================================
--- tuxtype/trunk/data/words/Makefile.am	2009-09-21 22:50:59 UTC (rev 1549)
+++ tuxtype/trunk/data/words/Makefile.am	2009-09-23 21:11:11 UTC (rev 1550)
@@ -8,7 +8,10 @@
   astronomy.txt \
   colors.txt \
   fingers.txt \
+  fruit.txt \
+  numbers.txt \
   plants.txt \
+  shapes.txt \
   words1.txt \
   words2.txt \
   words3.txt

Modified: tuxtype/trunk/data/words/colors.txt
===================================================================
--- tuxtype/trunk/data/words/colors.txt	2009-09-21 22:50:59 UTC (rev 1549)
+++ tuxtype/trunk/data/words/colors.txt	2009-09-23 21:11:11 UTC (rev 1550)
@@ -19,6 +19,4 @@
 INDIGO
 MAGENTA
 LAVENDER
-CHOCOLATE
-TURQUOISE
 

Added: tuxtype/trunk/data/words/fruit.txt
===================================================================
--- tuxtype/trunk/data/words/fruit.txt	                        (rev 0)
+++ tuxtype/trunk/data/words/fruit.txt	2009-09-23 21:11:11 UTC (rev 1550)
@@ -0,0 +1,12 @@
+Fruit
+APPLE
+ORANGE
+PEAR
+LEMON
+LIME
+KUMQUAT
+GRAPE
+BANANA
+MELON
+SATSUMA
+

Added: tuxtype/trunk/data/words/numbers.txt
===================================================================
--- tuxtype/trunk/data/words/numbers.txt	                        (rev 0)
+++ tuxtype/trunk/data/words/numbers.txt	2009-09-23 21:11:11 UTC (rev 1550)
@@ -0,0 +1,29 @@
+Numbers
+ONE
+TWO
+THREE
+FOUR
+FIVE
+SIX
+SEVEN
+EIGHT
+NINE
+TEN
+ELEVEN
+TWELVE
+THIRTEEN
+FOURTEEN
+FIFTEEN
+SIXTEEN
+SEVENTEEN
+EIGHTEEN
+NINETEEN
+TWENTY
+THIRTY
+FORTY
+FIFTY
+SIXTY
+SEVENTY
+EIGHTY
+NINETY
+HUNDRED

Added: tuxtype/trunk/data/words/shapes.txt
===================================================================
--- tuxtype/trunk/data/words/shapes.txt	                        (rev 0)
+++ tuxtype/trunk/data/words/shapes.txt	2009-09-23 21:11:11 UTC (rev 1550)
@@ -0,0 +1,12 @@
+Shapes
+BOX
+CUBE
+OVAL
+MOON
+SQUARE
+CIRCLE
+TRIANGLE
+RHOMBUS
+ROUND
+PYRAMID
+

Modified: tuxtype/trunk/doc/AUTHORS
===================================================================
--- tuxtype/trunk/doc/AUTHORS	2009-09-21 22:50:59 UTC (rev 1549)
+++ tuxtype/trunk/doc/AUTHORS	2009-09-23 21:11:11 UTC (rev 1550)
@@ -37,24 +37,21 @@
 Lake Fryxell, Antarctica by US National Science Foundation. Public domain.
 Fortesque Bay, Tasmania by Wikipedia user Noodle snacks. Licensed under Creative Commons Attribution ShareAlike 3.0.
 Fossil Bay, Tasmania by Wikipedia user Noodle snacks. Licensed under Creative Commons Attribution ShareAlike 3.0.
-Champagne Pool, Wai-O-Tapu thermal wonderland, New Zealand by Christian Mehlführer. Licensed under Creative Commons Attribution 2.5 only (*) but cropped.
+Champagne Pool, Wai-O-Tapu thermal wonderland, New Zealand by Christian Mehlführer. Derivative work re-licensed under Creative Commons Attribution 3.0.
 Peyto Lake, Banff National Park, Canada by Tobias Alt. Licensed under Creative Commons Attribution ShareAlike 3.0.
 Anse Source d'Argent, Seychelles by Tobias Alt. Licensed under Creative Commons Attribution ShareAlike 3.0.
 Terrace rice fields in Yunnan Province, China by Jialiang Gao. Licensed under Creative Commons Attribution 3.0.
 Chýnov's cave, Czech Republic by Wikipedia user Chmee2. Licensed under Creative Commons Attribution ShareAlike 3.0.
 Nunâ island, Greenland by Kim Hansen. Licensed under Creative Commons Attribution 3.0.
 Popocatépetl, Mexico by Jakub Hejtmánek. Licensed under Creative Commons Attribution ShareAlike 3.0.
-Perito Moreno Glacier by Luca Galuzzi http://www.galuzzi.it. Licensed under Creative Commons Attribution ShareAlike 2.5 (*) but cropped.
-Iceberg in Lago Argentina by Ilya Haykinson. Licensed under Creative Commons Attribution 2.0 (*) but cropped.
+Perito Moreno Glacier by Luca Galuzzi http://www.galuzzi.it. Derivative work re-licensed under Creative Commons Attribution 3.0.
+Iceberg in Lago Argentina by Ilya Haykinson. Derivative work re-licensed under Creative Commons Attribution 3.0.
 Helix Nebula by Nasa. Public domain.
 Spiral galaxy NGC 1672 by Nasa. Public domain.
 Sombrero galaxy M104 by Nasa. Public domain.
 Saturn eclipse by Nasa. Public domain.
 Martian sunset by Nasa. Public domain.
 
-(*) DFSG non-free
-
-
 Special thanks to:
 ------------------
 Rich Bellamy <bellamrm at clarkson.edu> - (for several image patches)

Modified: tuxtype/trunk/doc/TODO
===================================================================
--- tuxtype/trunk/doc/TODO	2009-09-21 22:50:59 UTC (rev 1549)
+++ tuxtype/trunk/doc/TODO	2009-09-23 21:11:11 UTC (rev 1550)
@@ -15,7 +15,7 @@
 
 As you can see, the ideas are similar for both programs.
 
-Apart from GSoC, both programs need ongoing code cleanup, especially tuxtype.  Also, tuxtype could benefit greatly at this point from a refresh of things other than the C code itself - high-resolution backgrounds, completion of rest of menu sprite icons, more word lists and phrase files, etc. 
+Apart from GSoC, both programs need ongoing code cleanup, especially tuxtype.  Also, tuxtype could benefit greatly at this point from a refresh of things other than the C code itself - completion of rest of menu sprite icons, more word lists and phrase files, etc. 
 
 -check that SVN is free of generated files. create release-script, 
 


