Merge branch 'rel_0.3.0'

phtrivier · Apr 18, 2010 · d1818a3 · d1818a3
2 parents 55e7abb + 5aeaf61
commit d1818a3
Show file tree

Hide file tree

Showing 215 changed files with 1,479 additions and 434 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,4 +42,6 @@ ube-*.*
 sandbox/*
 semantic.cache
 *.bak
-doc/muse/*.pdf
+doc/muse/*.pdf
+
+*.*.orig
diff --git a/Makefile.am b/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = po src data
 ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST=include lib COPYING
+EXTRA_DIST=include lib COPYING RELEASES.txt
diff --git a/RELEASES.txt b/RELEASES.txt
@@ -1,4 +1,13 @@
-*  27/03/2010 0.2.1 'Sidaction' (http://www.sidaction.org)
+* 18/04/2010 0.3.0 'St Perfectus' (http://en.wikipedia.org/wiki/Perfectus)
+
+ - Lots of UI modifications
+ - Added french translation of the puzzle names
+ - Available moves can be toggled with 'Tab'
+ - Added a few puzzles
+ - Fixed help message
+ - Refactored build system to allow cross-compilation without lua in the sources
+
+* 27/03/2010 0.2.1 'Sidaction' (http://www.sidaction.org)
 
  - Lua included in the build
 

diff --git a/config.h.in b/config.h.in
@@ -25,6 +25,9 @@
 /* Define if you have the iconv() function and it works. */
 #undef HAVE_ICONV
 
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
 /* Define to 1 if you have the `popt' library (-lpopt). */
 #undef HAVE_LIBPOPT
 
@@ -37,6 +40,36 @@
 /* Define to 1 if you have the `SDL_ttf' library (-lSDL_ttf). */
 #undef HAVE_LIBSDL_TTF
 
+/* Define to 1 if you have the <lualib.h> header file. */
+#undef HAVE_LUALIB_H
+
+/* Define to 1 if you have the <lua.h> header file. */
+#undef HAVE_LUA_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
 /* Name of package */
 #undef PACKAGE
 
@@ -58,5 +91,8 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
 /* Version number of package */
 #undef VERSION
diff --git a/configure.ac b/configure.ac
@@ -5,6 +5,15 @@ AM_GNU_GETTEXT_VERSION([0.17])
 AC_PROG_CXX
 AC_PROG_RANLIB
 
+AC_ARG_ENABLE([mingw],
+[ --enable-mingw     Makes it possible to cross compile with mingw-cross-env ],
+[case "${enableval}" in
+  yes) mingw=true ;;
+  no) mingw=false ;;
+  *) mingw=false;;
+esac],[mingw=false])
+AM_CONDITIONAL([MINGW], [test x$mingw = xtrue])
+
 PKG_CHECK_MODULES([SDL], [sdl >= 1.2.13])
 
 PKG_CHECK_EXISTS([SDL_image], [PKG_CHECK_MODULES([SDL_image], [SDL_image >= 1.2])], [AC_CHECK_LIB(SDL_image, IMG_LoadPNG_RW,,AC_MSG_ERROR([*** Unable to find SDL_image libary]))])
@@ -17,22 +26,36 @@ AC_CHECK_LIB([popt], [poptGetContext], , AC_MSG_WARN([Could not find popt lib]))
 
 AX_BOOST_BASE([1.34])
 
+AM_COND_IF([MINGW], [
+AX_LUA_HEADERS
+AX_LUA_LIBS],
+[])
+
 AC_CONFIG_HEADERS([config.h])
+
 AC_CONFIG_FILES([ 
 	Makefile
    	src/Makefile
-	src/lua/Makefile
 	src/common/Makefile
    	src/engine/Makefile
    	src/mvc/Makefile
    	src/client/Makefile
 	po/Makefile.in
 	data/Makefile
 	data/images/Makefile
+	data/images/png/Makefile
 	data/fonts/Makefile
 	data/ogg/Makefile
 	data/lua/Makefile
 	data/lua/puzzles/Makefile
+	data/pixmaps/Makefile
+	data/applications/Makefile
 ])
