Merge pull request #573 from fdelapena/master

Version 0.3.1
EasyRPG · Sep 7, 2015 · 9e6a28c · 9e6a28c
2 parents 57bd674 + 7c47668
commit 9e6a28c
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -160,7 +160,7 @@ set(MAN_NAME easyrpg-player.6)
 find_program(A2X_EXECUTABLE NAMES a2x a2x.py)
 if(NOT A2X_EXECUTABLE STREQUAL "A2X_EXECUTABLE-NOTFOUND")
   add_custom_command(OUTPUT builds/${MAN_NAME}
-    COMMAND ${A2X_EXECUTABLE} -a player_version="0.3" -f manpage -D ${CMAKE_CURRENT_BINARY_DIR}/builds ${CMAKE_CURRENT_SOURCE_DIR}/builds/${MAN_NAME}.adoc
+    COMMAND ${A2X_EXECUTABLE} -a player_version="0.3.1" -f manpage -D ${CMAKE_CURRENT_BINARY_DIR}/builds ${CMAKE_CURRENT_SOURCE_DIR}/builds/${MAN_NAME}.adoc
     DEPENDS builds/${MAN_NAME}.adoc
     COMMENT "(Re-)building manpage ${MAN_NAME}"
     VERBATIM)
@@ -197,7 +197,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 endif()
 
 set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
-set(CPACK_PACKAGE_VERSION "0.3")
+set(CPACK_PACKAGE_VERSION "0.3.1")
 set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/resources/player.ico")
 set(CPACK_RESOURCE_FILE_README ${CMAKE_CURRENT_SOURCE_DIR}/README)
 

diff --git a/README b/README
@@ -62,11 +62,11 @@ Building
 
   1. Unpack the tarball with:
 
-    tar xf easyrpg-player-0.3.tar.xz
+    tar xf easyrpg-player-0.3.1.tar.xz
 
   2. Enter in the package directory with:
 
-    cd easyrpg-player-0.3
+    cd easyrpg-player-0.3.1
 
   3. Compile with:
 

diff --git a/builds/android/res/values-es/strings.xml b/builds/android/res/values-es/strings.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">EasyRPG Player</string>
+	<string name="toggle_fps">Ver/ocultar FPS</string>
+	<string name="toggle_ui">Ver/ocultar botones</string>
+	<string name="end_game">Salir del juego</string>
+	<string name="autodetect">Autodetectar región (recomendado)</string>
+	<string name="west_europe">Europa occidental</string>
+	<string name="east_europe">Europa central y del este</string>
+	<string name="cyrillic">Cirílico</string>
+	<string name="japan">Japonés</string>
+	<string name="korean">Coreano</string>
+	<string name="chinese_simple">Chino (simplificado)</string>
+	<string name="chinese_traditional">Chino (tradicional)</string>
+	<string name="greek">Griego</string>
+	<string name="turkish">Turco</string>
+	<string name="hebrew">Hebreo</string>
+	<string name="arabic">Árabe</string>
+	<string name="baltic">Báltico</string>
+	<string name="thai">Tailandés</string>
+	<string name="vietnamese">Vietnamita</string>
+	<string name="ok">Aceptar</string>
+	<string name="cancel">Cancelar</string>
+	<string name="do_want_quit">¿Realmente quieres salir?</string>
+	<string name="yes">Sí</string>
+	<string name="no">No</string>
+	<string name="creating_dir_failed">Falló la creación de la carpeta $PATH</string>
+	<string name="path_not_readable">$PATH no es legible</string>
+	<string name="no_games_found">No se han encontrado juegos en la ruta /easyrpg/games de la raíz del almacenamiento</string>
+	<string name="no_external_storage">No se ha encontrado almacenamiento externo (ej. tarjeta SD)</string>
+	<string name="resolve_errors">Arregla los errores e intenta de nuevo</string>
+	<string name="not_valid_game">$PATH no es un juego válido</string>
+	<string name="accessing_configuration_failed">Falló el acceso a la configuración de $PATH</string>
+	<string name="select_game_region">Seleccionar región del juego</string>
+	<string name="unknown_region">Región desconocida</string>
+	<string name="region_modification_success">Región cambiada $NAME</string>
+	<string name="region_modification_failed">Falló el cambio de región</string>
+	<string name="refresh">Refrescar</string>
+	<string name="change_default_mapping">Cambiar la asignación de teclas</string>
+	<string name="how_to_use_easy_rpg">Cómo usar EasyRPG Player</string>
+	<string name="how_to_use_easy_rpg_explanation">
+Instrucciones de instalación:\n
+\t1. Coloca la carpeta de cada juego en la ruta /easyrpg/games de la raíz del almacenamiento del dispositivo.\n
+\t2. Coloca las carpetas de los RTP en /easyrpg/rtp/2000 para el RTP de RPG Maker 2000 y /easyrpg/rtp/2003 para el RTP de RPG Maker 2003.\n
+\n
+\tSi no te detecta los juegos y tienes más de un almacenamiento disponible en el dispositivo, mueve la carpeta easyrpg a la raíz del otro almacanamiento y toca el botón de refrescar.\n
+\n
+Nota: para que los juegos puedan sean detectados deben estar descomprimidos y NO deben colocarse en una subcarpeta, por ejemplo:\n
+\t/easyrpg/games/MyGame/Data/RPG_RT.ldb está MAL.\n
+\t/easyrpg/games/MyGame/Data/GameOver/GameOver.png está MAL.\n
+\t/easyrpg/games/MyGame/RPG_RT.ldb está BIEN.\n
+\t/easyrpg/games/MyGame/GameOver/GameOver.png está BIEN.\n
+\n
+Características especiales:\n
+\tToca el botón de menú para editar la posición de los botones.\n
+\tUna vez allí, toca el botón atrás para acceder a otro menú para añadir más botones a la pantalla.\n
+	</string>
+	<string name="add_a_button">Añadir un botón</string>
+	<string name="reset_button_mapping">Reiniciar asignación</string>
+	<string name="exit_without_saving">Salir sin guardar</string>
+	<string name="save_and_quit">Guardar y salir</string>
+</resources>
diff --git a/builds/android/res/values/strings.xml b/builds/android/res/values/strings.xml
@@ -40,10 +40,20 @@
 	<string name="how_to_use_easy_rpg">How to use EasyRPG</string>
 	<string name="how_to_use_easy_rpg_explanation">
 Installation instructions:\n
