[Pingus-CVS] r2556 - in trunk/data: data demos images levels music sounds

[jave27]

Author: jave27
Date: 2005-12-11 01:13:52 +0100 (Sun, 11 Dec 2005)
New Revision: 2556

Modified:
   trunk/data/data/Makefile.am
   trunk/data/demos/Makefile.am
   trunk/data/images/Makefile.am
   trunk/data/levels/Makefile.am
   trunk/data/music/Makefile.am
   trunk/data/sounds/Makefile.am
Log:
Applied Tom?\195?\161?\197?\161 Bl?\195?\161ha's Makefile patch.


Modified: trunk/data/data/Makefile.am
===================================================================
--- trunk/data/data/Makefile.am 2005-12-09 20:26:59 UTC (rev 2555)
+++ trunk/data/data/Makefile.am 2005-12-11 00:13:52 UTC (rev 2556)
@@ -26,6 +26,7 @@
 particles.xml \
 alias.xml     \
 fonts.xml     \
+editor.xml    \
 entrances.xml \
 traps.xml     \
 game.xml      \

Modified: trunk/data/demos/Makefile.am
===================================================================
--- trunk/data/demos/Makefile.am        2005-12-09 20:26:59 UTC (rev 2555)
+++ trunk/data/demos/Makefile.am        2005-12-11 00:13:52 UTC (rev 2556)
@@ -17,6 +17,7 @@
 
 pkgdatadir = $(datadir)/games/@PACKAGE@/demos
 
-pkgdata_DATA = level1.pde
+pkgdata_DATA = level1.pde \
+Dentist-20021013-172617.xml
 
 EXTRA_DIST = $(pkgdata_DATA)

Modified: trunk/data/images/Makefile.am
===================================================================
--- trunk/data/images/Makefile.am       2005-12-09 20:26:59 UTC (rev 2555)
+++ trunk/data/images/Makefile.am       2005-12-11 00:13:52 UTC (rev 2556)
@@ -63,12 +63,14 @@
 core/editor/zoom-out.png \
 core/menu/create_on.png \
 core/menu/credits_on.png \
+core/menu/default_level.jpg \
 core/menu/down_arrow.png \
 core/menu/exit_button_hover.png \
 core/menu/exit_button_normal.png \
 core/menu/exit_button_pressed.png \
 core/menu/exit_menu.png \
 core/menu/exit_on.png \
+core/menu/filedialog.png \
 core/menu/folder.png \
 core/menu/layer1.png \
 core/menu/layer2.png \
@@ -161,10 +163,16 @@
 exits/sweetexit.png \
 fonts/chalk_large.png \
 fonts/chalk_large-iso-8859-1.png \
+fonts/chalk_large-iso-8859-2.png \
+fonts/chalk_large-iso-8859-9.png \
 fonts/chalk_normal.png \
 fonts/chalk_normal-iso-8859-1.png \
+fonts/chalk_normal-iso-8859-2.png \
+fonts/chalk_normal-iso-8859-9.png \
 fonts/chalk_small.png \
 fonts/chalk_small-iso-8859-1.png \
+fonts/chalk_small-iso-8859-2.png \
+fonts/chalk_small-iso-8859-9.png \
 fonts/courier_small2.png \
 fonts/number_fnt.png \
 fonts/pingus2.png \
@@ -595,11 +603,24 @@
 gui/checkbox_unchecked.png \
 gui/checkbox_unchecked_disabled.png \
 gui/font_black.png \
+gui/font_black.tga \
 gui/font_gray.png \
+gui/font_gray.tga \
+gui/font_white.tga \
 gui/radiobutton_checked.png \
 gui/radiobutton_checked_disabled.png \
 gui/radiobutton_unchecked.png \
 gui/radiobutton_unchecked_disabled.png \
+gui/radiobutton/checked_disabled.tga \
+gui/radiobutton/checked.tga \
+gui/radiobutton/unchecked_disabled.tga \
+gui/radiobutton/unchecked.tga \
+gui/checkbox/checked_disabled.tga \
+gui/checkbox/checked.tga \
+gui/checkbox/unchecked_disabled.tga \
+gui/checkbox/unchecked.tga \
+gui/fonts/font_black.tga \
+gui/fonts/font_gray.tga \
 hotspots/desert/bigdimwall.png \
 hotspots/desert/mediumdimwall.png \
 hotspots/desert/mediumegyptpic.png \
@@ -857,8 +878,7 @@
 worldobjs/switchdoor_tile_cmap.png \
 worldobjs/teleporter.png \
 worldobjs/teleporter2.png \
-worldobjs/teleportertarget.png \
-gui/font_black.tga gui/font_white.tga gui/font_gray.tga
+worldobjs/teleportertarget.png
 
 EXTRA_DIST = $(nobase_pkgdata_DATA)
 

Modified: trunk/data/levels/Makefile.am
===================================================================
--- trunk/data/levels/Makefile.am       2005-12-09 20:26:59 UTC (rev 2555)
+++ trunk/data/levels/Makefile.am       2005-12-11 00:13:52 UTC (rev 2556)
@@ -23,6 +23,8 @@
 nobase_pkgdata_DATA = \
        $(wildcard tutorial/*.pingus) \
         $(wildcard playable/*.pingus) \
+        $(wildcard volcano/*.pingus) \
+        $(wildcard multiplayer/*.pingus) \
         $(wildcard wip/*.pingus)      \
         $(wildcard test/*.pingus)
 

Modified: trunk/data/music/Makefile.am
===================================================================
--- trunk/data/music/Makefile.am        2005-12-09 20:26:59 UTC (rev 2555)
+++ trunk/data/music/Makefile.am        2005-12-11 00:13:52 UTC (rev 2556)
@@ -20,7 +20,16 @@
 gd-ite.it          pingus-1.it  pingus-6.it  success_1.it \
 README      gd-matth.it    pingus-2.it  pingus-7.it  success_2.it \
 gd-myla.it     pingus-3.it  pingus-8.it  the_big_march_in_space.it \
-gd-cancn.it  goin_march.it  pingus-4.it  pingus-9.it
+gd-cancn.it  goin_march.it  pingus-4.it  pingus-9.it \
+404light.ogg \
+orchfunk.ogg \
+hotloop.ogg \
+walkhappy.ogg \
+slowmood.ogg \
+loosetech.ogg \
+happydance.ogg \
+happyfree.ogg
+
 pkgdata_DATA = $(EXTRA_DIST)
 
 # EOF #
\ No newline at end of file

Modified: trunk/data/sounds/Makefile.am
===================================================================
--- trunk/data/sounds/Makefile.am       2005-12-09 20:26:59 UTC (rev 2555)
+++ trunk/data/sounds/Makefile.am       2005-12-11 00:13:52 UTC (rev 2556)
@@ -17,7 +17,8 @@
 
 pkgdatadir = $(datadir)/games/@PACKAGE@/sounds
 EXTRA_DIST = chink.wav   goodidea.wav  plop.wav   splash.wav  ting.wav \
-             digger.wav  ohno.wav        plop2.wav  tick.wav    yipee.wav
+             digger.wav  ohno.wav        plop2.wav  tick.wav    yipee.wav \
+             letsgo.wav
 pkgdata_DATA = $(EXTRA_DIST)
 
 # EOF #
\ No newline at end of file