+
+AM_COND_IF([MINGW],[],
+[
+  AC_CONFIG_FILES([src/lua/Makefile])
+])
+
 AC_OUTPUT
 
diff --git a/data/Makefile.am b/data/Makefile.am
@@ -1 +1,2 @@
-SUBDIRS=images fonts ogg lua
+SUBDIRS=images fonts ogg lua pixmaps applications
+
diff --git a/data/applications/Makefile.am b/data/applications/Makefile.am
@@ -0,0 +1,5 @@
+applicationsdir=${datadir}/applications
+
+applications_DATA=ube.desktop
+
+EXTRA_DIST=${applications_DATA}
diff --git a/data/applications/ube.desktop b/data/applications/ube.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Ube
+Comment=A puzzle game based on movement
+Comment[fr]=Un casse-tête basé sur le déplacement
+Exec=ube
+Terminal=false
+Icon=ube32x32.xpm
+Type=Application
+Categories=Game;LogicGame;
diff --git a/data/images/Makefile.am b/data/images/Makefile.am
@@ -1,12 +1,11 @@
 imagesdir=${datadir}/@PACKAGE@/images
 
-images_DATA=cell_0.png cell_1.png cell_2.png cell_3.png \
-	selected_cell.png player.png \
-	move_0.png move_1.png move_2.png \
-	overlay_move_0.png overlay_move_1.png overlay_move_2.png \
-	path_0.png path_1.png path_2.png \
-	banned_cell.png \
+# Note : ideally, this list should be empty in the long term, 
+# and every image should be loaded from png ... 
+images_DATA=selected_cell.png \
 	undo.png redo.png disabled_undo.png disabled_redo.png \
-	bg.png
+	bg.png bg_puzzle_selection.png
+
+SUBDIRS=png
 
 EXTRA_DIST=${images_DATA}