-\t1. Place the game folders in [storage]/easyrpg/games.\n
-\t2. Place the RTP in [storage]/easyrpg/rtp/2000 for RTP 2000 and in 2003 for RTP 2003.\n\n
+\t1. Place game folders in /easyrpg/games folder in the storage root of the device.\n
+\t2. Place RTP folders in /easyrpg/rtp/2000 for the RPG Maker 2000 RTP and /easyrpg/rtp/2003 for the RPG Maker 2003 RTP.\n
+\n
+If games are not detected and your device has more than one storage available, try moving the easyrpg folder into another storage root and tap the refresh button.\n
+\n
+Hint: in order to get games properly detected they must be uncompressed and NOT placed in a subfolder, e.g.:\n
+\t/easyrpg/games/MyGame/Data/RPG_RT.ldb is WRONG.\n
+\t/easyrpg/games/MyGame/Data/GameOver/GameOver.png is WRONG.\n
+\t/easyrpg/games/MyGame/RPG_RT.ldb is OK.\n
+\t/easyrpg/games/MyGame/GameOver/GameOver.png is OK.\n
+\n
 Special features:\n
-\tDo a long click on a game in the game browser to set the region.\n
+\tTap the menu button to edit screen buttons position.\n
+\tOnce there, tap the back button to access to an additional menu to add more buttons to the screen.\n
 	</string>
 	<string name="add_a_button">Add a button</string>
 	<string name="reset_button_mapping">Reset button mapping</string>

diff --git a/builds/wii/meta.xml b/builds/wii/meta.xml
@@ -2,8 +2,8 @@
 <app version="1">
   <name>EasyRPG Player</name>
   <coder>EasyRPG Team</coder>
-  <version>0.3.0</version>
-  <release_date>20150513000000</release_date>
+  <version>0.3.1</version>
+  <release_date>20150907000000</release_date>
   <short_description>RPG Maker 2000/2003 player</short_description>
   <long_description>EasyRPG is a Role Playing Game interpreter for playing games created by the RPG Maker 2000/2003.
 

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([easyrpg-player],[0.3],[https://github.com/EasyRPG/Player/issues],[easyrpg-player],[https://easy-rpg.org/])
+AC_INIT([easyrpg-player],[0.3.1],[https://github.com/EasyRPG/Player/issues],[easyrpg-player],[https://easy-rpg.org/])
 
 AC_CONFIG_AUX_DIR([builds/autoconf])
 AM_INIT_AUTOMAKE([1.11.4 foreign subdir-objects -Wall -Werror])

diff --git a/resources/osx/Info.plist b/resources/osx/Info.plist
@@ -31,7 +31,7 @@
     <string>APPL</string>
 
     <key>CFBundleShortVersionString</key>
-    <string>0.3</string>
+    <string>0.3.1</string>
 
 </dict>
 </plist>
diff --git a/resources/player.rc b/resources/player.rc
@@ -3,8 +3,8 @@
 1 24 "player.xml"
 #endif
 1 VERSIONINFO
-FILEVERSION 0,3,0,0
-PRODUCTVERSION 0,3,0,0
+FILEVERSION 0,3,1,0
+PRODUCTVERSION 0,3,1,0
 FILETYPE 0x00000001L
 {
 	BLOCK "StringFileInfo"
@@ -13,13 +13,13 @@ FILETYPE 0x00000001L
 		{
 			VALUE "Comments", "https://easy-rpg.org/"
 			VALUE "CompanyName", "EasyRPG Project"
-			VALUE "FileVersion", "0.3.0.0"
+			VALUE "FileVersion", "0.3.1.0"
 			VALUE "FileDescription", "EasyRPG Player"
 			VALUE "InternalName", "easyrpg-player"
 			VALUE "LegalCopyright", "2005-2015 EasyRPG Project"
 			VALUE "OriginalFilename", "Player.exe"
 			VALUE "ProductName", "EasyRPG Player"
-			VALUE "ProductVersion", "0.3.0.0"
+			VALUE "ProductVersion", "0.3.1.0"
 		}
 	}
 	BLOCK "VarFileInfo"

diff --git a/src/options.h b/src/options.h
@@ -95,7 +95,7 @@
 
 /** Version of player. Should be redefined by build system. */
 #ifndef PLAYER_VERSION
-#  define PLAYER_VERSION "0.3"
+#  define PLAYER_VERSION "0.3.1"
 #endif
 
 #endif