performous-commit Mailing List for Performous (Page 107)

The All-in-One music game

Brought to you by: aave000, tronic, yoda-jm

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

Flat | Threaded

<< < 1 .. 105 106 107 108 109 .. 163 > >> (Page 107 of 163)

[Performous-commit] Xaldyz : Fixed SVG that cause crashes under Windows ( and relative code to display them)

From: Stefano A. <xa...@us...> - 2010-01-09 20:35:11

Module: performous
Branch: master
Commit: b9ddc78aa49d7c9716c541a4fc0ce5af679b2736

Author: Xaldyz <xa...@us...>
Date:   Sat Jan  9 21:34:50 2010 +0100

Fixed SVG that cause crashes under Windows (and relative code to display them)

---

 game/screen_sing.cc               |   10 +-----
 game/screen_sing.hh               |    2 -
 themes/default/instrumenthelp.svg |   64 ++++++++++++++++++++++--------------
 themes/default/sing_pause.svg     |   58 +++++++++++++++++-----------------
 4 files changed, 69 insertions(+), 65 deletions(-)

[Performous-commit] Xaldyz : Merge branch 'master' of ssh://performous.git.sourceforge.net/ gitroot/performous/performous

From: Stefano A. <xa...@us...> - 2010-01-09 17:44:22

Module: performous
Branch: master
Commit: 51c9c1dc5c68b9f267e62b61341b24716ad274df

Author: Xaldyz <xa...@us...>
Date:   Sat Jan  9 18:43:46 2010 +0100

Merge branch 'master' of ssh://performous.git.sourceforge.net/gitroot/performous/performous

---

[Performous-commit] Xaldyz : Fixed build on Visual Studio of surface.cc

From: Stefano A. <xa...@us...> - 2010-01-09 17:44:16

Module: performous
Branch: master
Commit: 53c1b899a10e8f301cbf5c5b935cf2ecd04c388c

Author: Xaldyz <xa...@us...>
Date:   Sat Jan  9 18:42:17 2010 +0100

Fixed build on Visual Studio of surface.cc

---

 game/surface.cc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/game/surface.cc b/game/surface.cc
index 981215f..70bfd44 100644
--- a/game/surface.cc
+++ b/game/surface.cc
@@ -10,7 +10,10 @@
 #include <sstream>
 #include <vector>
 
+#include <cctype>
 