diff --git a/data/images/banned_cell.png b/data/images/banned_cell.png
diff --git a/data/images/bg_puzzle_selection.png b/data/images/bg_puzzle_selection.png
diff --git a/data/images/bg_puzzle_selection.xcf b/data/images/bg_puzzle_selection.xcf
diff --git a/data/images/cell1.png b/data/images/cell1.png
diff --git a/data/images/cell2.png b/data/images/cell2.png
diff --git a/data/images/cell3.png b/data/images/cell3.png
diff --git a/data/images/cell4.png b/data/images/cell4.png
diff --git a/data/images/cell5.png b/data/images/cell5.png
diff --git a/data/images/cell6.png b/data/images/cell6.png
diff --git a/data/images/cell7.png b/data/images/cell7.png
diff --git a/data/images/cell_0.png b/data/images/cell_0.png
diff --git a/data/images/cell_1.png b/data/images/cell_1.png
diff --git a/data/images/cell_2.png b/data/images/cell_2.png
diff --git a/data/images/cell_3.png b/data/images/cell_3.png
diff --git a/data/images/gnu.png b/data/images/gnu.png
diff --git a/data/images/move_0.png b/data/images/move_0.png
diff --git a/data/images/move_0.xcf b/data/images/move_0.xcf
diff --git a/data/images/move_1.png b/data/images/move_1.png
diff --git a/data/images/move_2.png b/data/images/move_2.png
diff --git a/data/images/overlay_move_0.png b/data/images/overlay_move_0.png
diff --git a/data/images/overlay_move_1.png b/data/images/overlay_move_1.png
diff --git a/data/images/overlay_move_2.png b/data/images/overlay_move_2.png
diff --git a/data/images/path_0.png b/data/images/path_0.png
diff --git a/data/images/path_0.xcf b/data/images/path_0.xcf
diff --git a/data/images/path_1.png b/data/images/path_1.png
diff --git a/data/images/path_1.xcf b/data/images/path_1.xcf
diff --git a/data/images/path_2.png b/data/images/path_2.png
diff --git a/data/images/path_2.xcf b/data/images/path_2.xcf
diff --git a/data/images/player.png b/data/images/player.png
diff --git a/data/images/png/Makefile.am b/data/images/png/Makefile.am
@@ -0,0 +1,11 @@
+#TODO : is there a way to share this variable from top level Makefile.am ? 
+imagesdir=${datadir}/@PACKAGE@/images
+
+pngsdir=${imagesdir}/png
+
+pngs_DATA=cell_0.png cell_1.png cell_2.png cell_3.png \
+	path_0.png move_0.png move_0_grayed.png overlay_move_0.png \
+	path_1.png move_1.png move_1_grayed.png overlay_move_1.png \
+	player.png banned_cell.png
+
+EXTRA_DIST=${pngs_DATA}
diff --git a/data/images/png/banned_cell.png b/data/images/png/banned_cell.png
diff --git a/data/images/png/cell_0.png b/data/images/png/cell_0.png
diff --git a/data/images/png/cell_1.png b/data/images/png/cell_1.png
diff --git a/data/images/png/cell_2.png b/data/images/png/cell_2.png
diff --git a/data/images/png/cell_3.png b/data/images/png/cell_3.png
diff --git a/data/images/png/move_0.png b/data/images/png/move_0.png
diff --git a/data/images/png/move_0_grayed.png b/data/images/png/move_0_grayed.png
diff --git a/data/images/png/move_1.png b/data/images/png/move_1.png
diff --git a/data/images/png/move_1_grayed.png b/data/images/png/move_1_grayed.png
diff --git a/data/images/png/overlay_move_0.png b/data/images/png/overlay_move_0.png
diff --git a/data/images/png/overlay_move_1.png b/data/images/png/overlay_move_1.png
diff --git a/data/images/png/path_0.png b/data/images/png/path_0.png
diff --git a/data/images/png/path_1.png b/data/images/png/path_1.png
diff --git a/data/images/png/player.png b/data/images/png/player.png
diff --git a/data/images/xcf/banned_cell.xcf b/data/images/xcf/banned_cell.xcf
diff --git a/data/images/xcf/banned_cell_bak.xcf b/data/images/xcf/banned_cell_bak.xcf
diff --git a/data/images/xcf/banned_cell_modern.xcf b/data/images/xcf/banned_cell_modern.xcf
diff --git a/data/images/xcf/cell_0.xcf b/data/images/xcf/cell_0.xcf
diff --git a/data/images/xcf/cell_1.xcf b/data/images/xcf/cell_1.xcf
diff --git a/data/images/xcf/cell_2.xcf b/data/images/xcf/cell_2.xcf
diff --git a/data/images/xcf/cell_3.xcf b/data/images/xcf/cell_3.xcf
diff --git a/data/images/move_2.xcf → data/images/xcf/move_0.xcf b/data/images/move_2.xcf → data/images/xcf/move_0.xcf
diff --git a/data/images/xcf/move_0_grayed.xcf b/data/images/xcf/move_0_grayed.xcf
diff --git a/data/images/move_1.xcf → data/images/xcf/move_1.xcf b/data/images/move_1.xcf → data/images/xcf/move_1.xcf
diff --git a/data/images/xcf/move_1_grayed.xcf b/data/images/xcf/move_1_grayed.xcf
diff --git a/data/images/xcf/overlay_move_0.xcf b/data/images/xcf/overlay_move_0.xcf
diff --git a/data/images/xcf/overlay_move_1.xcf b/data/images/xcf/overlay_move_1.xcf
diff --git a/data/images/xcf/path_0.xcf b/data/images/xcf/path_0.xcf
diff --git a/data/images/xcf/path_1.xcf b/data/images/xcf/path_1.xcf
diff --git a/data/images/xcf/player.xcf b/data/images/xcf/player.xcf
diff --git a/data/lua/puzzles/Makefile.am b/data/lua/puzzles/Makefile.am
@@ -1,5 +1,4 @@
 puzzlesdir=${datadir}/@PACKAGE@/lua/puzzles
