Menu
▾
▴
performous-commit — SCM commits
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(25) |
Jul
(288) |
Aug
(119) |
Sep
(31) |
Oct
(59) |
Nov
(458) |
Dec
(359) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(268) |
Feb
(26) |
Mar
(36) |
Apr
(48) |
May
(119) |
Jun
(37) |
Jul
(173) |
Aug
(429) |
Sep
(137) |
Oct
(156) |
Nov
(59) |
Dec
(45) |
| 2011 |
Jan
(398) |
Feb
(257) |
Mar
(49) |
Apr
(5) |
May
(34) |
Jun
(11) |
Jul
(38) |
Aug
(12) |
Sep
(1) |
Oct
(49) |
Nov
(5) |
Dec
(10) |
| 2012 |
Jan
(21) |
Feb
(32) |
Mar
(20) |
Apr
(1) |
May
(2) |
Jun
|
Jul
(173) |
Aug
|
Sep
(25) |
Oct
(6) |
Nov
(44) |
Dec
|
|
From: Tapio V. <aa...@us...> - 2009-12-29 12:15:37
|
Module: performous
Branch: master
Commit: fd4719bae39f7892fc2a5ad7b1a823d1321258ef
Author: Tapio Vierros <tap...@gm...>
Date: Tue Dec 29 14:14:42 2009 +0200
Attempt to fix performance issues with GodMode popup.
---
game/guitargraph.cc | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index c1220dd..b166392 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -722,11 +722,8 @@ void GuitarGraph::drawInfo(double time, double offsetX, Dimensions dimensions) {
m_popupText->render("God Mode\nActivated!");
m_popupText->dimensions().center(0.1).middle(offsetX).stretch(s,s);
m_popupText->draw();
- s = 0.12 * (1.0 + godAnim);
- glColor4f(0.8f, 0.8f, 1.0f, a);
- m_popupText->render("Mistakes ignored");
- m_popupText->dimensions().center(0.26).middle(offsetX).stretch(s, s/5.0);
- m_popupText->draw();
+ m_text.dimensions.screenBottom(-0.02).middle(-0.12 + offsetX);
+ m_text.draw("Mistakes ignored!", 1.0 - godAnim);
if (godAnim > 0.999) m_godmodePopup.setTarget(0.0, true);
}
}
|
|
From: Peque <ms...@us...> - 2009-12-29 12:09:23
|
Module: performous Branch: master Commit: 3d71fa5625a8eb26f8480c99c2ca2bcd9513fdb9 Author: Miguel Sánchez de León Peque <peq...@ho...> Date: Tue Dec 29 13:09:04 2009 +0100 Merge branch 'master' of ssh://git.performous.org/gitroot/performous/performous --- |
|
From: Peque <ms...@us...> - 2009-12-29 12:09:21
|
Module: performous Branch: master Commit: aa66a44d1283b76bd5519ac09693edf58c67913c Author: Miguel Sánchez de León Peque <peq...@ho...> Date: Tue Dec 29 13:08:05 2009 +0100 Added spanish translation. --- lang/es.po | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/lang/es.po b/lang/es.po new file mode 100644 index 0000000..ebeadc8 --- /dev/null +++ b/lang/es.po @@ -0,0 +1,95 @@ +msgid "" +msgstr "" +"Project-Id-Version: Performous\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-07 01:56+0100\n" +"PO-Revision-Date: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-KeywordsList: _\n" +"X-Poedit-Basepath: .\n" +"Last-Translator: Miguel Sánchez de León Peque <msd...@gm...>\n" +"X-Poedit-SearchPath-0: ../game\n" + +#: ../game/screen_hiscore.cc:104 +msgid "Hiscore for " +msgstr "Puntuaciones para" + +#: ../game/screen_intro.cc:9 +msgid "Perform" +msgstr "Perform" + +#: ../game/screen_intro.cc:9 +msgid "Start performing!" +msgstr "Comienza una partida!" + +#: ../game/screen_intro.cc:10 +msgid "Practice" +msgstr "Practicar" + +#: ../game/screen_intro.cc:10 +msgid "Check your skills or test the microphones" +msgstr "Revisa los micrófonos y comprueba tus habilidades" + +#: ../game/screen_intro.cc:11 +msgid "Configure" +msgstr "Configuración" + +#: ../game/screen_intro.cc:11 +msgid "Configure game options" +msgstr "Cambia las opciones de configuración del juego" + +#: ../game/screen_intro.cc:12 +msgid "Quit" +msgstr "Salir" + +#: ../game/screen_intro.cc:12 +msgid "Leave the game" +msgstr "Sal del juego" + +#: ../game/screen_intro.cc:19 +msgid "No playback devices could be used.\n" +msgstr "Ningún dispositivo de reproducción de audio pudo ser configurado.\n" + +#: ../game/screen_intro.cc:20 +msgid "No microphones found.\n" +msgstr "No se ha encontrado ningún micrófono.\n" + +#: ../game/screen_intro.cc:21 +msgid "" +"\n" +"Please configure some before playing." +msgstr "" +"\n" +"Por favor, configura alguno antes de jugar." + +#: ../game/screen_players.cc:110 +msgid "No players found!" +msgstr "No se han encontrado jugadores!" + +#: ../game/screen_players.cc:111 +msgid "Enter a name to create a new player." +msgstr "Introduce un nombre para crear un nuevo jugador." + +#: ../game/screen_players.cc:113 +msgid "Press enter to create player!" +msgstr "Presiona \"enter\" para crear el jugador!" + +#: ../game/screen_songs.cc:209 +msgid "No songs found!" +msgstr "No se encontraron canciones!" + +#: ../game/screen_songs.cc:210 +msgid "" +"Visit performous.org\n" +"for free songs" +msgstr "" +"Visita performous.org\n" +"para descargar canciones gratuitas" + +#: ../game/screen_songs.cc:212 +msgid "no songs match search" +msgstr "ninguna canción satisface el criterio de búsqueda" + |
|
From: Yoda-JM <yo...@us...> - 2009-12-29 11:40:21
|
Module: performous
Branch: master
Commit: 4ff5b6333808da5f2a97b6f574a263a62763e0a2
Author: Vincent Le Ligeour <yo...@us...>
Date: Tue Dec 29 12:40:03 2009 +0100
Added french translation
---
lang/CMakeLists.txt | 2 +-
lang/fr.po | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 96 insertions(+), 1 deletions(-)
diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index df07291..34046a0 100644
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -3,6 +3,6 @@ file(GLOB LANGUAGES *.po)
foreach(language ${LANGUAGES})
string(REGEX REPLACE "(.+(\\\\|/))+" "" language ${language})
string(REGEX REPLACE "\\.po$" "" language ${language})
- execute_process(COMMAND ${Msgfmt_BIN} ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po -o ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo)
+ execute_process(COMMAND ${Msgfmt_BIN} -v ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po -o ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo DESTINATION ${LOCALE_DIR}/${language}/LC_MESSAGES RENAME ${CMAKE_PROJECT_NAME}.mo)
endforeach(language)
diff --git a/lang/fr.po b/lang/fr.po
new file mode 100644
index 0000000..64cf78f
--- /dev/null
+++ b/lang/fr.po
@@ -0,0 +1,95 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Performous\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-07 01:56+0100\n"
+"PO-Revision-Date: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-KeywordsList: _\n"
+"X-Poedit-Basepath: .\n"
+"Last-Translator: Yoda-JM <yo...@us...>\n"
+"X-Poedit-SearchPath-0: ../game\n"
+
+#: ../game/screen_hiscore.cc:104
+msgid "Hiscore for "
+msgstr "Records pour "
+
+#: ../game/screen_intro.cc:9
+msgid "Perform"
+msgstr "Jouer"
+
+#: ../game/screen_intro.cc:9
+msgid "Start performing!"
+msgstr "Commencer une partie!"
+
+#: ../game/screen_intro.cc:10
+msgid "Practice"
+msgstr "Entrainement"
+
+#: ../game/screen_intro.cc:10
+msgid "Check your skills or test the microphones"
+msgstr "Chauffer votre voix et tester les micros"
+
+#: ../game/screen_intro.cc:11
+msgid "Configure"
+msgstr "Configuration"
+
+#: ../game/screen_intro.cc:11
+msgid "Configure game options"
+msgstr "Configurer les options de jeu"
+
+#: ../game/screen_intro.cc:12
+msgid "Quit"
+msgstr "Quitter"
+
+#: ../game/screen_intro.cc:12
+msgid "Leave the game"
+msgstr "Sortir du jeu"
+
+#: ../game/screen_intro.cc:19
+msgid "No playback devices could be used.\n"
+msgstr "Aucun périférique audio de sortie n'est utilisable.\n"
+
+#: ../game/screen_intro.cc:20
+msgid "No microphones found.\n"
+msgstr "Aucun micro n'a été trouvé.\n"
+
+#: ../game/screen_intro.cc:21
+msgid ""
+"\n"
+"Please configure some before playing."
+msgstr ""
+"\n"
+"Veuillez en configurer certains avant de jouer."
+
+#: ../game/screen_players.cc:110
+msgid "No players found!"
+msgstr "Aucun joueur n'a été trouvé!"
+
+#: ../game/screen_players.cc:111
+msgid "Enter a name to create a new player."
+msgstr "Entrez un nom pour créer un nouveau joueur."
+
+#: ../game/screen_players.cc:113
+msgid "Press enter to create player!"
+msgstr "Pressez Entrer pour créer un nouveau joueur!"
+
+#: ../game/screen_songs.cc:209
+msgid "No songs found!"
+msgstr "Aucun morceau trouvé!"
+
+#: ../game/screen_songs.cc:210
+msgid ""
+"Visit performous.org\n"
+"for free songs"
+msgstr ""
+"Visitez performous.org\n"
+"pour des morceaux gratuits"
+
+#: ../game/screen_songs.cc:212
+msgid "no songs match search"
+msgstr "aucun morceau ne satisfait la recherche"
+
|
|
From: Yoda-JM <yo...@us...> - 2009-12-29 10:44:34
|
Module: performous
Branch: master
Commit: 43fce1c7f4e49ff4fcdb02531ee45d65762cef0e
Author: Vincent Le Ligeour <yo...@us...>
Date: Tue Dec 29 11:44:17 2009 +0100
Fixed some case errors, allow locales install directory configuration
---
CMakeLists.txt | 20 +++++++++++---------
lang/CMakeLists.txt | 4 ++--
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0431d31..3b9eb29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,18 +35,20 @@ include_directories(libs/libda/include)
#need to put here do setting LOCALE_DIR variable
find_package(Gettext)
if(Gettext_FOUND)
- if(WIN32)
- SET(LOCALE_DIR "../locale")
- elseif(APPLE)
- SET(LOCALE_DIR "share/locale")
- else()#other os
- SET(LOCALE_DIR "/usr/share/locale")
- endif(WIN32)
+ if(not LOCALE_DIR)
+ if(WIN32)
+ SET(LOCALE_DIR "../locale")
+ elseif(APPLE)
+ SET(LOCALE_DIR "share/locale")
+ else()#other os
+ SET(LOCALE_DIR "/usr/share/locale")
+ endif(WIN32)
+ endif(not LOCALE_DIR)
if(NOT LOCALE_DIR)
message(QUIET "Set LOCALE_DIR to path to get Gettext working")
else()
- find_package(msgfmt)
+ find_package(Msgfmt)
if(Msgfmt_FOUND)
message(STATUS "Found msgfmt to convert language file. Translation enabled")
add_subdirectory(lang)
@@ -77,4 +79,4 @@ endif (ENABLE_TOOLS)
if(WIN32)
option(ENABLE_VERSIONING "Add number version information. This allows to add version information to exe. Be carefull, in beta (and a lot useless)" OFF)
-endif(WIN32)
\ No newline at end of file
+endif(WIN32)
diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index 7c141dd..7ec5c9c 100644
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -4,5 +4,5 @@ foreach(language ${LANGUAGES})
string(REGEX REPLACE "(.+(\\\\|/))+" "" language ${language})
string(REGEX REPLACE "\\.po$" "" language ${language})
execute_process(COMMAND ${Msgfmt_BIN} ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po -o ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo DESTINATION ${LOCALE_DIR}/${language}/LC_MESSAGES RENAME ${CMAKE_PROJECT_NAME}.mo)
-endforeach(language)
\ No newline at end of file
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo DESTINATION ${LOCALE_DIR}/${language}/LC_MESSAGES RENAME performous.mo)
+endforeach(language)
|
|
From: Jack_MD <ja...@us...> - 2009-12-29 08:18:44
|
Module: performous Branch: master Commit: 969a5f8db74fbb99031ea2a048ab19e7425e52cf Author: Daniel Lemper <da...@Ma...> Date: Tue Dec 29 09:17:56 2009 +0100 now really: macosx: new icon, po files get included into the app package --- CMakeLists.txt | 2 ++ osx-utils/performous.icns | Bin 78411 -> 193626 bytes 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21bfaa6..0431d31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,8 @@ find_package(Gettext) if(Gettext_FOUND) if(WIN32) SET(LOCALE_DIR "../locale") + elseif(APPLE) + SET(LOCALE_DIR "share/locale") else()#other os SET(LOCALE_DIR "/usr/share/locale") endif(WIN32) diff --git a/osx-utils/performous.icns b/osx-utils/performous.icns index 087d230..7152e91 100644 Binary files a/osx-utils/performous.icns and b/osx-utils/performous.icns differ |
|
From: Jack_MD <ja...@us...> - 2009-12-29 08:11:52
|
Module: performous Branch: master Commit: 697b580a2457ae827100260c59312cf7bbb107d3 Author: Daniel Lemper <da...@Ma...> Date: Tue Dec 29 09:09:57 2009 +0100 added german po lang file, macosx: new icon, po files get included into the app package --- lang/de.po | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/lang/de.po b/lang/de.po new file mode 100644 index 0000000..c7b0f12 --- /dev/null +++ b/lang/de.po @@ -0,0 +1,95 @@ +msgid "" +msgstr "" +"Project-Id-Version: Performous\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-07 01:56+0100\n" +"PO-Revision-Date: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-KeywordsList: _\n" +"X-Poedit-Basepath: .\n" +"Last-Translator: Jack_MD <2.m...@gm...>\n" +"X-Poedit-SearchPath-0: ../game\n" + +#: ../game/screen_hiscore.cc:104 +msgid "Hiscore for " +msgstr "Punktzahl für" + +#: ../game/screen_intro.cc:9 +msgid "Perform" +msgstr "Spielen" + +#: ../game/screen_intro.cc:9 +msgid "Start performing!" +msgstr "Starte deinen Auftritt!" + +#: ../game/screen_intro.cc:10 +msgid "Practice" +msgstr "Ãbung" + +#: ../game/screen_intro.cc:10 +msgid "Check your skills or test the microphones" +msgstr "Prüfe deine Fähigkeiten oder teste das Mikrofon" + +#: ../game/screen_intro.cc:11 +msgid "Configure" +msgstr "Konfiguriere" + +#: ../game/screen_intro.cc:11 +msgid "Configure game options" +msgstr "Konfiguriere die Spiel-Optionen" + +#: ../game/screen_intro.cc:12 +msgid "Quit" +msgstr "Beenden" + +#: ../game/screen_intro.cc:12 +msgid "Leave the game" +msgstr "Verlasse das Spiel" + +#: ../game/screen_intro.cc:19 +msgid "No playback devices could be used.\n" +msgstr "Kann keine Abspielgeräte benutzen.\n" + +#: ../game/screen_intro.cc:20 +msgid "No microphones found.\n" +msgstr "Keine Mikrofone gefunden.\n" + +#: ../game/screen_intro.cc:21 +msgid "" +"\n" +"Please configure some before playing." +msgstr "" +"\n" +"Bitte konfiguriere ein wenig bevor du spielst." + +#: ../game/screen_players.cc:110 +msgid "No players found!" +msgstr "Keine Spieler gefunden!" + +#: ../game/screen_players.cc:111 +msgid "Enter a name to create a new player." +msgstr "Gib einen Namen ein um einen neuen Spieler zu erzeugen." + +#: ../game/screen_players.cc:113 +msgid "Press enter to create player!" +msgstr "Drücke Enter um einen Spieler zu erzeugen!" + +#: ../game/screen_songs.cc:209 +msgid "No songs found!" +msgstr "Kein Song gefunden!" + +#: ../game/screen_songs.cc:210 +msgid "" +"Visit performous.org\n" +"for free songs" +msgstr "" +"Besuche performous.org\n" +"für freie Songs" + +#: ../game/screen_songs.cc:212 +msgid "no songs match search" +msgstr "kein Song zur Suche gefunden" + |
Module: performous
Branch: master
Commit: a8e7fdceb27984d9ce042149ede4bb2e82e25e9f
Author: Miguel Sánchez de León Peque <peq...@ho...>
Date: Tue Dec 29 02:32:32 2009 +0100
Fixed bug in configuration screen (used too much CPU while rendering text). Added volume control in screens with F11 and F12 keys. Now screenshots in Performous are taken with the usual PRINT key.
---
game/main.cc | 2 +-
game/screen_configuration.cc | 6 ++-
game/screen_intro.cc | 4 ++
game/screen_practice.cc | 6 ++-
game/screen_sing.cc | 2 +
game/screen_songs.cc | 2 +
game/theme.cc | 1 +
game/theme.hh | 2 +
themes/default/menu_short_comment.svg | 76 +++++++++++++++++++++++++++++++++
9 files changed, 97 insertions(+), 4 deletions(-)
diff --git a/game/main.cc b/game/main.cc
index bcf3062..03b47f4 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -71,7 +71,7 @@ static void checkEvents_SDL(ScreenManager& sm, Window& window) {
config["graphic/fullscreen"].b() = !config["graphic/fullscreen"].b();
continue; // Already handled here...
}
- if (keypressed == SDLK_F11 ) {
+ if (keypressed == SDLK_PRINT ) {
g_take_screenshot = true;
}
if (keypressed == SDLK_F4 && modifier & KMOD_ALT) {
diff --git a/game/screen_configuration.cc b/game/screen_configuration.cc
index 5f9908e..8be8b28 100644
--- a/game/screen_configuration.cc
+++ b/game/screen_configuration.cc
@@ -38,6 +38,8 @@ void ScreenConfiguration::manageEvent(SDL_Event event) {
if (configuration.empty()) return; // The rest work if there are any config options
else if (key == SDLK_r && modifier & KMOD_CTRL) ci->reset(modifier & KMOD_ALT);
else if (key == SDLK_s && modifier & KMOD_CTRL) writeConfig(modifier & KMOD_ALT);
+ else if (key == SDLK_F11) --config["audio/preview_volume"];
+ else if (key == SDLK_F12) ++config["audio/preview_volume"];
}
}
@@ -51,8 +53,8 @@ void ScreenConfiguration::draw() {
theme->short_comment_bg.dimensions.fixedHeight(0.025);
theme->short_comment_bg.dimensions.right(-0.04).screenBottom(-0.054);
theme->short_comment_bg.draw();
- theme->comment.dimensions.left(-0.48).screenBottom(-0.067);
- theme->comment.draw("Ctrl + S to save, Ctrl + R to reset defaults");
+ theme->short_comment.dimensions.left(-0.48).screenBottom(-0.067);
+ theme->short_comment.draw("Ctrl + S to save, Ctrl + R to reset defaults");
// Long description
theme->comment_bg.dimensions.middle().screenBottom(-0.01);
theme->comment_bg.draw();
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index 3ef4f54..f4d7e0d 100755
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -46,6 +46,10 @@ void ScreenIntro::manageEvent(SDL_Event event) {
} else if (nav == input::PAUSE) m_audio.togglePause();
// Normalize selected to [0, size)
selected = (m_menuOptions.size() + selected) % m_menuOptions.size();
+ } else if (event.type == SDL_KEYDOWN) {
+ int key = event.key.keysym.sym;
+ if (key == SDLK_F11) --config["audio/preview_volume"];
+ else if (key == SDLK_F12) ++config["audio/preview_volume"];
}
}
diff --git a/game/screen_practice.cc b/game/screen_practice.cc
index 59537ef..b313d74 100644
--- a/game/screen_practice.cc
+++ b/game/screen_practice.cc
@@ -38,7 +38,11 @@ void ScreenPractice::manageEvent(SDL_Event event) {
input::NavButton nav(input::getNav(event));
if (nav == input::CANCEL || nav == input::START || nav == input::SELECT) sm->activateScreen("Intro");
else if (nav == input::PAUSE) m_audio.togglePause();
- else if (event.type == SDL_JOYBUTTONDOWN // Play drum sounds here
+ else if (event.type == SDL_KEYDOWN) {
+ int key = event.key.keysym.sym;
+ if (key == SDLK_F11) --config["audio/music_volume"];
+ else if (key == SDLK_F12) ++config["audio/music_volume"];
+ } else if (event.type == SDL_JOYBUTTONDOWN // Play drum sounds here
&& input::Private::devices[event.jbutton.which].type_match(input::DRUMS)) {
int b = input::buttonFromSDL(input::Private::devices[event.jbutton.which].type(), event.jbutton.button);
if (b != -1) m_audio.play(m_samples[unsigned(b) % m_samples.size()], "audio/fail_volume");
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 5899475..7ed89a1 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -232,6 +232,8 @@ void ScreenSing::manageEvent(SDL_Event event) {
else if (key == SDLK_F8) ++config["audio/round-trip"];
else if (key == SDLK_F9) ++config["game/karaoke_mode"];
else if (key == SDLK_F10) ++config["game/pitch"];
+ else if (key == SDLK_F11) --config["audio/music_volume"];
+ else if (key == SDLK_F12) ++config["audio/music_volume"];
else if (key == SDLK_HOME) m_audio.seekPos(0.0);
else if (key == SDLK_LEFT) { m_audio.seek(-5.0); seekback = true; }
else if (key == SDLK_RIGHT) m_audio.seek(5.0);
diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 4bb6ecf..1a271f9 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -96,6 +96,8 @@ void ScreenSongs::manageEvent(SDL_Event event) {
else if (m_songs.empty()) return;
else if (key == SDLK_PAGEUP) m_songs.advance(-10);
else if (key == SDLK_PAGEDOWN) m_songs.advance(10);
+ else if (key == SDLK_F11) --config["audio/preview_volume"];
+ else if (key == SDLK_F12) ++config["audio/preview_volume"];
else if (!m_jukebox && key == SDLK_F4) m_jukebox = true;
else if (key == SDLK_TAB && !(mod & KMOD_ALT)) m_songs.randomize();
else if (key == SDLK_END) {
diff --git a/game/theme.cc b/game/theme.cc
index e58d373..7e928f2 100755
--- a/game/theme.cc
+++ b/game/theme.cc
@@ -39,6 +39,7 @@ ThemeConfiguration::ThemeConfiguration():
item(getThemePath("configuration_item.svg"), config["graphic/text_lod"].f()),
value(getThemePath("configuration_value.svg"), config["graphic/text_lod"].f()),
comment(getThemePath("menu_comment.svg"), config["graphic/text_lod"].f()),
+ short_comment(getThemePath("menu_short_comment.svg"), config["graphic/text_lod"].f()),
comment_bg(getThemePath("menu_comment_bg.svg")),
short_comment_bg(getThemePath("menu_scomment_bg.svg"))
{}
diff --git a/game/theme.hh b/game/theme.hh
index d62a902..3cbba53 100755
--- a/game/theme.hh
+++ b/game/theme.hh
@@ -59,6 +59,8 @@ struct ThemeConfiguration: Theme {
SvgTxtTheme value;
/// configuration comment text
SvgTxtTheme comment;
+ /// configuration comment text (short tip)
+ SvgTxtTheme short_comment;
/// configuration comment background
Surface comment_bg;
/// configuration comment background (short tip)
diff --git a/themes/default/menu_short_comment.svg b/themes/default/menu_short_comment.svg
new file mode 100644
index 0000000..a74618f
--- /dev/null
+++ b/themes/default/menu_short_comment.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.0"
+ x="0"
+ y="0"
+ width="80"
+ height="20"
+ id="svg559"
+ sodipodi:version="0.32"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="menu_short_comment.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs2522">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 300 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="800 : 300 : 1"
+ inkscape:persp3d-origin="400 : 200 : 1"
+ id="perspective8" />
+ </defs>
+ <metadata
+ id="metadata35">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ inkscape:window-height="725"
+ inkscape:window-width="1280"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ inkscape:zoom="3.5638182"
+ inkscape:cx="63.312761"
+ inkscape:cy="28.101518"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:current-layer="svg559"
+ showgrid="false"
+ inkscape:window-maximized="1" />
+ <text
+ x="1.4361764"
+ y="16.829205"
+ style="font-size:13.92942142px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Charter;-inkscape-font-specification:Bitstream Charter"
+ id="text10203"
+ xml:space="preserve"
+ sodipodi:linespacing="125%"
+ transform="scale(1.0082228,0.99184427)"><tspan
+ x="1.4361764"
+ y="16.829205"
+ id="tspan10205"
+ style="font-size:13.92942142px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;font-family:Bitstream Charter;-inkscape-font-specification:Bitstream Charter">Comment</tspan></text>
+</svg>
|
|
From: Tapio V. <aa...@us...> - 2009-12-27 22:49:22
|
Module: performous
Branch: master
Commit: abd2834921cbe287caef52f393b278a30a60bb4c
Author: Tapio Vierros <tap...@gm...>
Date: Mon Dec 28 00:46:02 2009 +0200
Change singer layout to fullscreen if there is no instruments (and vice versa).
---
game/screen_sing.cc | 9 ++++++---
game/screen_sing.hh | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 27899b7..5899475 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -96,7 +96,9 @@ void ScreenSing::enter() {
m_engine.reset(new Engine(m_audio, *m_song, analyzers.begin(), analyzers.end(), m_database));
}
-void ScreenSing::instrumentLayout(double time) {
+/// Manages the instrument drawing
+/// Returns false if no instuments are alive
+bool ScreenSing::instrumentLayout(double time) {
int count = 0, i = 0;
// Count active instruments
for (Instruments::iterator it = m_instruments.begin(); it != m_instruments.end(); ++it)
@@ -134,6 +136,7 @@ void ScreenSing::instrumentLayout(double time) {
m_audio.streamFade(it->first, level);
}
}
+ return (count > 0);
}
void ScreenSing::danceLayout(double time) {
@@ -301,8 +304,8 @@ void ScreenSing::draw() {
} else if( m_instruments.empty() ) {
m_layout_singer->draw(time, LayoutSinger::BOTTOM);
} else {
- instrumentLayout(time);
- m_layout_singer->draw(time, LayoutSinger::MIDDLE);
+ bool some_alive = instrumentLayout(time);
+ m_layout_singer->draw(time, some_alive ? LayoutSinger::MIDDLE : LayoutSinger::BOTTOM);
}
Song::Status status = m_song->status(time);
diff --git a/game/screen_sing.hh b/game/screen_sing.hh
index af07b95..de37b5c 100644
--- a/game/screen_sing.hh
+++ b/game/screen_sing.hh
@@ -70,7 +70,7 @@ class ScreenSing: public Screen {
- is the hiscore file writable
*/
void activateNextScreen();
- void instrumentLayout(double time);
+ bool instrumentLayout(double time);
void danceLayout(double time);
Audio& m_audio;
Capture& m_capture;
|
|
From: John S. <jst...@us...> - 2009-12-27 22:25:13
|
Module: performous
Branch: master
Commit: 4b5c19081eb7d1ec5f9a0ff94de4089adb77e8d0
Author: John Stumpo <st...@js...>
Date: Sun Dec 27 17:11:23 2009 -0500
Prefer Magick++ over SDL_image, and even then only try SDL_image under Windows.
---
game/CMakeLists.txt | 19 ++++++++++++-------
game/surface.cc | 4 ++--
game/video_driver.cc | 4 ++--
3 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 52d50a6..2f60f1f 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -106,15 +106,20 @@ else()
message(STATUS "MIDI I/O: Disabled (libportmidi not found)")
endif()
-find_package(SDL_image)
-if(SDL_image_FOUND)
- include_directories(${SDL_image_INCLUDE_DIRS})
- add_definitions(-DLESS_MAGIC) # ;)
- list(APPEND LIBS ${SDL_image_LIBRARIES})
- message(STATUS "SDL_image: found, enabling replacements for Magick++ code")
+if(WIN32)
+ find_package(Magick++)
+ if(NOT Magick++_FOUND)
+ message(STATUS "Magick++ not found; trying to use SDL_image instead")
+ find_package(SDL_image REQUIRED)
+ include_directories(${SDL_image_INCLUDE_DIRS})
+ add_definitions(-DUSE_SDL_IMAGE)
+ list(APPEND LIBS ${SDL_image_LIBRARIES})
+ endif()
else()
- message(STATUS "SDL_image: not found, falling back to Magick++")
find_package(Magick++ REQUIRED)
+endif()
+
+if(Magick++_FOUND)
include_directories(${Magick++_INCLUDE_DIRS})
list(APPEND LIBS ${Magick++_LIBRARIES})
add_definitions(${Magick++_DEFINITIONS})
diff --git a/game/surface.cc b/game/surface.cc
index 54ff5f2..f6f5a55 100644
--- a/game/surface.cc
+++ b/game/surface.cc
@@ -6,7 +6,7 @@
#include <librsvg/rsvg.h>
#include <librsvg/rsvg-cairo.h>
-#ifdef LESS_MAGIC
+#ifdef USE_SDL_IMAGE
#include <SDL_image.h>
#else
#include <Magick++.h>
@@ -90,7 +90,7 @@ template <typename T> void loader(T& target, std::string filename, bool autocrop
gdk_pixbuf_unref(pb);
rsvg_term();
} else {
- #ifdef LESS_MAGIC
+ #ifdef USE_SDL_IMAGE
SDL_Surface* imgsurf = IMG_Load(filename.c_str());
if (imgsurf == NULL) {
throw std::runtime_error("Unable to load " + filename + ": " + IMG_GetError());
diff --git a/game/video_driver.cc b/game/video_driver.cc
index d4f7b43..d03c307 100644
--- a/game/video_driver.cc
+++ b/game/video_driver.cc
@@ -7,7 +7,7 @@
#include "joystick.hh"
#include <SDL.h>
-#ifdef LESS_MAGIC
+#ifdef USE_SDL_IMAGE
#include <sstream>
#include <fstream>
#else
@@ -82,7 +82,7 @@ void Window::screenshot() {
fnstr << "/tmp/";
#endif
fnstr << "performous_screenshot_" << count;
-#ifdef LESS_MAGIC
+#ifdef USE_SDL_IMAGE
/* Write the image out as an uncompressed tga. */
fnstr << ".tga";
std::ofstream tgaout(fnstr.str().c_str(), std::ios::binary);
|
|
From: John S. <jst...@us...> - 2009-12-27 20:41:15
|
Module: performous
Branch: master
Commit: 301e581350142cd2082eae906978218203e1b26a
Author: John Stumpo <st...@js...>
Date: Sun Dec 27 15:37:52 2009 -0500
Fix the SDL_image image loading code's handling of images that contain an alpha channel.
---
game/surface.cc | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/game/surface.cc b/game/surface.cc
index a72f769..54ff5f2 100644
--- a/game/surface.cc
+++ b/game/surface.cc
@@ -95,7 +95,12 @@ template <typename T> void loader(T& target, std::string filename, bool autocrop
if (imgsurf == NULL) {
throw std::runtime_error("Unable to load " + filename + ": " + IMG_GetError());
}
- // Copy the image to an RGBA surface to ensure that it is indeed RGBA.
+ // If an alpha channel is present in the source, ensure that SDL_SRCALPHA is not set on it
+ // so the alpha actually makes it onto the destination surface.
+ if (imgsurf->format->Amask != 0) {
+ SDL_SetAlpha(imgsurf, 0, 0);
+ }
+ // Copy the image to an RGBA surface to ensure that it is indeed RGBA with the right pixel layout.
SDL_Surface* rgbasurf = SDL_CreateRGBSurface(SDL_SWSURFACE, imgsurf->w, imgsurf->h, 32,
#if SDL_BYTEORDER == SDL_BIGENDIAN
0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff
|
|
From: Peque <ms...@us...> - 2009-12-25 00:59:28
|
Module: performous Branch: master Commit: 26cbec59be366dbc31e215b6ed15e48c33afe221 Author: Miguel Sánchez de León Peque <msd...@gm...> Date: Fri Dec 25 01:58:21 2009 +0100 Arrows completed and some fixes (less weight) --- themes/default/arrows.svg | 563 +++++++++++++--------- themes/default/arrows_cursor.svg | 613 ++++++++++------------- themes/default/arrows_hold.svg | 1016 +++++++++++++++++--------------------- 3 files changed, 1032 insertions(+), 1160 deletions(-) |
|
From: Peque <ms...@us...> - 2009-12-24 23:04:32
|
Module: performous
Branch: master
Commit: 8b96759edcd4581753c79fa848ae0e3320f6d319
Author: Miguel Sánchez de León Peque <msd...@gm...>
Date: Fri Dec 25 00:03:10 2009 +0100
Change in configure screen: tip differenced from the menu option comment
---
game/screen_configuration.cc | 14 ++--
game/screen_intro.cc | 2 +-
game/theme.cc | 3 +-
game/theme.hh | 2 +
themes/default/menu_scomment_bg.svg | 145 +++++++++++++++++++++++++++++++++++
5 files changed, 157 insertions(+), 9 deletions(-)
diff --git a/game/screen_configuration.cc b/game/screen_configuration.cc
index 715fed7..5f9908e 100644
--- a/game/screen_configuration.cc
+++ b/game/screen_configuration.cc
@@ -47,17 +47,17 @@ void ScreenConfiguration::draw() {
ConfigItem const& ci = config[configuration[selected]];
theme->item.draw(ci.getShortDesc());
theme->value.draw(ci.getValue());
- // Long description
- theme->comment_bg.dimensions.middle().screenBottom(-0.05);
- theme->comment_bg.draw();
- theme->comment.dimensions.left(-0.48).screenBottom(-0.068);
- theme->comment.draw(ci.getLongDesc());
// Key help
+ theme->short_comment_bg.dimensions.fixedHeight(0.025);
+ theme->short_comment_bg.dimensions.right(-0.04).screenBottom(-0.054);
+ theme->short_comment_bg.draw();
+ theme->comment.dimensions.left(-0.48).screenBottom(-0.067);
+ theme->comment.draw("Ctrl + S to save, Ctrl + R to reset defaults");
+ // Long description
theme->comment_bg.dimensions.middle().screenBottom(-0.01);
theme->comment_bg.draw();
theme->comment.dimensions.left(-0.48).screenBottom(-0.028);
- theme->comment.draw("Ctrl + S to save, Ctrl + R to reset defaults");
-
+ theme->comment.draw(ci.getLongDesc());
}
}
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index c3625ae..3ef4f54 100755
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -68,7 +68,7 @@ void ScreenIntro::draw() {
m_menuOptions[selected].image.draw();
theme->comment_bg.dimensions.center().screenBottom(-0.01);
theme->comment_bg.draw();
- theme->comment.dimensions.left(-0.45).screenBottom(-0.028);
+ theme->comment.dimensions.left(-0.48).screenBottom(-0.028);
theme->comment.draw(m_menuOptions[selected].comment);
draw_menu_options();
if (m_dialog) m_dialog->draw();
diff --git a/game/theme.cc b/game/theme.cc
index 88d48ec..e58d373 100755
--- a/game/theme.cc
+++ b/game/theme.cc
@@ -39,7 +39,8 @@ ThemeConfiguration::ThemeConfiguration():
item(getThemePath("configuration_item.svg"), config["graphic/text_lod"].f()),
value(getThemePath("configuration_value.svg"), config["graphic/text_lod"].f()),
comment(getThemePath("menu_comment.svg"), config["graphic/text_lod"].f()),
- comment_bg(getThemePath("menu_comment_bg.svg"))
+ comment_bg(getThemePath("menu_comment_bg.svg")),
+ short_comment_bg(getThemePath("menu_scomment_bg.svg"))
{}
ThemeIntro::ThemeIntro():
diff --git a/game/theme.hh b/game/theme.hh
index 73967de..d62a902 100755
--- a/game/theme.hh
+++ b/game/theme.hh
@@ -61,6 +61,8 @@ struct ThemeConfiguration: Theme {
SvgTxtTheme comment;
/// configuration comment background
Surface comment_bg;
+ /// configuration comment background (short tip)
+ Surface short_comment_bg;
};
/// theme for intro screen
diff --git a/themes/default/menu_scomment_bg.svg b/themes/default/menu_scomment_bg.svg
new file mode 100644
index 0000000..e150054
--- /dev/null
+++ b/themes/default/menu_scomment_bg.svg
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1000"
+ height="35"
+ id="svg2919"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="menu_scomment_bg.svg">
+ <defs
+ id="defs2921">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2927" />
+ <inkscape:perspective
+ id="perspective2908"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5448"
+ id="linearGradient5460"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="768"
+ x2="0"
+ y2="713.1153"
+ gradientTransform="translate(0,-2)" />
+ <linearGradient
+ id="linearGradient5448">
+ <stop
+ style="stop-color:#beb7c8;stop-opacity:1;"
+ offset="0"
+ id="stop5450" />
+ <stop
+ style="stop-color:#beb7c8;stop-opacity:0;"
+ offset="1"
+ id="stop5452" />
+ </linearGradient>
+ <linearGradient
+ y2="713.1153"
+ x2="0"
+ y1="768"
+ x1="0"
+ gradientTransform="matrix(1.0001729,0,0,0.66978968,-0.08644188,537.20848)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2917"
+ xlink:href="#linearGradient5448"
+ inkscape:collect="always" />
+ <inkscape:perspective
+ id="perspective2956"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2821"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5448"
+ id="linearGradient2822"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.99852984,0,0,0.66980918,0.81308358,537.19399)"
+ x1="0"
+ y1="768"
+ x2="0"
+ y2="713.1153" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.70710678"
+ inkscape:cx="479.0479"
+ inkscape:cy="122.05966"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1280"
+ inkscape:window-height="725"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata2924">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-1017.3622)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.8263821;stroke-opacity:1"
+ id="rect3982-4"
+ width="999.17365"
+ height="34.173618"
+ x="0.41319105"
+ y="1017.7752"
+ rx="10"
+ ry="10" />
+ <rect
+ style="fill:url(#linearGradient2822);fill-opacity:1;stroke:none"
+ id="rect3982"
+ width="998.52972"
+ height="33.490456"
+ x="0.81308591"
+ y="1018.1172"
+ rx="10"
+ ry="10" />
+ </g>
+</svg>
|
|
From: Peque <ms...@us...> - 2009-12-24 19:36:50
|
Module: performous
Branch: master
Commit: 9ac4d1ff1f73926d2566806a47f0005d14988323
Author: Miguel Sánchez de León Peque <msd...@gm...>
Date: Thu Dec 24 20:35:28 2009 +0100
Again very little change for screen_songs
---
game/songs.cc | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/game/songs.cc b/game/songs.cc
index c0e82db..e0c3732 100644
--- a/game/songs.cc
+++ b/game/songs.cc
@@ -199,12 +199,12 @@ namespace {
static char const* order[] = {
"random order",
- "by song",
- "by artist",
- "by edition",
- "by genre",
- "by path",
- "by language"
+ "sorted by song",
+ "sorted by artist",
+ "sorted by edition",
+ "sorted by genre",
+ "sorted by path",
+ "sorted by language"
};
static const int orders = sizeof(order) / sizeof(*order);
|
|
From: Peque <ms...@us...> - 2009-12-24 18:41:51
|
Module: performous
Branch: master
Commit: 98089e250b63d125c5854ca2b7cc359c355b29c5
Author: Miguel Sánchez de León Peque <msd...@gm...>
Date: Thu Dec 24 19:41:04 2009 +0100
Filter in screen_songs stands after playing a song
---
game/screen_songs.cc | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 4c2aa42..4bb6ecf 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -26,7 +26,6 @@ void ScreenSongs::enter() {
m_instrumentCover.reset(new Surface(getThemePath("instrument_cover.svg")));
m_bandCover.reset(new Surface(getThemePath("band_cover.svg")));
m_instrumentList.reset(new Texture(getThemePath("instruments.svg")));
- m_search.text.clear();
m_songs.setFilter(m_search.text);
m_audio.fadeout();
m_jukebox = false;
|
|
From: Peque <ms...@us...> - 2009-12-24 18:40:13
|
Module: performous
Branch: master
Commit: 4b001e649626264d66e2ea2ced4a8384629d3ef0
Author: Miguel Sánchez de León Peque <msd...@gm...>
Date: Thu Dec 24 19:39:06 2009 +0100
Revert "Filter in screen_songs stands after playing a song."
This reverts commit 8089feffbd2da543f1b15b76facc652be0ee7304.
---
game/screen_songs.cc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 4bb6ecf..4c2aa42 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -26,6 +26,7 @@ void ScreenSongs::enter() {
m_instrumentCover.reset(new Surface(getThemePath("instrument_cover.svg")));
m_bandCover.reset(new Surface(getThemePath("band_cover.svg")));
m_instrumentList.reset(new Texture(getThemePath("instruments.svg")));
+ m_search.text.clear();
m_songs.setFilter(m_search.text);
m_audio.fadeout();
m_jukebox = false;
|
|
From: Peque <ms...@us...> - 2009-12-24 18:22:27
|
Module: performous
Branch: master
Commit: 8089feffbd2da543f1b15b76facc652be0ee7304
Author: root <ro...@vo...>
Date: Thu Dec 24 19:14:55 2009 +0100
Filter in screen_songs stands after playing a song.
---
game/screen_songs.cc | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 4c2aa42..4bb6ecf 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -26,7 +26,6 @@ void ScreenSongs::enter() {
m_instrumentCover.reset(new Surface(getThemePath("instrument_cover.svg")));
m_bandCover.reset(new Surface(getThemePath("band_cover.svg")));
m_instrumentList.reset(new Texture(getThemePath("instruments.svg")));
- m_search.text.clear();
m_songs.setFilter(m_search.text);
m_audio.fadeout();
m_jukebox = false;
|
|
From: Peque <ms...@us...> - 2009-12-24 16:26:57
|
Module: performous
Branch: master
Commit: e4f316b0a2c66362a6c4194f2e59161f510c8819
Author: Miguel Sánchez de León Peque <msd...@gm...>
Date: Thu Dec 24 17:26:07 2009 +0100
Filter and order separated in two lines in screen_songs
---
game/screen_songs.cc | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 9e4439d..4c2aa42 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -187,7 +187,8 @@ void ScreenSongs::draw() {
Song& song = m_songs.current();
// Format the song information text
oss_song << song.title << '\n' << song.artist;
- oss_order << (m_search.text.empty() ? m_songs.sortDesc() : m_search.text) << '\n';
+ oss_order << "filter: " << (m_search.text.empty() ? "none" : m_search.text) << '\n';
+ oss_order << m_songs.sortDesc() << '\n';
oss_order << "(" << m_songs.currentId() + 1 << "/" << m_songs.size() << ")";
double spos = m_songs.currentPosition(); // This needs to be polled to run the animation
if (!m_jukebox) {
@@ -314,6 +315,6 @@ void ScreenSongs::draw() {
// Force reload of data
m_playing.clear();
}
- } else if (!m_audio.isPaused() && m_playTimer.get() > IDLE_TIMEOUT) m_songs.random(); // Switch if song hasn't changed for IDLE_TIMEOUT seconds
+ } else if (!m_audio.isPaused() && m_playTimer.get() > IDLE_TIMEOUT) m_songs.advance(1); // Switch if song hasn't changed for IDLE_TIMEOUT seconds
}
|
|
From: Peque <ms...@us...> - 2009-12-24 16:24:26
|
Module: performous
Branch: master
Commit: 747d5f7384356c04b1cfc951216f5ae0572f06bd
Author: Miguel Sánchez de León Peque <msd...@gm...>
Date: Thu Dec 24 17:23:53 2009 +0100
Revert "Filter and order separated in two lines in screen_songs"
This reverts commit 4090786260f59842c064b69aafe12f64235f34a0.
---
game/screen_songs.cc | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 741352a..9e4439d 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -10,7 +10,7 @@
#include <iostream>
#include <sstream>
-static const double IDLE_TIMEOUT = 10.0; // seconds
+static const double IDLE_TIMEOUT = 45.0; // seconds
ScreenSongs::ScreenSongs(std::string const& name, Audio& audio, Songs& songs):
Screen(name), m_audio(audio), m_songs(songs), m_covers(20), m_jukebox()
@@ -187,8 +187,7 @@ void ScreenSongs::draw() {
Song& song = m_songs.current();
// Format the song information text
oss_song << song.title << '\n' << song.artist;
- oss_order << "filter: " << (m_search.text.empty() ? "none" : m_search.text) << '\n';
- oss_order << m_songs.sortDesc() << '\n';
+ oss_order << (m_search.text.empty() ? m_songs.sortDesc() : m_search.text) << '\n';
oss_order << "(" << m_songs.currentId() + 1 << "/" << m_songs.size() << ")";
double spos = m_songs.currentPosition(); // This needs to be polled to run the animation
if (!m_jukebox) {
@@ -315,6 +314,6 @@ void ScreenSongs::draw() {
// Force reload of data
m_playing.clear();
}
- } else if (!m_audio.isPaused() && m_playTimer.get() > IDLE_TIMEOUT) m_songs.advance(1); // Switch if song hasn't changed for IDLE_TIMEOUT seconds
+ } else if (!m_audio.isPaused() && m_playTimer.get() > IDLE_TIMEOUT) m_songs.random(); // Switch if song hasn't changed for IDLE_TIMEOUT seconds
}
|
|
From: Peque <ms...@us...> - 2009-12-24 16:20:59
|
Module: performous
Branch: master
Commit: 4090786260f59842c064b69aafe12f64235f34a0
Author: root <ro...@vo...>
Date: Thu Dec 24 17:19:34 2009 +0100
Filter and order separated in two lines in screen_songs
---
game/screen_songs.cc | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 9e4439d..741352a 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -10,7 +10,7 @@
#include <iostream>
#include <sstream>
-static const double IDLE_TIMEOUT = 45.0; // seconds
+static const double IDLE_TIMEOUT = 10.0; // seconds
ScreenSongs::ScreenSongs(std::string const& name, Audio& audio, Songs& songs):
Screen(name), m_audio(audio), m_songs(songs), m_covers(20), m_jukebox()
@@ -187,7 +187,8 @@ void ScreenSongs::draw() {
Song& song = m_songs.current();
// Format the song information text
oss_song << song.title << '\n' << song.artist;
- oss_order << (m_search.text.empty() ? m_songs.sortDesc() : m_search.text) << '\n';
+ oss_order << "filter: " << (m_search.text.empty() ? "none" : m_search.text) << '\n';
+ oss_order << m_songs.sortDesc() << '\n';
oss_order << "(" << m_songs.currentId() + 1 << "/" << m_songs.size() << ")";
double spos = m_songs.currentPosition(); // This needs to be polled to run the animation
if (!m_jukebox) {
@@ -314,6 +315,6 @@ void ScreenSongs::draw() {
// Force reload of data
m_playing.clear();
}
- } else if (!m_audio.isPaused() && m_playTimer.get() > IDLE_TIMEOUT) m_songs.random(); // Switch if song hasn't changed for IDLE_TIMEOUT seconds
+ } else if (!m_audio.isPaused() && m_playTimer.get() > IDLE_TIMEOUT) m_songs.advance(1); // Switch if song hasn't changed for IDLE_TIMEOUT seconds
}
|
|
From: Peque <ms...@us...> - 2009-12-24 15:13:57
|
Module: performous
Branch: master
Commit: 605e6f1d706425e778455b7a9b8ba518dbb3560a
Author: Miguel Sánchez de León Peque <mi...@vo...>
Date: Thu Dec 24 16:10:20 2009 +0100
Song filter stands after timeout
---
game/screen_songs.cc | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 05a90e0..9e4439d 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -314,9 +314,6 @@ void ScreenSongs::draw() {
// Force reload of data
m_playing.clear();
}
- } else if (!m_audio.isPaused() && m_playTimer.get() > IDLE_TIMEOUT) { // Switch if song hasn't changed for IDLE_TIMEOUT seconds
- if (!m_search.text.empty()) { m_search.text.clear(); m_songs.setFilter(m_search.text); }
- m_songs.random();
- }
+ } else if (!m_audio.isPaused() && m_playTimer.get() > IDLE_TIMEOUT) m_songs.random(); // Switch if song hasn't changed for IDLE_TIMEOUT seconds
}
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-12-24 02:29:52
|
Module: performous
Branch: master
Commit: c276173159dfc982b2aa2ff4f2f5244181d32769
Author: Lasse Karkkainen <tro...@tr...>
Date: Thu Dec 24 04:29:03 2009 +0200
Hardcoded MIDI drum mapping and support for multiple MIDI drum sets (in theory)
---
game/joystick.cc | 20 ++++++++++++++++----
game/joystick.hh | 3 +++
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/game/joystick.cc b/game/joystick.cc
index 527f6fc..aa67b08 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -4,10 +4,17 @@
#include <boost/lexical_cast.hpp>
#ifdef USE_PORTMIDI
-input::MidiDrums::MidiDrums(int devId): stream(devId) {
- Private::devices[0x8000] = Private::InputDevPrivate(Private::DRUMS_MIDI);
+input::MidiDrums::MidiDrums(int devId): stream(devId), devnum(0x8000 + devId) {
+ Private::devices[devnum] = Private::InputDevPrivate(Private::DRUMS_MIDI);
event.type = Event::PRESS;
for (unsigned int i = 0; i < BUTTONS; ++i) event.pressed[i] = false;
+ map[35] = map[36] = 0; // Bass drum 1/2
+ map[38] = map[40] = 1; // Snare 1/2
+ map[42] = map[46] = 2; // Hi-hat closed/open
+ map[41] = map[43] = 3; // Tom low 1/2
+ map[45] = map[47] = 3; // Tom mid 1/2
+ map[48] = map[50] = 3; // Tom high 1/2
+ map[49] = map[51] = 4; // Cymbal crash/ride
}
void input::MidiDrums::process() {
@@ -16,9 +23,14 @@ void input::MidiDrums::process() {
if ((ev.message & 0xFF) != 0x99) continue;
unsigned char ch = ev.message >> 8;
//unsigned char vel = ev.message >> 16;
- event.button = ch % 5;
+ Map::const_iterator it = map.find(ch);
+ if (it == map.end()) {
+ std::cout << "Unassigned MIDI drum event: channel " << ch << std::endl;
+ continue;
+ }
+ event.button = it->second;
event.time = now();
- Private::devices[0x8000].addEvent(event);
+ Private::devices[devnum].addEvent(event);
}
}
#endif
diff --git a/game/joystick.hh b/game/joystick.hh
index bde131a..529c6b4 100644
--- a/game/joystick.hh
+++ b/game/joystick.hh
@@ -165,7 +165,10 @@ namespace input {
void process();
private:
pm::Input stream;
+ unsigned int devnum;
Event event;
+ typedef std::map<unsigned, unsigned> Map;
+ Map map;
};
#endif
|
|
From: Stefano A. <xa...@us...> - 2009-12-23 22:49:08
|
Module: performous Branch: master Commit: 7c81e50a66ab57f6a8f5732f3bd16cab878faf72 Author: Xaldyz <xa...@us...> Date: Wed Dec 23 23:47:31 2009 +0100 Merge branch 'master' of ssh://performous.git.sourceforge.net/gitroot/performous/performous --- |
|
From: Stefano A. <xa...@us...> - 2009-12-23 22:49:06
|
Module: performous
Branch: master
Commit: ba68c919e21177708790fbadc4e31a2a91d81c99
Author: Xaldyz <xa...@us...>
Date: Wed Dec 23 23:46:43 2009 +0100
Added FindMsgfmt.cmake
Fixed Msgfmt script to don't break the compilation if there is no msgfmt program available
Added locale support into Linux
---
CMakeLists.txt | 21 +++++++++++++++------
cmake/Modules/FindGettext.cmake | 7 -------
cmake/Modules/FindMsgfmt.cmake | 13 +++++++++++++
game/config.cmake.hh | 2 ++
game/main.cc | 8 +++++---
lang/CMakeLists.txt | 4 ++--
6 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00e61e3..21bfaa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,23 +32,32 @@ mark_as_advanced(SHARE_INSTALL)
include_directories(libs/plugin++/include)
include_directories(libs/libda/include)
-add_subdirectory(libs)
-add_subdirectory(themes)
-add_subdirectory(data)
-add_subdirectory(game)
-add_subdirectory(docs)
+#need to put here do setting LOCALE_DIR variable
find_package(Gettext)
if(Gettext_FOUND)
if(WIN32)
SET(LOCALE_DIR "../locale")
+ else()#other os
+ SET(LOCALE_DIR "/usr/share/locale")
endif(WIN32)
if(NOT LOCALE_DIR)
message(QUIET "Set LOCALE_DIR to path to get Gettext working")
else()
- add_subdirectory(lang)
+ find_package(msgfmt)
+ if(Msgfmt_FOUND)
+ message(STATUS "Found msgfmt to convert language file. Translation enabled")
+ add_subdirectory(lang)
+ else()
+ message(STATUS "Cannot find msgfmt to convert language file. Translation won't be enabled")
+ endif()
endif(NOT LOCALE_DIR)
endif(Gettext_FOUND)
+add_subdirectory(libs)
+add_subdirectory(themes)
+add_subdirectory(data)
+add_subdirectory(game)
+add_subdirectory(docs)
set(LIB_SUFFIX "" CACHE STRING "Optional suffix to use on lib folders (e.g. 64 for lib64)")
diff --git a/cmake/Modules/FindGettext.cmake b/cmake/Modules/FindGettext.cmake
index d29827d..251dc88 100644
--- a/cmake/Modules/FindGettext.cmake
+++ b/cmake/Modules/FindGettext.cmake
@@ -34,10 +34,3 @@ find_path(Gettext_INCLUDE_DIR
set(Gettext_PROCESS_INCLUDES Gettext_INCLUDE_DIR)
libfind_process(Gettext)
-
-if(Gettext_FOUND)
- find_program(MSGFMT msgfmt)
- if(NOT MSGFMT)
- message(FATAL_ERROR "Cannot find msgfmt to convert language file. Please specify path of msgfmt")
- endif(NOT MSGFMT)
-endif(Gettext_FOUND)
\ No newline at end of file
diff --git a/cmake/Modules/FindMsgfmt.cmake b/cmake/Modules/FindMsgfmt.cmake
new file mode 100644
index 0000000..8238cd1
--- /dev/null
+++ b/cmake/Modules/FindMsgfmt.cmake
@@ -0,0 +1,13 @@
+# - Try to find Msgfmt
+# Once done, this will define
+#
+# Msgfmt_FOUND - system has Gettext
+# Msgfmt_BIN - path to binary file
+
+find_program(Msgfmt_BIN msgfmt)
+
+if(Msgfmt_BIN)
+ set(Msgfmt_FOUND 1)
+else()
+ set(Msgfmt_FOUND 0)
+endif(Msgfmt_BIN)
\ No newline at end of file
diff --git a/game/config.cmake.hh b/game/config.cmake.hh
index d4b5fc0..300ba05 100644
--- a/game/config.cmake.hh
+++ b/game/config.cmake.hh
@@ -4,6 +4,8 @@
#ifndef PERFORMOUS_CONFIG_HH
#define PERFORMOUS_CONFIG_HH
+#define LOCALEDIR "@LOCALE_DIR@"
+
#define PACKAGE "@CMAKE_PROJECT_NAME@"
#define VERSION "@PROJECT_VERSION@"
diff --git a/game/main.cc b/game/main.cc
index 3e9414a..bcf3062 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -207,10 +207,12 @@ template <typename Container> void confOverride(Container const& c, std::string
}
int main(int argc, char** argv) {
+#ifdef USE_GETTEXT
// initialize gettext
- setlocale (LC_ALL, "");
- bindtextdomain (PACKAGE, "../locale");
- textdomain (PACKAGE);
+ setlocale (LC_MESSAGES, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
+#endif
std::cout << PACKAGE " " VERSION << std::endl;
std::signal(SIGINT, quit);
diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt
index 5dcecef..7c141dd 100644
--- a/lang/CMakeLists.txt
+++ b/lang/CMakeLists.txt
@@ -3,6 +3,6 @@ file(GLOB LANGUAGES *.po)
foreach(language ${LANGUAGES})
string(REGEX REPLACE "(.+(\\\\|/))+" "" language ${language})
string(REGEX REPLACE "\\.po$" "" language ${language})
- execute_process(COMMAND ${MSGFMT} ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po -o ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo DESTINATION ${LOCALE_DIR}/${language}/LC_MESSAGES/${CMAKE_PROJECT_NAME}.mo)
+ execute_process(COMMAND ${Msgfmt_BIN} ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po -o ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo DESTINATION ${LOCALE_DIR}/${language}/LC_MESSAGES RENAME ${CMAKE_PROJECT_NAME}.mo)
endforeach(language)
\ No newline at end of file
|
|
From: Yoda-JM <yo...@us...> - 2009-12-23 20:11:13
|
Module: performous
Branch: master
Commit: 507876f933b5cd59070104928a32236bbc891c92
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Dec 23 21:10:56 2009 +0100
Fixed horrible copy paste a bit
---
game/screen_sing.cc | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index aecdbfb..27899b7 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -59,28 +59,21 @@ void ScreenSing::enter() {
if( !m_song->track_map.empty() ) {
// Here we load alternatively guitar/bass tracks until no guitar controler is available
// then we load all the drums tracks until no drum controler is available (and place them in second position)
- bool no_guitar = false;
- bool no_guitar2 = false;
- bool no_guitar3 = false;
- bool no_bass = false;
+ std::vector<std::string> instrument_tracks;
+ instrument_tracks.push_back("guitar");
+ instrument_tracks.push_back("coop guitar");
+ instrument_tracks.push_back("bass");
+ instrument_tracks.push_back("rhythm guitar");
while (1) {
- try {
- Instruments::iterator it = m_instruments.end();
- m_instruments.insert(it, new GuitarGraph(m_audio, *m_song, "guitar"));
- } catch (std::runtime_error&) {no_guitar = true;}
- try {
- Instruments::iterator it = m_instruments.end();
- m_instruments.insert(it, new GuitarGraph(m_audio, *m_song, "coop guitar"));
- } catch (std::runtime_error&) {no_guitar2 = true;}
- try {
- Instruments::iterator it = m_instruments.end();
- m_instruments.insert(it, new GuitarGraph(m_audio, *m_song, "bass"));
- } catch (std::runtime_error&) {no_bass = true;}
- try {
- Instruments::iterator it = m_instruments.end();
- m_instruments.insert(it, new GuitarGraph(m_audio, *m_song, "rhythm guitar"));
- } catch (std::runtime_error&) {no_guitar3 = true;}
- if( no_guitar && no_guitar2 && no_guitar3 && no_bass ) break;
+ bool assigned = false;
+ for (std::vector<std::string>::const_iterator it = instrument_tracks.begin(); it != instrument_tracks.end(); ++it) {
+ try {
+ Instruments::iterator ite = m_instruments.end();
+ m_instruments.insert(ite, new GuitarGraph(m_audio, *m_song, *it));
+ assigned = true;
+ } catch (std::runtime_error&) {}
+ }
+ if( !assigned ) break;
}
while(1) {
try {
|