+#include <boost/cstdint.hpp>
+using boost::uint32_t;
 
 float Dimensions::screenY() const {
 	switch (m_screenAnchor) {

[Performous-commit] Tapio Vierros : Use Start as fallback Godmode switch for now.

From: Tapio V. <aa...@us...> - 2010-01-09 16:08:43

Module: performous
Branch: master
Commit: 02e431599bca9531e835dfc4c1bcee68e78f823a

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Jan  9 18:07:41 2010 +0200

Use Start as fallback Godmode switch for now.

---

 game/guitargraph.cc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 9805489..2098934 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -162,7 +162,7 @@ void GuitarGraph::engine() {
 		if (m_jointime == not_joined) m_jointime = (time < 0.0 ? -join_delay : time); // Handle joining
 		// Handle Start/Select keypresses
 		if (ev.type == input::Event::PRESS && ev.button > input::STARPOWER_BUTTON) {
-			if (ev.button == 8) ev.button = input::STARPOWER_BUTTON; // Select works for GodMode
+			if (ev.button == 9) ev.button = input::STARPOWER_BUTTON; // Start works for GodMode
 			else continue;
 		}
 		// Guitar specific actions

[Performous-commit] Tapio Vierros : Append " (kbd)" to end of dance/ drum tracks played with keyboard.

From: Tapio V. <aa...@us...> - 2010-01-09 15:57:25

Module: performous
Branch: master
Commit: d70acb792311050e91ed339154c01b1f80602e22

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Jan  9 17:56:14 2010 +0200

Append " (kbd)" to end of dance/drum tracks played with keyboard.

---

 game/dancegraph.cc  |    6 +++++-
 game/guitargraph.cc |    6 +++++-
 game/joystick.hh    |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index 0d005ec..0ad5e25 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -130,7 +130,11 @@ bool DanceGraph::dead() const {
 }
 
 /// Get the difficulty as displayable string
-std::string DanceGraph::getDifficultyString() const { return diffv[m_level]; }
+std::string DanceGraph::getDifficultyString() const {
+	std::string ret = diffv[m_level];
+	if (m_input.isKeyboard()) ret += " (kbd)";
+	return ret;
+}
 
 /// Attempt to change the difficulty by a step
 void DanceGraph::difficultyDelta(int delta) {
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 25d5e6d..9805489 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -432,7 +432,11 @@ void GuitarGraph::nextTrack() {
 }
 
 /// Get the difficulty as displayable string
-std::string GuitarGraph::getDifficultyString() const { return diffv[m_level].name; }
+std::string GuitarGraph::getDifficultyString() const {
+	std::string ret = diffv[m_level].name;
+	if (m_drums && m_input.isKeyboard()) ret += " (kbd)";
+	return ret;
+}
 
 /// Find an initial difficulty level to use
 void GuitarGraph::difficultyAuto(bool tryKeep) {
diff --git a/game/joystick.hh b/game/joystick.hh
index e178a74..a7ddb7f 100644
--- a/game/joystick.hh
+++ b/game/joystick.hh
@@ -147,7 +147,7 @@ namespace input {
 		bool tryPoll(Event& _e) {return input::Private::devices.find(m_device_id)->second.tryPoll(_e);};
 		void addEvent(Event _e) {input::Private::devices.find(m_device_id)->second.addEvent(_e);};
 		bool pressed(int _button) {return input::Private::devices.find(m_device_id)->second.pressed(_button);}; // Current state
-		bool isKeyboard() {return (m_device_id == input::Private::KEYBOARD_ID || m_device_id == input::Private::KEYBOARD_ID2 || m_device_id == input::Private::KEYBOARD_ID3);};
+		bool isKeyboard() const {return (m_device_id == input::Private::KEYBOARD_ID || m_device_id == input::Private::KEYBOARD_ID2 || m_device_id == input::Private::KEYBOARD_ID3);};
 	  private:
 		unsigned int m_device_id; // should be some kind of reference
 	};

[Performous-commit] Lasse Karkkainen : Fix sorting of songs when filtering is used at the time the loading finishes

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2010-01-09 15:54:11

Module: performous
Branch: master
Commit: 612bced42c7aef96942c8bfee0e7cd48858aa886

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Jan  9 17:53:54 2010 +0200

Fix sorting of songs when filtering is used at the time the loading finishes

---

 game/songs.cc |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/game/songs.cc b/game/songs.cc
index 7313356..9d5e499 100644
--- a/game/songs.cc
+++ b/game/songs.cc
@@ -114,13 +114,8 @@ class Songs::RestoreSel {
 };
 
 void Songs::update() {
-	if (m_dirty) filter_internal();
-	// Shuffle the songlist if shuffle is finished and all songs are already filtered
-	if (m_needShuffle && !m_dirty) {
-		RestoreSel restore(*this);
-		randomize_internal();
-		m_needShuffle = false;
-	}
+	if (m_dirty) filter_internal(); // Update with newly loaded songs
+	if (m_needShuffle) randomize(); // Shuffle the songlist if needed
 }
 
 void Songs::randomize() {
@@ -129,6 +124,8 @@ void Songs::randomize() {
 }
 
 void Songs::randomize_internal() {
+	boost::mutex::scoped_lock l(m_mutex);
+	m_needShuffle = false;
 	/* TR1-based random number generation
 	TODO: it is enough that random_device is initialized once and not for every randomize_internal
 	namespace rnd = std::tr1;
@@ -137,7 +134,7 @@ void Songs::randomize_internal() {
 	for (SongVector::const_iterator it = m_filtered.begin(); it != m_filtered.end(); ++it) (*it)->randomIdx = gen();
 	*/
 	// Assign the songs randomIdx that is used for sorting in the "random" mode
-	for (SongVector::const_iterator it = m_filtered.begin(); it != m_filtered.end(); ++it) (*it)->randomIdx = std::rand();
+	for (SongVector::const_iterator it = m_songs.begin(); it != m_songs.end(); ++it) (*it)->randomIdx = std::rand();
 	m_order = 0;  // Use randomIdx sort mode
 	sort_internal();
 }

[Performous-commit] Tapio Vierros : Updated FI translation.

From: Tapio V. <aa...@us...> - 2010-01-09 15:02:47

Module: performous
Branch: master
Commit: c9fb1e45673836b037f4fc34332a1bd21928437e

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Jan  9 16:43:23 2010 +0200

Updated FI translation.

---

 lang/fi.po |   87 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/lang/fi.po b/lang/fi.po
index 723bb19..968bbd3 100644
--- a/lang/fi.po
+++ b/lang/fi.po
@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Performous\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-03 22:06+0200\n"
+"POT-Creation-Date: 2010-01-09 16:59+0200\n"
 "PO-Revision-Date: \n"
-"Last-Translator: Lasse KÃ¤rkkÃ¤inen <tro...@tr...>\n"
+"Last-Translator: Tapio Vierros <tap...@gm...>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,6 +61,63 @@ msgstr ""
 "\n"
 "SÃ¤Ã¤dÃ¤ Ã¤Ã¤niasetuksia ennen pelaamista."
 
+#: ../game/screen_sing.cc:330
+msgid "   ENTER to skip instrumental break"
+msgstr "   ENTER hypÃ¤tÃ¤ksesi lauluosaan"
+
+#: ../game/screen_sing.cc:331
+msgid "   Remember to wait for grading!"
+msgstr "   Muista odottaa arvostelua!"
+
+#: ../game/screen_sing.cc:419
+msgid "No player!"
+msgstr "Pelaajia ei lÃ¶ytynyt!"
+
+#: ../game/screen_sing.cc:428
+msgid "Hit singer"
+msgstr "TÃ¤hti"
+
+#: ../game/screen_sing.cc:429
+msgid "Lead singer"
+msgstr "Solisti"
+
+#: ../game/screen_sing.cc:430
+#: ../game/screen_sing.cc:436
+#: ../game/screen_sing.cc:442
+msgid "Rising star"
+msgstr "Harrastaja"
+
+#: ../game/screen_sing.cc:431
+#: ../game/screen_sing.cc:437
+#: ../game/screen_sing.cc:443
+msgid "Amateur"
+msgstr "AmatÃ¶Ã¶ri"
+
+#: ../game/screen_sing.cc:432
+#: ../game/screen_sing.cc:444
+msgid "Tone deaf"
+msgstr "Lahjaton"
+
+#: ../game/screen_sing.cc:434
+msgid "Maniac"
+msgstr "Maanikko"
+
+#: ../game/screen_sing.cc:435
+msgid "Hoofer"
+msgstr "Ekspertti"
+
+#: ../game/screen_sing.cc:438
+msgid "Loser"
+msgstr "Luuseri"
+
+#: ../game/screen_sing.cc:440
+msgid "Virtuoso"
+msgstr "Virtuoosi"
+
+#: ../game/screen_sing.cc:441
+msgid "Rocker"
+msgstr "Rokkari"
+
 #: ../game/songs.cc:204
 msgid "random order"
 msgstr "satunnainen jÃ¤rjestys"
@@ -89,11 +146,11 @@ msgstr "jÃ¤rjestetty polun mukaan"
 msgid "sorted by language"
 msgstr "jÃ¤rjestetty kielen mukaan"
 
-#: ../game/screen_songs.cc:178
+#: ../game/screen_songs.cc:185
 msgid "No songs found!"
 msgstr "Kappaleita ei lÃ¶ytynyt!"
 
-#: ../game/screen_songs.cc:179
+#: ../game/screen_songs.cc:186
 msgid ""
 "Visit performous.org\n"
 "for free songs"
@@ -101,47 +158,47 @@ msgstr ""
 "Hae ilmaista musiikkia\n"
 "osoitteesta performous.org"
 
-#: ../game/screen_songs.cc:181
+#: ../game/screen_songs.cc:188
 msgid "no songs match search"
 msgstr "yksikÃ¤Ã¤n kappale ei vastannut hakuasi"
 
-#: ../game/screen_songs.cc:188
+#: ../game/screen_songs.cc:195
 msgid "filter: "
 msgstr "suodatin: "
 
-#: ../game/screen_songs.cc:188
+#: ../game/screen_songs.cc:195
 msgid "none"
 msgstr "tyhjÃ¤"
 
-#: ../game/screen_players.cc:111
+#: ../game/screen_players.cc:110
 msgid "No players found!"
 msgstr "Pelaajia ei lÃ¶ytynyt!"
 
-#: ../game/screen_players.cc:112
+#: ../game/screen_players.cc:111
 msgid "Enter a name to create a new player."
 msgstr "SyÃ¶tÃ¤ nimi luodaksesi uuden pelaajan."
 
-#: ../game/screen_players.cc:114
+#: ../game/screen_players.cc:113
 msgid "Press enter to create player!"
 msgstr "Paina Enter luodaksesi pelaajan!"
 
-#: ../game/screen_players.cc:121
+#: ../game/screen_players.cc:120
 msgid "You reached %1% points!"
 msgstr "Sait %1% pistettÃ¤!"
 
-#: ../game/screen_players.cc:122
+#: ../game/screen_players.cc:121
 msgid "Change player with arrow keys."
 msgstr "Valitse pelaaja nuolinÃ¤ppÃ¤imillÃ¤."
 
-#: ../game/screen_players.cc:123
+#: ../game/screen_players.cc:122
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../game/screen_players.cc:126
+#: ../game/screen_players.cc:125
 msgid "Type text to filter or create a new player."
 msgstr "Kirjoita etsiÃ¤ksesi tai luodaksesi uuden pelaajan."
 
-#: ../game/screen_players.cc:126
+#: ../game/screen_players.cc:125
 msgid "Search Text:"
 msgstr "Etsi:"

[Performous-commit] Tapio Vierros : Fix joining in the middle of the game.

From: Tapio V. <aa...@us...> - 2010-01-09 15:02:42

Module: performous
Branch: master
Commit: edf2ef0d5ec86746d391383c973c6bf6a93c1ce3

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Jan  9 16:24:26 2010 +0200

Fix joining in the middle of the game.

---

 game/dancegraph.cc  |   58 ++++++++++++++++++++++++++------------------------
 game/guitargraph.cc |    3 ++
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index 1dd4bf3..0d005ec 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -171,6 +171,35 @@ void DanceGraph::engine() {
 		if (time < it->first + it->second) { time = it->first; break; } // Inside stop
 		time -= it->second;
 	}
+
+	bool difficulty_changed = false;
+	// Handle all events
+	for (input::Event ev; m_input.tryPoll(ev);) {
+		m_dead = 0; // Keep alive
+		if (m_jointime == not_joined) { // Handle joining
+			m_jointime = (time < 0.0 ? -join_delay : time);
+			break;
+		}
+		// Difficulty / mode selection
+		if (time < m_jointime + join_delay && ev.type == input::Event::PRESS) {
+			if (ev.pressed[STEP_UP]) difficultyDelta(1);
+			else if (ev.pressed[STEP_DOWN]) difficultyDelta(-1);
+			else if (ev.pressed[STEP_LEFT]) gameMode(-1);
+			else if (ev.pressed[STEP_RIGHT]) gameMode(1);
+			difficulty_changed = true;
+		}
+		// Gaming controls
+		if (ev.type == input::Event::RELEASE) {
+			m_pressed[ev.button] = false;
+			dance(time, ev);
+			m_pressed_anim[ev.button].setTarget(0.0);
+		} else if (ev.type == input::Event::PRESS) {
+			m_pressed[ev.button] = true;
+			dance(time, ev);
+			m_pressed_anim[ev.button].setValue(1.0);
+		}
+	}
+
 	// Notes gone by
 	for (DanceNotes::iterator& it = m_notesIt; it != m_notes.end() && time > it->note.end + maxTolerance; it++) {
 		if(!it->isHit) { // Missed
@@ -186,6 +215,7 @@ void DanceGraph::engine() {
 		}
 		++m_dead;
 	}
+	if (difficulty_changed) m_dead = 0; // if difficulty is changed, m_dead would get incorrect
 
 	// Holding button when mine comes?
 	for (DanceNotes::iterator it = m_notesIt; it != m_notes.end() && time <= it->note.begin + maxTolerance; it++) {
@@ -197,34 +227,6 @@ void DanceGraph::engine() {
 		}
 	}
 
-	// Handle all events
-	for (input::Event ev; m_input.tryPoll(ev);) {
-		m_dead = 0; // Keep alive
-		if (m_jointime == not_joined) { // Handle joining
-			m_jointime = (time < 0.0 ? -join_delay : time);
-			break;
-		}
-		// Difficulty / mode selection
-		if (time < m_jointime + join_delay) {
-			if (ev.type == input::Event::PRESS) {
-				if (ev.pressed[STEP_UP]) difficultyDelta(1);
-				else if (ev.pressed[STEP_DOWN]) difficultyDelta(-1);
-				else if (ev.pressed[STEP_LEFT]) gameMode(-1);
-				else if (ev.pressed[STEP_RIGHT]) gameMode(1);
-			}
-		}
-		// Gaming controls
-		if (ev.type == input::Event::RELEASE) {
-			m_pressed[ev.button] = false;
-			dance(time, ev);
-			m_pressed_anim[ev.button].setTarget(0.0);
-		} else if (ev.type == input::Event::PRESS) {
-			m_pressed[ev.button] = true;
-			dance(time, ev);
-			m_pressed_anim[ev.button].setValue(1.0);
-		}
-	}
-
 	// Check if a long streak goal has been reached
 	if (m_streak >= getNextBigStreak(m_bigStreak)) {
 		m_streakPopup.setTarget(1.0);
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index a13681d..25d5e6d 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -152,6 +152,7 @@ void GuitarGraph::engine() {
 	}
 	if (m_starpower.get() > 0.001) m_correctness.setTarget(1.0, true);
 	double whammy = 0;
+	bool difficulty_changed = false;
 	// Handle all events
 	for (input::Event ev; m_input.tryPoll(ev);) {
 		// This hack disallows joining with Enter-key for skipping instrumental
@@ -184,6 +185,7 @@ void GuitarGraph::engine() {
 				else if (ev.pressed[1 + m_drums]) difficulty(DIFFICULTY_EASY);
 				else if (ev.pressed[2 + m_drums]) difficulty(DIFFICULTY_MEDIUM);
 				else if (ev.pressed[3 + m_drums]) difficulty(DIFFICULTY_AMAZING);
+				difficulty_changed = true;
 			}
 		// Playing
 		} else if (m_drums) {
@@ -200,6 +202,7 @@ void GuitarGraph::engine() {
 		++m_dead;
 		++m_chordIt;
 	}
+	if (difficulty_changed) m_dead = 0; // if difficulty is changed, m_dead would get incorrect
 	// Adjust the correctness value
 	if (!m_events.empty() && m_events.back().type == 0) m_correctness.setTarget(0.0, true);
 	else if (m_chordIt != m_chords.end() && m_chordIt->begin <= time) {

[Performous-commit] Tapio Vierros : Seek 30s in previews with only one music file.

From: Tapio V. <aa...@us...> - 2010-01-09 15:02:36

Module: performous
Branch: master
Commit: 4b0e6b2fee0c86ab8354fc9b58a54cecb636f8c7

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Jan  9 12:42:46 2010 +0200

Seek 30s in previews with only one music file.

---

 game/screen_songs.cc |    8 ++++++--
 game/song.cc         |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index f2e39db..2f4996c 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -151,8 +151,12 @@ void ScreenSongs::stopMultimedia(ScreenSharedInfo& info) {
 	if (info.music != m_playing && m_playTimer.get() > 0.3) {
 		m_songbg.reset(); m_video.reset();
 		double pstart = 0;
-		if (!m_songs.empty()) pstart = m_songs.current().preview_start;
-		pstart = (pstart == pstart) ? std::min(pstart, 5.0) : 5.0; ///< this line is for performance (don't remove it unless you implement better seeking method in songs)
+		if (!m_songs.empty()) {
+			pstart = m_songs.current().preview_start;
+			if (pstart != pstart) pstart = 100; // true if NaN, 100 is caught in the next min
+			// 5.0s is for performance (don't make it higher unless you implement better seeking method in songs)
+			pstart = std::min(pstart, (info.music.size() == 1 ? 30.0 : 5.0)); // we can seek further in 1-track songs
+		}
 		if (info.music.empty()) m_audio.fadeout(1.0); else m_audio.playMusic(info.music, true, 2.0, (pstart ? pstart : 5.0));
 		if (!info.songbg.empty()) try { m_songbg.reset(new Surface(info.songbg)); } catch (std::exception const&) {}
 		if (!info.video.empty() && config["graphic/video"].b()) m_video.reset(new Video(info.video, info.videoGap));
diff --git a/game/song.cc b/game/song.cc
index 54665d7..c4227b9 100644
--- a/game/song.cc
+++ b/game/song.cc
@@ -28,7 +28,7 @@ void Song::reload(bool errorIgnore) {
 	noteMax = std::numeric_limits<int>::min();
 	videoGap = 0.0;
 	start = 0.0;
-	preview_start = 0.0;
+	preview_start = getNaN();
 	beginTime = endTime = getNaN();
 	m_scoreFactor = 0.0;
 	try { SongParser(*this); } catch (...) { if (!errorIgnore) throw; }

[Performous-commit] Tapio Vierros : Enable forward seeking in dancing.

From: Tapio V. <aa...@us...> - 2010-01-09 15:02:32

Module: performous
Branch: master
Commit: 91595cc79fad3fa826dba208556e15e97e5c22ef

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Jan  9 12:07:57 2010 +0200

Enable forward seeking in dancing.

---

 game/screen_sing.cc |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 6b2c268..ccfc908 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -250,14 +250,14 @@ void ScreenSing::manageEvent(SDL_Event event) {
 		if (key == SDLK_F4) ++config["audio/round-trip"];
 		if (key == SDLK_F5) --config["audio/controller_delay"];
 		if (key == SDLK_F6) ++config["audio/controller_delay"];
-		if (m_song->danceTracks.empty()) { // Seeking is currently not permitted for dance songs
-			bool seekback = false;
+		bool seekback = false;
+		if (m_song->danceTracks.empty()) { // Seeking backwards is currently not permitted for dance songs
 			if (key == SDLK_HOME) { m_audio.seekPos(0.0); seekback = true; }
 			if (key == SDLK_LEFT) { m_audio.seek(-5.0); seekback = true; }
-			if (key == SDLK_RIGHT) m_audio.seek(5.0);
-			// Some things must be reset after seeking backwards
-			if (seekback) m_layout_singer->reset();
 		}
+		if (key == SDLK_RIGHT) m_audio.seek(5.0);
+		// Some things must be reset after seeking backwards
+		if (seekback) m_layout_singer->reset();
 		// Reload current song
 		if (key == SDLK_r) {
 			exit(); m_song->reload(); enter();

[Performous-commit] Vincent Le Ligeour : Fixed typo in French translation

From: Yoda-JM <yo...@us...> - 2010-01-09 10:34:22

Module: performous
Branch: master
Commit: 61ff538940033c117df1fff6765891c5f9b4f4e9

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sat Jan  9 11:33:51 2010 +0100

Fixed typo in French translation

---

 lang/fr.po |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lang/fr.po b/lang/fr.po
index 945677e..e31f262 100644
--- a/lang/fr.po
+++ b/lang/fr.po
@@ -99,7 +99,7 @@ msgstr "Recherche:"
 
 #: ../game/screen_sing.cc:338
 msgid "   ENTER to skip instrumental break"
-msgstr "   \"EntrÃ©e\" to passer l'instrumental"
+msgstr "   \"EntrÃ©e\" pour passer l'instrumental"
 
 #: ../game/screen_sing.cc:339
 msgid "   Remember to wait for grading!"

[Performous-commit] Vincent Le Ligeour : Fixed dummy me thatthat read boost:: format documentation to quickly

From: Yoda-JM <yo...@us...> - 2010-01-09 09:38:09

Module: performous
Branch: master
Commit: c26dd143c527baaa87fd43a502625c18e02f17e0

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sat Jan  9 10:37:51 2010 +0100

Fixed dummy me thatthat read boost::format documentation to quickly

---

 game/screen_players.cc |    2 +-
 lang/es.po             |    4 ++--
 lang/fi.po             |    4 ++--
 lang/fr.po             |    4 ++--
 lang/it.po             |    4 ++--
 lang/performous.pot    |    2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/game/screen_players.cc b/game/screen_players.cc
index 961fe77..a099639 100644
--- a/game/screen_players.cc
+++ b/game/screen_players.cc
@@ -117,7 +117,7 @@ void ScreenPlayers::draw() {
 		// Format the player information text
 		oss_song << m_database.scores.front().track << '\n';
 		// TODO: use boost::format
-		oss_song << boost::format(_("You reached %1 points!")) % m_database.scores.front().score;
+		oss_song << boost::format(_("You reached %1% points!")) % m_database.scores.front().score;
 		oss_order << _("Change player with arrow keys.") << '\n'
 			<< _("Name:") << ' ' << m_players.current().name << '\n';
 		//m_database.queryPerPlayerHiscore(oss_order);
diff --git a/lang/es.po b/lang/es.po
index 2baf863..c32d418 100644
--- a/lang/es.po
+++ b/lang/es.po
@@ -82,8 +82,8 @@ msgid "Press enter to create player!"
 msgstr "Presiona \"enter\" para crear el nuevo jugador:"
 
 #: ../game/screen_players.cc:119
-msgid "You reached %1 points!"
-msgstr "Â¡Has conseguido %1 puntos!"
+msgid "You reached %1% points!"
+msgstr "Â¡Has conseguido %1% puntos!"
 
 #: ../game/screen_players.cc:120
 msgid "Change player with arrow keys."
diff --git a/lang/fi.po b/lang/fi.po
index 15496ea..723bb19 100644
--- a/lang/fi.po
+++ b/lang/fi.po
@@ -126,8 +126,8 @@ msgid "Press enter to create player!"
 msgstr "Paina Enter luodaksesi pelaajan!"
 
 #: ../game/screen_players.cc:121
-msgid "You reached %1 points!"
-msgstr "Sait %1 pistettÃ¤!"
+msgid "You reached %1% points!"
+msgstr "Sait %1% pistettÃ¤!"
 
 #: ../game/screen_players.cc:122
 msgid "Change player with arrow keys."
diff --git a/lang/fr.po b/lang/fr.po
index 17f4d92..945677e 100644
--- a/lang/fr.po
+++ b/lang/fr.po
@@ -78,8 +78,8 @@ msgid "Press enter to create player!"
 msgstr "Pressez Entrer pour crÃ©er un nouveau joueur!"
 
 #: ../game/screen_players.cc:119
-msgid "You reached %1 points!"
-msgstr "%1 points marquÃ©s!"
+msgid "You reached %1% points!"
+msgstr "%1% points marquÃ©s!"
 
 #: ../game/screen_players.cc:120
 msgid "Change player with arrow keys."
diff --git a/lang/it.po b/lang/it.po
index 677e765..f9f1e89 100644
--- a/lang/it.po
+++ b/lang/it.po
@@ -78,8 +78,8 @@ msgid "Press enter to create player!"
 msgstr "Premi invio per creare il giocatore!"
 
 #: ../game/screen_players.cc:119
-msgid "You reached %1 points!"
-msgstr "Hai fatto %1 punti!"
+msgid "You reached %1% points!"
+msgstr "Hai fatto %1% punti!"
 
 #: ../game/screen_players.cc:120
 msgid "Change player with arrow keys."
diff --git a/lang/performous.pot b/lang/performous.pot
index 41da930..c4ad2cd 100644
--- a/lang/performous.pot
+++ b/lang/performous.pot
@@ -79,7 +79,7 @@ msgid "Press enter to create player!"
 msgstr ""
 
 #: ../game/screen_players.cc:119
-msgid "You reached %1 points!"
+msgid "You reached %1% points!"
 msgstr ""
 
 #: ../game/screen_players.cc:120

[Performous-commit] Miguel Sánchez de León Peque : Added lost feature for muting vocals track ("CTRL+v" and "CTRL+SHIFT+v").

From: Peque <ms...@us...> - 2010-01-09 01:46:01

Module: performous
Branch: master
Commit: a0b0a896c3b2eb51aef760967856b3d4d0e419c8

Author: Miguel SÃ¡nchez de LeÃ³n Peque <peq...@ho...>
Date:   Sat Jan  9 02:43:36 2010 +0100

Added lost feature for muting vocals track ("CTRL+v" and "CTRL+SHIFT+v").

---

 game/screen_sing.cc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 0f1774b..6b2c268 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -240,6 +240,7 @@ void ScreenSing::manageEvent(SDL_Event event) {
 	// Ctrl combinations that can be used while performing (not when score dialog is displayed)
 	if (event.type == SDL_KEYDOWN && (event.key.keysym.mod & KMOD_CTRL) && !m_score_window.get()) {
 		if (key == SDLK_s) m_audio.toggleSynth(m_song->notes);
+		if (key == SDLK_v) m_audio.streamFade("vocals", event.key.keysym.mod & KMOD_SHIFT ? 1.0 : 0.0);
 		if (key == SDLK_k) ++config["game/karaoke_mode"]; // Toggle karaoke mode
 		if (key == SDLK_w) ++config["game/pitch"]; // Toggle pitch wave
 		// Latency settings

[Performous-commit] Miguel Sánchez de León Peque : Merge branch 'master' of ssh://git.performous.org/gitroot/performous/ performous

From: Peque <ms...@us...> - 2010-01-08 20:50:44

Module: performous
Branch: master
Commit: 2b279313696d3e8752d66f7daf8f5659b0758d5a

Author: Miguel SÃ¡nchez de LeÃ³n Peque <peq...@ho...>
Date:   Fri Jan  8 21:46:34 2010 +0100

Merge branch 'master' of ssh://git.performous.org/gitroot/performous/performous

---

[Performous-commit] Miguel Sánchez de León Peque : Added Fedora 12 to the supported distros in performous-packaging.cmake ( needs to be checked)

From: Peque <ms...@us...> - 2010-01-08 20:50:42

Module: performous
Branch: master
Commit: 009ad8ebb7fa763aade8d95a8cab85a3d47fc442

Author: Miguel SÃ¡nchez de LeÃ³n Peque <peq...@ho...>
Date:   Fri Jan  8 21:45:08 2010 +0100

Added Fedora 12 to the supported distros in performous-packaging.cmake (needs to be checked)

---

 cmake/performous-packaging.cmake |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/cmake/performous-packaging.cmake b/cmake/performous-packaging.cmake
index 9c0a1b7..5900e86 100644
--- a/cmake/performous-packaging.cmake
+++ b/cmake/performous-packaging.cmake
@@ -69,6 +69,24 @@ if(UNIX)
 			message("WARNING: ${LSB_DISTRIB} not supported yet.\nPlease set deps in cmake/performous-packaging.cmake before packaging.")
 		endif(NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
 	endif("${LSB_DISTRIB}" MATCHES "Ubuntu|Debian")
+	# For Fedora-based distros we want to create RPM packages.
+	if("${LSB_DISTRIB}" MATCHES "Fedora")
+		set(CPACK_GENERATOR "RPM")
+		# We need to alter the architecture names as per distro rules
+		if("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "i[3-6]86")
+			set(CPACK_PACKAGE_ARCHITECTURE i386)
+		endif("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "i[3-6]86")
+		if("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
+			set(CPACK_PACKAGE_ARCHITECTURE amd64)
+		endif("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
+		# Set the dependencies based on the distro version
+		if("${LSB_DISTRIB}" MATCHES "Fedora12")
+			set(CPACK_RPM_PACKAGE_REQUIRES "gettext, gtk2, cairo, librsvg2, libsigc++20, glibmm24, libxml++, ImageMagick-c++, boost, SDL, glew, ffmpeg, pulseaudio-libs")
+		endif("${LSB_DISTRIB}" MATCHES "Fedora12")
+		if(NOT CPACK_RPM_PACKAGE_REQUIRES)
+			message("WARNING: ${LSB_DISTRIB} not supported yet.\nPlease set deps in cmake/performous-packaging.cmake before packaging.")
+		endif(NOT CPACK_RPM_PACKAGE_REQUIRES)
+	endif("${LSB_DISTRIB}" MATCHES "Fedora")
 	set(CPACK_SYSTEM_NAME "${LSB_DISTRIB}-${CPACK_PACKAGE_ARCHITECTURE}")
 	message(STATUS "Detected ${CPACK_SYSTEM_NAME}. Use make package to build packages (${CPACK_GENERATOR}).")
 endif(UNIX)

[Performous-commit] Lasse Karkkainen : Fix bass drum broken by previous commit.

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2010-01-08 20:22:13

Module: performous
Branch: master
Commit: 224bc9b1fbd2f1a9bc7eb2a05b74fa2fd1065b7f

Author: Lasse Karkkainen <tro...@tr...>
Date:   Fri Jan  8 22:22:00 2010 +0200

Fix bass drum broken by previous commit.

---

 game/joystick.cc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/game/joystick.cc b/game/joystick.cc
index f894f48..1a6cdfd 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -491,7 +491,7 @@ bool input::SDL::pushEvent(SDL_Event _e) {
 					button++;
 				case SDLK_u:
 					button++;
-				case SDLK_b:
+				case SDLK_SPACE:
 					if(!drumkit) return false;
 					if(devices[joy_id].pressed(button)) return true; // repeating
 					is_drumkit_event = true;

[Performous-commit] Lasse Karkkainen : Keyboard drums uses SPACE as bass drum.

From: Lasse KÃ¤rkkÃ¤i. <tr...@us...> - 2010-01-08 20:14:30

Module: performous
Branch: master
Commit: f64c51da77a1fffde3ecfe4adc1ebc80ad51ffe8

Author: Lasse Karkkainen <tro...@tr...>
Date:   Fri Jan  8 22:12:38 2010 +0200

Keyboard drums uses SPACE as bass drum.
Screen sing quit/pause functionality redesigned.

---

 game/joystick.cc              |    2 +-
 game/screen_sing.cc           |   25 ++++---------
 themes/default/sing_pause.svg |   79 ++++++++++++++++++++---------------------
 3 files changed, 48 insertions(+), 58 deletions(-)

diff --git a/game/joystick.cc b/game/joystick.cc
index 16daab3..f894f48 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -350,7 +350,7 @@ bool input::SDL::pushEvent(SDL_Event _e) {
 					button++;
 				case SDLK_u:
 					button++;
-				case SDLK_b:
+				case SDLK_SPACE:
 					if(!drumkit) return false;
 					if(devices[joy_id].pressed(button)) return true; // repeating
 					is_drumkit_event = true;
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index e9835f4..0f1774b 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -203,29 +203,20 @@ void ScreenSing::manageEvent(SDL_Event event) {
 	Song::Status status = m_song->status(time);
 	input::NavButton nav(input::getNav(event));
 	int key = event.key.keysym.sym;
-	// A kludge to allow using space for navigation
-	if (event.type == SDL_KEYDOWN && key == SDLK_SPACE) nav = m_score_window.get() ? input::START : input::PAUSE;
-	// A kludge to allow using Esc for quitting through pause
-	if (event.type == SDL_KEYDOWN && key == SDLK_ESCAPE) nav = m_audio.isPaused() ? input::CANCEL : input::PAUSE;
-	// A kludge to use Start as Pause
-	if (nav == input::START && key != SDLK_RETURN) nav = input::PAUSE;
 	// Handle keys
 	if (nav != input::NONE) {
 		m_quitTimer.setValue(QUIT_TIMEOUT);
-		if (nav == input::CANCEL && (m_audio.isPaused() || m_score_window.get())) {
-			// In ScoreWindow cancel goes to Players, otherwise insta-quit to Songs
-			if (m_score_window.get()) activateNextScreen();
-			else ScreenManager::getSingletonPtr()->activateScreen("Songs");
-			return;
-		}
-		if (nav == input::PAUSE || (m_audio.isPaused() && nav == input::START)) {
-			m_audio.togglePause();
-			return;
-		}
+		if (nav == input::PAUSE || nav == input::CANCEL) m_audio.togglePause();
+		// When score window is displayed
 		if (m_score_window.get()) {
-			if (nav == input::START) activateNextScreen(); // Score window visible -> Start quits
+			if (nav == input::START || nav == input::CANCEL) activateNextScreen();
 			return;  // The rest are only available when score window is not displayed
 		}
+		// Confirm quit with START while paused or instant quit with CANCEL at the very beginning
+		if ((nav == input::START && m_audio.isPaused()) || (nav == input::CANCEL && time < 1.0)) {
+			ScreenManager::getSingletonPtr()->activateScreen("Songs");
+			return;
+		}
 		// Start button has special functions for skipping things (only in singing for now)
 		if (nav == input::START && m_only_singers_alive && !m_song->notes.empty() && !m_audio.isPaused()) {
 			// Open score dialog early
diff --git a/themes/default/sing_pause.svg b/themes/default/sing_pause.svg
index f67c910..b69e228 100644
--- a/themes/default/sing_pause.svg
+++ b/themes/default/sing_pause.svg
@@ -13,20 +13,27 @@
    height="400"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.47pre4 r22446"
    version="1.0"
    sodipodi:docname="sing_pause.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
-     id="defs4">
-    <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="perspective10" />
-  </defs>
+     id="defs4"><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="perspective10" />
+
+<inkscape:perspective
+   id="perspective2963"
+   inkscape:persp3d-origin="88 : 58.666667 : 1"
+   inkscape:vp_z="176 : 88 : 1"
+   inkscape:vp_y="0 : 1000 : 0"
+   inkscape:vp_x="0 : 88 : 1"
+   sodipodi:type="inkscape:persp3d" />
+</defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -70,48 +77,40 @@
        y="-69.25"
        rx="53.877144"
        ry="55.004662" />
-    <rect
-       style="fill:#000000;fill-opacity:0.99688475;stroke:none"
-       id="rect3155"
-       width="72"
-       height="150"
-       x="160"
-       y="20"
-       rx="0"
-       ry="0" />
-    <rect
-       style="fill:#000000;fill-opacity:0.99688475;stroke:none"
-       id="rect3157"
-       width="72"
-       height="150"
-       x="268"
-       y="20"
-       rx="0"
-       ry="0" />
     <text
        xml:space="preserve"
        style="font-size:49.19297028px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="267.95001"
-       y="-9.9983273"
+       x="266.86404"
+       y="10.673278"
        id="text3179"
        transform="scale(0.93017475,1.0750668)"><tspan
          sodipodi:role="line"
          id="tspan3181"
-         x="267.95001"
-         y="-9.9983273">PAUSE</tspan></text>
+         x="266.86404"
+         y="10.673278">QUIT NOW?</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:28px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="249.50768"
-       y="233.12689"
+       x="248.49753"
+       y="255.35025"
        id="text2817"><tspan
          sodipodi:role="line"
-         x="249.50768"
-         y="233.12689"
-         id="tspan2823">Enter/Start/Pause to continue</tspan><tspan
+         x="248.49753"
+         y="255.35025"
+         id="tspan2823">Enter/Start to quit</tspan><tspan
          sodipodi:role="line"
-         x="249.50768"
-         y="268.12692"
-         id="tspan2821">Esc/Select to quit</tspan></text>
+         x="248.49753"
+         y="290.35025"
+         id="tspan2821" /></text>
+    <g
+       id="g2966"
+       transform="translate(159.78738,34.3101)">
+      <path
+         id="path2955"
+         d="M 0,87.7 C 0,39.2 39.2,0 87.7,0 l 0,0 v 15 15 c -16,0 -30.3,6.4 -40.8,16.9 l 0,0 C 36.4,57.4 30,71.7 30,87.7 l 0,0 c 0,16 6.4,30.3 16.9,40.8 l 0,0 c 10.5,10.5 24.8,16.9 40.8,16.9 l 0,0 c 16,0 30.3,-6.4 40.8,-16.9 l 0,0 C 139,118 145.4,103.7 145.4,87.7 l 0,0 c 0,-16 -6.4,-30.3 -16.9,-40.8 l 0,0 C 118,36.4 103.6,30 87.7,30 l 0,0 V 15 0 c 48.4,0 87.7,39.2 87.7,87.7 l 0,0 c 0,48.4 -39.2,87.7 -87.7,87.7 l 0,0 C 39.2,175.3 0,136.1 0,87.7 l 0,0 z" />
+      <path
+         id="path2957"
+         d="m 72.7,115.4 v -55 c 0,-8.3 6.7,-15 15,-15 l 0,0 c 8.3,0 15,6.7 15,15 l 0,0 v 55 c 0,8.3 -6.7,15 -15,15 l 0,0 c -8.3,0 -15,-6.8 -15,-15 l 0,0 z" />
+    </g>
   </g>
 </svg>

[Performous-commit] Vincent Le Ligeour : Updated translation

From: Yoda-JM <yo...@us...> - 2010-01-08 20:09:20

Module: performous
Branch: master
Commit: e453f8fa468dc7e9d57e5a0d19d4a4a7ebc82e4c

Author: Vincent Le Ligeour <yo...@us...>
Date:   Fri Jan  8 21:09:03 2010 +0100

Updated translation

---

 game/screen_players.cc |    3 +-
 lang/es.po             |    8 +--
 lang/fi.po             |    8 +--
 lang/fr.po             |  131 ++++++++++++++++++++++++++++++++---------------
 lang/it.po             |    8 +--
 lang/performous.pot    |    6 +--
 6 files changed, 98 insertions(+), 66 deletions(-)

diff --git a/game/screen_players.cc b/game/screen_players.cc
index 80bb318..961fe77 100644
--- a/game/screen_players.cc
+++ b/game/screen_players.cc
@@ -13,6 +13,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <boost/format.hpp>
 
 ScreenPlayers::ScreenPlayers(std::string const& name, Audio& audio, Database& database):
   Screen(name), m_audio(audio), m_database(database), m_players(database.m_players), m_covers(20)
@@ -116,7 +117,7 @@ void ScreenPlayers::draw() {
 		// Format the player information text
 		oss_song << m_database.scores.front().track << '\n';
 		// TODO: use boost::format
-		oss_song << _("You reached") << ' ' << m_database.scores.front().score << ' ' << _("points!");
+		oss_song << boost::format(_("You reached %1 points!")) % m_database.scores.front().score;
 		oss_order << _("Change player with arrow keys.") << '\n'
 			<< _("Name:") << ' ' << m_players.current().name << '\n';
 		//m_database.queryPerPlayerHiscore(oss_order);
diff --git a/lang/es.po b/lang/es.po
index cf6a472..2baf863 100644
--- a/lang/es.po
+++ b/lang/es.po
@@ -82,12 +82,8 @@ msgid "Press enter to create player!"
 msgstr "Presiona \"enter\" para crear el nuevo jugador:"
 
 #: ../game/screen_players.cc:119
-msgid "You reached"
-msgstr "Â¡Has conseguido"
-
-#: ../game/screen_players.cc:119
-msgid "points!"
-msgstr "puntos!"
+msgid "You reached %1 points!"
+msgstr "Â¡Has conseguido %1 puntos!"
 
 #: ../game/screen_players.cc:120
 msgid "Change player with arrow keys."
diff --git a/lang/fi.po b/lang/fi.po
index 0fd65c0..15496ea 100644
--- a/lang/fi.po
+++ b/lang/fi.po
@@ -126,12 +126,8 @@ msgid "Press enter to create player!"
 msgstr "Paina Enter luodaksesi pelaajan!"
 
 #: ../game/screen_players.cc:121
-msgid "You reached"
-msgstr "Sait"
-
-#: ../game/screen_players.cc:121
-msgid "points!"
-msgstr "pistettÃ¤!"
+msgid "You reached %1 points!"
+msgstr "Sait %1 pistettÃ¤!"
 
 #: ../game/screen_players.cc:122
 msgid "Change player with arrow keys."
diff --git a/lang/fr.po b/lang/fr.po
index f548570..17f4d92 100644
--- a/lang/fr.po
+++ b/lang/fr.po
@@ -17,47 +17,47 @@ msgstr ""
 msgid "Hiscore for "
 msgstr "Records pour "
 
-#: ../game/screen_intro.cc:9 ../game/screen_intro.cc:10
+#: ../game/screen_intro.cc:10
 msgid "Perform"
 msgstr "Jouer"
 
-#: ../game/screen_intro.cc:9 ../game/screen_intro.cc:10
+#: ../game/screen_intro.cc:10
 msgid "Start performing!"
 msgstr "Commencer une partie!"
 
-#: ../game/screen_intro.cc:10 ../game/screen_intro.cc:11
+#: ../game/screen_intro.cc:11
 msgid "Practice"
 msgstr "S'exercer"
 
-#: ../game/screen_intro.cc:10 ../game/screen_intro.cc:11
+#: ../game/screen_intro.cc:11
 msgid "Check your skills or test the microphones"
 msgstr "Chauffer votre voix et tester les micros"
 
-#: ../game/screen_intro.cc:11 ../game/screen_intro.cc:12
+#: ../game/screen_intro.cc:12
 msgid "Configure"
 msgstr "Options"
 
-#: ../game/screen_intro.cc:11 ../game/screen_intro.cc:12
+#: ../game/screen_intro.cc:12
 msgid "Configure game options"
 msgstr "Configurer les options de jeu"
 
-#: ../game/screen_intro.cc:12 ../game/screen_intro.cc:13
+#: ../game/screen_intro.cc:13
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../game/screen_intro.cc:12 ../game/screen_intro.cc:13
+#: ../game/screen_intro.cc:13
 msgid "Leave the game"
 msgstr "Sortir du jeu"
 
-#: ../game/screen_intro.cc:19 ../game/screen_intro.cc:21
+#: ../game/screen_intro.cc:21
 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 ../game/screen_intro.cc:22
+#: ../game/screen_intro.cc:22
 msgid "No microphones found.\n"
 msgstr "Aucun micro n'a Ã©tÃ© trouvÃ©.\n"
 
-#: ../game/screen_intro.cc:21 ../game/screen_intro.cc:23
+#: ../game/screen_intro.cc:23
 msgid ""
 "\n"
 "Please configure some before playing."
@@ -65,23 +65,95 @@ msgstr ""
 "\n"
 "Veuillez en configurer certains avant de jouer."
 
-#: ../game/screen_players.cc:110 ../game/screen_players.cc:111
+#: ../game/screen_players.cc:109
 msgid "No players found!"
 msgstr "Aucun joueur n'a Ã©tÃ© trouvÃ©!"
 
-#: ../game/screen_players.cc:111 ../game/screen_players.cc:112
+#: ../game/screen_players.cc:110
 msgid "Enter a name to create a new player."
 msgstr "Entrez un nom pour crÃ©er un nouveau joueur."
 
-#: ../game/screen_players.cc:113 ../game/screen_players.cc:114
+#: ../game/screen_players.cc:112
 msgid "Press enter to create player!"
 msgstr "Pressez Entrer pour crÃ©er un nouveau joueur!"
 
-#: ../game/screen_songs.cc:209 ../game/screen_songs.cc:178
+#: ../game/screen_players.cc:119
+msgid "You reached %1 points!"
+msgstr "%1 points marquÃ©s!"
+
+#: ../game/screen_players.cc:120
+msgid "Change player with arrow keys."
+msgstr "Changez de joueur avec les flÃ¨ches"
+
+#: ../game/screen_players.cc:121
+msgid "Name:"
+msgstr "Nom:"
+
+#: ../game/screen_players.cc:124
+msgid "Type text to filter or create a new player."
+msgstr "Entrez un nom pour crÃ©er un nouveau joueur."
+
+#: ../game/screen_players.cc:124
+msgid "Search Text:"
+msgstr "Recherche:"
+
+#: ../game/screen_sing.cc:338
+msgid "   ENTER to skip instrumental break"
+msgstr "   \"EntrÃ©e\" to passer l'instrumental"
+
+#: ../game/screen_sing.cc:339
+msgid "   Remember to wait for grading!"
+msgstr "   N'oubliez pas d'attendre pour votre classement!"
+
+#: ../game/screen_sing.cc:427
+msgid "No player!"
+msgstr "Aucun joueur n'a Ã©tÃ© trouvÃ©!"
+
+#: ../game/screen_sing.cc:436
+msgid "Hit singer"
+msgstr "Superstar"
+
+#: ../game/screen_sing.cc:437
+msgid "Lead singer"
+msgstr "Soliste"
+
+#: ../game/screen_sing.cc:438
+msgid "Rising star"
+msgstr "Etoile montante"
+
+#: ../game/screen_sing.cc:439
+msgid "Amateur"
+msgstr "Amateur"
+
+#: ../game/screen_sing.cc:440
+msgid "Tone deaf"
+msgstr "Casserole"
+
+#: ../game/screen_sing.cc:442
+msgid "Maniac"
+msgstr "Maniac"
+
+#: ../game/screen_sing.cc:443
+msgid "Hoofer"
+msgstr "Claquettiste"
+
+#: ../game/screen_sing.cc:446
+msgid "Loser"
+msgstr "Perdant"
+
+#: ../game/screen_sing.cc:448
+msgid "Virtuoso"
+msgstr "Virtuose"
+
+#: ../game/screen_sing.cc:449
+msgid "Rocker"
+msgstr "Rockeur"
+
+#: ../game/screen_songs.cc:178
 msgid "No songs found!"
 msgstr "Aucun morceau trouvÃ©!"
 
-#: ../game/screen_songs.cc:210 ../game/screen_songs.cc:179
+#: ../game/screen_songs.cc:179
 msgid ""
 "Visit performous.org\n"
 "for free songs"
@@ -89,7 +161,7 @@ msgstr ""
 "Visitez performous.org\n"
 "pour des morceaux gratuits"
 
-#: ../game/screen_songs.cc:212 ../game/screen_songs.cc:181
+#: ../game/screen_songs.cc:181
 msgid "no songs match search"
 msgstr "aucun morceau ne satisfait la recherche"
 
@@ -101,31 +173,6 @@ msgstr "filtre: "
 msgid "none"
 msgstr "aucun"
 
-#: ../game/screen_players.cc:121
-msgid "You reached"
-msgstr ""
-
-#: ../game/screen_players.cc:121
-msgid "points!"
-msgstr "points!"
-
-#: ../game/screen_players.cc:122
-msgid "Change player with arrow keys."
-msgstr "Changez de joueur avec les flÃ¨ches"
-
-#: ../game/screen_players.cc:123
-msgid "Name:"
-msgstr "Nom:"
-
-#: ../game/screen_players.cc:126
-#, fuzzy
-msgid "Type text to filter or create a new player."
-msgstr "Entrez un nom pour crÃ©er un nouveau joueur."
-
-#: ../game/screen_players.cc:126
-msgid "Search Text:"
-msgstr "Recherche:"
-
 #: ../game/songs.cc:204
 msgid "random order"
 msgstr "ordre alÃ©atoire"
diff --git a/lang/it.po b/lang/it.po
index 3766754..677e765 100644
--- a/lang/it.po
+++ b/lang/it.po
@@ -78,12 +78,8 @@ msgid "Press enter to create player!"
 msgstr "Premi invio per creare il giocatore!"
 
 #: ../game/screen_players.cc:119
-msgid "You reached"
-msgstr "Hai fatto"
-
-#: ../game/screen_players.cc:119
-msgid "points!"
-msgstr "punti!"
+msgid "You reached %1 points!"
+msgstr "Hai fatto %1 punti!"
 
 #: ../game/screen_players.cc:120
 msgid "Change player with arrow keys."
diff --git a/lang/performous.pot b/lang/performous.pot
index b843632..41da930 100644
--- a/lang/performous.pot
+++ b/lang/performous.pot
@@ -79,11 +79,7 @@ msgid "Press enter to create player!"
 msgstr ""
 
 #: ../game/screen_players.cc:119
-msgid "You reached"
-msgstr ""
-
-#: ../game/screen_players.cc:119
-msgid "points!"
+msgid "You reached %1 points!"
 msgstr ""
 
 #: ../game/screen_players.cc:120

[Performous-commit] Vincent Le Ligeour : Fixed too long French translation

From: Yoda-JM <yo...@us...> - 2010-01-08 19:39:24

Module: performous
Branch: master
Commit: 1a4808e7c245fb9cfa8e141dfee29efd82afcbce

Author: Vincent Le Ligeour <yo...@us...>
Date:   Fri Jan  8 20:38:34 2010 +0100

Fixed too long French translation

---

 lang/fr.po |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/fr.po b/lang/fr.po
index 8c5e3d9..f548570 100644
--- a/lang/fr.po
+++ b/lang/fr.po
@@ -27,7 +27,7 @@ msgstr "Commencer une partie!"
 
 #: ../game/screen_intro.cc:10 ../game/screen_intro.cc:11
 msgid "Practice"
-msgstr "Entrainement"
+msgstr "S'exercer"
 
 #: ../game/screen_intro.cc:10 ../game/screen_intro.cc:11
 msgid "Check your skills or test the microphones"
@@ -35,7 +35,7 @@ msgstr "Chauffer votre voix et tester les micros"
 
 #: ../game/screen_intro.cc:11 ../game/screen_intro.cc:12
 msgid "Configure"
-msgstr "Configuration"
+msgstr "Options"
 
 #: ../game/screen_intro.cc:11 ../game/screen_intro.cc:12
 msgid "Configure game options"

[Performous-commit] Miguel Sánchez de León Peque : Fixed crash in last commit when no songs match filter.

From: Peque <ms...@us...> - 2010-01-08 19:08:04

Module: performous
Branch: master
Commit: 66dda1c63eb8832f91b0380d4ec010906eee9f04

Author: Miguel SÃ¡nchez de LeÃ³n Peque <peq...@ho...>
Date:   Fri Jan  8 20:07:06 2010 +0100

Fixed crash in last commit when no songs match filter.

---

 game/screen_songs.cc |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index b47283e..f2e39db 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -150,8 +150,10 @@ void ScreenSongs::stopMultimedia(ScreenSharedInfo& info) {
 	// Play/stop preview playback (if it is the time)
 	if (info.music != m_playing && m_playTimer.get() > 0.3) {
 		m_songbg.reset(); m_video.reset();
-		if (m_songs.current().preview_start > 5.0) m_songs.current().preview_start = 5.0; ///< this line is for performance (don't touch it unless you implement better seeking method in songs)
-		if (info.music.empty()) m_audio.fadeout(1.0); else m_audio.playMusic(info.music, true, 2.0, (m_songs.current().preview_start ? m_songs.current().preview_start : 5.0));
+		double pstart = 0;
+		if (!m_songs.empty()) pstart = m_songs.current().preview_start;
+		pstart = (pstart == pstart) ? std::min(pstart, 5.0) : 5.0; ///< this line is for performance (don't remove it unless you implement better seeking method in songs)
+		if (info.music.empty()) m_audio.fadeout(1.0); else m_audio.playMusic(info.music, true, 2.0, (pstart ? pstart : 5.0));
 		if (!info.songbg.empty()) try { m_songbg.reset(new Surface(info.songbg)); } catch (std::exception const&) {}
 		if (!info.video.empty() && config["graphic/video"].b()) m_video.reset(new Video(info.video, info.videoGap));
 		m_playing = info.music;

[Performous-commit] Miguel Sánchez de León Peque : Preview starts at 5 secs from the beginning.

From: Peque <ms...@us...> - 2010-01-08 17:52:09

Module: performous
Branch: master
Commit: d33ab240a5c05db78060e775c86da68ffb3f2707

Author: Miguel SÃ¡nchez de LeÃ³n Peque <peq...@ho...>
Date:   Fri Jan  8 18:51:34 2010 +0100

Preview starts at 5 secs from the beginning.

---

 game/screen_songs.cc   |    3 ++-
 game/song.cc           |    1 +
 game/song.hh           |    1 +
 game/songparser-ini.cc |    2 ++
 game/songparser-sm.cc  |    1 +
 game/songparser-txt.cc |    1 +
 lang/es.po             |    4 ++--
 7 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index a91785f..b47283e 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -150,7 +150,8 @@ void ScreenSongs::stopMultimedia(ScreenSharedInfo& info) {
 	// Play/stop preview playback (if it is the time)
 	if (info.music != m_playing && m_playTimer.get() > 0.3) {
 		m_songbg.reset(); m_video.reset();
-		if (info.music.empty()) m_audio.fadeout(1.0); else m_audio.playMusic(info.music, true, 2.0);
+		if (m_songs.current().preview_start > 5.0) m_songs.current().preview_start = 5.0; ///< this line is for performance (don't touch it unless you implement better seeking method in songs)
+		if (info.music.empty()) m_audio.fadeout(1.0); else m_audio.playMusic(info.music, true, 2.0, (m_songs.current().preview_start ? m_songs.current().preview_start : 5.0));
 		if (!info.songbg.empty()) try { m_songbg.reset(new Surface(info.songbg)); } catch (std::exception const&) {}
 		if (!info.video.empty() && config["graphic/video"].b()) m_video.reset(new Video(info.video, info.videoGap));
 		m_playing = info.music;
diff --git a/game/song.cc b/game/song.cc
index 5135535..54665d7 100644
--- a/game/song.cc
+++ b/game/song.cc
@@ -28,6 +28,7 @@ void Song::reload(bool errorIgnore) {
 	noteMax = std::numeric_limits<int>::min();
 	videoGap = 0.0;
 	start = 0.0;
+	preview_start = 0.0;
 	beginTime = endTime = getNaN();
 	m_scoreFactor = 0.0;
 	try { SongParser(*this); } catch (...) { if (!errorIgnore) throw; }
diff --git a/game/song.hh b/game/song.hh
index 199d882..9228433 100644
--- a/game/song.hh
+++ b/game/song.hh
@@ -71,6 +71,7 @@ class Song: boost::noncopyable {
 	static std::string collate(std::string const& str);
 	double videoGap; ///< gap with video
 	double start; ///< start of song
+	double preview_start; ///< starting time for the preview
 	MusicalScale scale; ///< scale in which song is sung
 	std::vector<double> timePitchGraph; ///< time of pitch graph
 	std::vector<double> pitchPitchGraph; ///< pitch of pitch graph
diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc
index 6b6a048..caa00d2 100644
--- a/game/songparser-ini.cc
+++ b/game/songparser-ini.cc
@@ -47,10 +47,12 @@ void SongParser::iniParse() {
 		if (key == "name") s.title = value;
 		else if (key == "artist") s.artist = value;
 		// These are added features (not part of FoF, though video is supported in FoFiX SVN)
+		// TODO these tags need to be checked/discussed with FoFiX developers
 		else if (key == "cover") s.cover = value;
 		else if (key == "background") s.background = value;
 		else if (key == "video") s.video = value;
 		else if (key == "video_start_time") { assign(s.videoGap, value); s.videoGap/=1000.0; }
+		else if (key == "prev_start_time") { assign(s.preview_start, value); s.preview_start/=1000.0; }
 		// End of added features
 	}
 	if (s.title.empty() || s.artist.empty()) throw std::runtime_error("Required header fields missing");
diff --git a/game/songparser-sm.cc b/game/songparser-sm.cc
index e7b8b76..477893e 100644
--- a/game/songparser-sm.cc
+++ b/game/songparser-sm.cc
@@ -139,6 +139,7 @@ bool SongParser::smParseField(std::string line) {
 	else if (key == "MUSIC") m_song.music["background"] = m_song.path + value;
 	else if (key == "BACKGROUND") m_song.background = value;
 	else if (key == "OFFSET") { assign(m_gap, value); m_gap *= -1; }
+	else if (key == "SAMPLESTART") assign(m_song.preview_start, value);
 	else if (key == "BPMS"){
 			std::istringstream iss(value);
 			double ts, bpm;	
diff --git a/game/songparser-txt.cc b/game/songparser-txt.cc
index 5612551..25f6b8b 100644
--- a/game/songparser-txt.cc
+++ b/game/songparser-txt.cc
@@ -66,6 +66,7 @@ bool SongParser::txtParseField(std::string const& line) {
 	else if (key == "BACKGROUND") m_song.background = value;
 	else if (key == "START") assign(m_song.start, value);
 	else if (key == "VIDEOGAP") assign(m_song.videoGap, value);
+	else if (key == "PREVIEWSTART") assign(m_song.preview_start, value);
 	else if (key == "RELATIVE") assign(m_relative, value);
 	else if (key == "GAP") { assign(m_gap, value); m_gap *= 1e-3; }
 	else if (key == "BPM") assign(m_bpm, value);
diff --git a/lang/es.po b/lang/es.po
index c198bf8..cf6a472 100644
--- a/lang/es.po
+++ b/lang/es.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Performous\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-08 12:20+0100\n"
+"POT-Creation-Date: 2010-01-08 12:36+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Miguel SÃ¡nchez de LeÃ³n Peque <msd...@gm...>\n"
 "Language-Team: \n"
@@ -135,7 +135,7 @@ msgstr "ordenadas por idioma"
 
 #: ../game/screen_sing.cc:338
 msgid "   ENTER to skip instrumental break"
-msgstr "   ENTER para pasar la parte instrumental"
+msgstr "   \"ENTER\" para pasar la parte instrumental"
 
 #: ../game/screen_sing.cc:339
 msgid "   Remember to wait for grading!"

[Performous-commit] Vincent Le Ligeour : Added drumkit with keyboard ( rewrote the key management, please test)

From: Yoda-JM <yo...@us...> - 2010-01-08 13:42:10

Module: performous
Branch: master
Commit: 40f1715d4393ee866ded49649921140d2e7e787a

Author: Vincent Le Ligeour <yo...@us...>
Date:   Fri Jan  8 13:35:42 2010 +0100

Added drumkit with keyboard (rewrote the key management, please test)

---

 game/joystick.cc |  416 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 268 insertions(+), 148 deletions(-)

[Performous-commit] Miguel Sánchez de León Peque : Spanish translation updated.

From: Peque <ms...@us...> - 2010-01-08 11:42:07

Module: performous
Branch: master
Commit: 321816e213a55440e5ef53266504f71bb298b25a

Author: Miguel SÃ¡nchez de LeÃ³n Peque <peq...@ho...>
Date:   Fri Jan  8 12:41:36 2010 +0100

Spanish translation updated.

---

 lang/es.po |   77 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/lang/es.po b/lang/es.po
index 920df95..c198bf8 100644
--- a/lang/es.po
+++ b/lang/es.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Performous\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-03 16:50+0100\n"
+"POT-Creation-Date: 2010-01-08 12:20+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Miguel SÃ¡nchez de LeÃ³n Peque <msd...@gm...>\n"
 "Language-Team: \n"
@@ -69,39 +69,39 @@ msgstr ""
 "\n"
 "Por favor, configura alguno antes de jugar."
 
-#: ../game/screen_players.cc:111
+#: ../game/screen_players.cc:109
 msgid "No players found!"
 msgstr "Â¡No se han encontrado jugadores!"
 
-#: ../game/screen_players.cc:112
+#: ../game/screen_players.cc:110
 msgid "Enter a name to create a new player."
 msgstr "Introduce un nombre para crear un nuevo jugador."
 
-#: ../game/screen_players.cc:114
+#: ../game/screen_players.cc:112
 msgid "Press enter to create player!"
 msgstr "Presiona \"enter\" para crear el nuevo jugador:"
 
-#: ../game/screen_players.cc:121
+#: ../game/screen_players.cc:119
 msgid "You reached"
 msgstr "Â¡Has conseguido"
 
-#: ../game/screen_players.cc:121
+#: ../game/screen_players.cc:119
 msgid "points!"
 msgstr "puntos!"
 
-#: ../game/screen_players.cc:122
+#: ../game/screen_players.cc:120
 msgid "Change player with arrow keys."
 msgstr "Cambia de jugador con las flechas del teclado"
 
-#: ../game/screen_players.cc:123
+#: ../game/screen_players.cc:121
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../game/screen_players.cc:126
+#: ../game/screen_players.cc:124
 msgid "Type text to filter or create a new player."
 msgstr "Introduce texto para filtrar o crear un nuevo jugador."
 
-#: ../game/screen_players.cc:126
+#: ../game/screen_players.cc:124
 msgid "Search Text:"
 msgstr "Buscar texto:"
 
@@ -133,6 +133,63 @@ msgstr "ordenadas por directorio"
 msgid "sorted by language"
 msgstr "ordenadas por idioma"
 
+#: ../game/screen_sing.cc:338
+msgid "   ENTER to skip instrumental break"
+msgstr "   ENTER para pasar la parte instrumental"
+
+#: ../game/screen_sing.cc:339
+msgid "   Remember to wait for grading!"
+msgstr "   Recuerda esperar para ser evaluado!"
+
+#: ../game/screen_sing.cc:427
+msgid "No player!"
+msgstr "Â¡No se han encontrado jugadores!"
+
+#: ../game/screen_sing.cc:436
+msgid "Hit singer"
+msgstr "Superestrella"
+
+#: ../game/screen_sing.cc:437
+msgid "Lead singer"
+msgstr "Vocalista"
+
+#: ../game/screen_sing.cc:438
+#: ../game/screen_sing.cc:444
+#: ../game/screen_sing.cc:450
+msgid "Rising star"
+msgstr "Aficionado"
+
+#: ../game/screen_sing.cc:439
+#: ../game/screen_sing.cc:445
+#: ../game/screen_sing.cc:451
+msgid "Amateur"
+msgstr "Novato"
+
+#: ../game/screen_sing.cc:440
+#: ../game/screen_sing.cc:452
+msgid "Tone deaf"
+msgstr "Sin oÃdo"
+
+#: ../game/screen_sing.cc:442
+msgid "Maniac"
+msgstr "ManÃaco"
+
+#: ../game/screen_sing.cc:443
+msgid "Hoofer"
+msgstr "Artista"
+
+#: ../game/screen_sing.cc:446
+msgid "Loser"
+msgstr "Perdedor"
+
+#: ../game/screen_sing.cc:448
+msgid "Virtuoso"
+msgstr "Virtuoso"
+
+#: ../game/screen_sing.cc:449
+msgid "Rocker"
+msgstr "Rockero"
+
 #: ../game/screen_songs.cc:178
 msgid "No songs found!"
 msgstr "Â¡No se encontraron canciones!"

[Performous-commit] Xaldyz : Merge branch 'master' of ssh://performous.git.sourceforge.net/ gitroot/performous/performous

From: Stefano A. <xa...@us...> - 2010-01-08 11:17:40

Module: performous
Branch: master
Commit: 2591e595e5a4355c161c5118a11f7f5fa0a0100b

Author: Xaldyz <xa...@us...>
Date:   Fri Jan  8 10:47:29 2010 +0100

Merge branch 'master' of ssh://performous.git.sourceforge.net/gitroot/performous/performous

---

[Performous-commit] Xaldyz : Improved translation: added internalization support at end of song (Tone deaf, ...)

From: Stefano A. <xa...@us...> - 2010-01-08 11:17:38

Module: performous
Branch: master
Commit: d9cb3589fe108fec21d615793787e597d85cfbbf

Author: Xaldyz <xa...@us...>
Date:   Fri Jan  8 10:47:11 2010 +0100

Improved translation: added internalization support at end of song (Tone deaf, ...)

---

 game/screen_sing.cc |   36 +++++++-------
 lang/it.po          |  128 ++++++++++++++++++++++++++++++++-----------------
 lang/performous.pot |  134 ++++++++++++++++++++++++++++++++++++--------------
 3 files changed, 198 insertions(+), 100 deletions(-)

Flat | Threaded

<< < 1 .. 105 106 107 108 109 .. 163 > >> (Page 107 of 163)

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