-puzzles_DATA=puzzle1.lua puzzle2.lua puzzle3.lua \
-	tutorial0.lua tutorial0a.lua tutorial1.lua tutorial2.lua \
-	tutorial3.lua tutorial4.lua
-EXTRA_DIST=${puzzles_DATA}
+dist_puzzles_DATA=tutorial0.lua tutorial1.lua tutorial2.lua \
+	tutorial3.lua tutorial4.lua tutorial5.lua \
+	tutorial6.lua tutorial7.lua
diff --git a/data/lua/puzzles/puzzle1.lua b/data/lua/puzzles/puzzle1.lua
diff --git a/data/lua/puzzles/puzzle2.lua b/data/lua/puzzles/puzzle2.lua
diff --git a/data/lua/puzzles/puzzle3.lua b/data/lua/puzzles/puzzle3.lua
diff --git a/data/lua/puzzles/template.lua b/data/lua/puzzles/template.lua
@@ -1,6 +1,4 @@
 -- First puzzle to load in the game
-set_puzzle_dimensions(22,11)
-
 set_puzzle_rows({"I#####################",
 		 "######################",
 		 "######################",

diff --git a/data/lua/puzzles/tutorial0.lua b/data/lua/puzzles/tutorial0.lua
@@ -1,16 +1,14 @@
 -- First puzzle to load in the game
-set_puzzle_dimensions(22,11)
-
-set_puzzle_rows({"I----------###########",
-		 "-----------###########",
-		 "-----------###########",
-		 "-----------###########",
-		 "------------##########",
-		 "##########------------",
-		 "###########-----------",
-		 "###########-----------",
-		 "###########-----------",
-		 "###########-----------",
-		 "###########----------O"})
+set_puzzle_rows({"######################",
+		 "######################",
+		 "######################",
+		 "##-----########-----##",
+		 "#-------######-------#",
+		 "#---I------------O---#",
+		 "#-------######-------#",
+		 "##-----########-----##",
+		 "######################",
+		 "######################",
+		 "######################"})
 
 set_puzzle_moves({Move.SINGLE})
diff --git a/data/lua/puzzles/tutorial0a.lua b/data/lua/puzzles/tutorial0a.lua
diff --git a/data/lua/puzzles/tutorial1.lua b/data/lua/puzzles/tutorial1.lua
@@ -1,16 +1,14 @@
 -- First puzzle to load in the game
-set_puzzle_dimensions(22,11)
-
 set_puzzle_rows({"I----------###########",
-		 "-----------###########",
-		 "-----------###########",
-		 "----------------------",
-		 "----------############",
-		 "#########-#-----------",
-		 "#########-#-----------",
-		 "#########-#-----------",
-		 "#########-#-----------",
-		 "#########-#---------O-",
-		 "#########-#-----------"})
+		 "##########-###########",
+		 "#########---##########",
+		 "######################",
+		 "######---------#####O#",
+		 "####################-#",
+		 "##########-#######-#-#",
+		 "######################",
+		 "########-----#####-###",
+		 "######################",
+		 "##########-#-#-#-#-###"})
 
-set_puzzle_moves({Move.SINGLE, Move.SINGLE, Move.DOUBLE})
+set_puzzle_moves({Move.SINGLE, Move.DOUBLE})
diff --git a/data/lua/puzzles/tutorial2.lua b/data/lua/puzzles/tutorial2.lua
@@ -1,16 +1,14 @@
 -- First puzzle to load in the game
-set_puzzle_dimensions(22,11)
+set_puzzle_rows({"----------############",
+		 "-I---------###########",
+		 "--------------------##",
+		 "----------------------",
+		 "#---------############",
+		 "########--#-----------",
+		 "########--#-----------",
+		 "########--#-----------",
+		 "########--#-----------",
+		 "########--#---------O-",
+		 "#########-#-----------"})
 
-set_puzzle_rows({"I-###########----#####",
-		 "----------###-------##",
-		 "##--#########----##-##",
-		 "###-#-----#########-##",
-		 "###-#-----------###-##",
-		 "###-#-----#########-##",
-		 "###-###-#####----##-##",
-		 "###-###----------##-##",
-		 "###-###-#####----##-##",
-		 "###-###-###########-##",
-		 "###-----###########--O"})
-
-set_puzzle_moves({Move.DOUBLE, Move.SINGLE, Move.SINGLE })
+set_puzzle_moves({Move.SINGLE, Move.SINGLE, Move.DOUBLE})