performous-commit — SCM commits

[Performous-commit] Lasse Karkkainen : Release announcement

[Lasse Kärkkäi. <tr...@us...>]

Module: web
Branch: master
Commit: 6757ae69dc761bb0dc7ac183d633bad894369d01

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Jan 13 23:56:26 2010 +0200

Release announcement

---

 htdocs-source/index.txt |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs-source/index.txt b/htdocs-source/index.txt
index d286fa9..234874f 100644
--- a/htdocs-source/index.txt
+++ b/htdocs-source/index.txt
@@ -6,10 +6,11 @@ This is the first release to include <strong>Windows</strong> and <strong>Mac</s
 
 	Dance mode
 		StepMania .sm format
-		4-8 panels on one dancepad
+		4-8 panels on each dancepad
 		Multiplayer (but not together with band yet)
+		Mines, hold and regular notes in various different game modes
 		Keyboard and USB dancepad support
-		Crappy graphics and no customization (for now)
+		Crappy graphics, no ITG colors and no customization (for now)
 	Band mode improvements
 		God Mode for guitars (similar to StarPower)
 		More graphical effects (glow, fire, ...)
@@ -32,6 +33,7 @@ This is the first release to include <strong>Windows</strong> and <strong>Mac</s
 		Instrumental part skipping for singing with FoF songs
 		Previews start from further of the song
 		In-game volume control
+		Keyboard key repeat disabled (preparing for generic controller repeat)
 	Internal
 		Use libpng/libjpeg directly, instead of Magick++
 		Navigation abstraction

[Performous-commit] Lasse Karkkainen : Update downloads page

[Lasse Kärkkäi. <tr...@us...>]

Module: web
Branch: master
Commit: c4ca46d87ecf6c7d183da85fcd9c1c94b9d5a9e8

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Jan 13 23:46:39 2010 +0200

Update downloads page

---

 htdocs-source/install.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs-source/install.txt b/htdocs-source/install.txt
index 4d07c11..c99e067 100644
--- a/htdocs-source/install.txt
+++ b/htdocs-source/install.txt
@@ -6,7 +6,7 @@ Song downloads can be found on the separate <strong>songs page</strong>.
 
 :h2:Linux binaries
 
-	Ubuntu 9.10 Karmic Koala: <a href="https://sourceforge.net/projects/performous/files/performous/0.4.0/Performous-0.4.0-Ubuntu9.10-i386.deb/download">i386</a> <a href="https://sourceforge.net/projects/performous/files/performous/0.4.0/Performous-0.4.0-Ubuntu9.10-amd64.deb/download">amd64</a>
+	Ubuntu 9.10 Karmic Koala: <a href="https://sourceforge.net/projects/performous/files/performous/0.5.0/Performous-0.5.0-Ubuntu9.10-i386.deb/download">i386</a> <a href="https://sourceforge.net/projects/performous/files/performous/0.5.0/Performous-0.5.0-Ubuntu9.10-amd64.deb/download">amd64</a>
 	Ubuntu 8.04 LTS Hardy Heron: <a href="http://sourceforge.net/projects/performous/files/performous/Performous-0.3.2-Ubuntu8.04-i386.deb">i386</a> <a href="http://sourceforge.net/projects/performous/files/performous/Performous-0.3.2-Ubuntu8.04-amd64.deb">amd64</a>
 	Debian: <strong>performous</strong> in official repositories
 	OpenSUSE: <a href="http://packman.links2linux.de/package/Performous/">packages</a>
@@ -24,9 +24,9 @@ No software bundle currently available, but we expect one of the Mac users to pa
 
 :h2:Other systems and development version
 
-	Source code: <a href="https://sourceforge.net/projects/performous/files/performous/0.4.0/Performous-0.4.0-Source.tar.bz2/download">universal</a>
+	Source code: <a href="http://sourceforge.net/projects/performous/files/performous/0.5.0/Performous-0.5.0-Source.tar.bz2/download">universal</a>
 
-	The very latest source code is available in our Git repository. See the <strong>hacking</strong> page for more information.
+	The very latest source code is available in our Git repository. See the documentation wiki for more information.
 
 :h2:Troubleshooting
 

[Performous-commit] Tag 0.5.0 : Lasse Karkkainen : 0.5.0 release

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: refs/tags/0.5.0
Tag:    2520f98ce162a61c06e6022bb161eefd3a7c941f

Tagger: Lasse Karkkainen <tro...@tr...>
Date:   Wed Jan 13 23:35:48 2010 +0200

0.5.0 release

[Performous-commit] Vincent Le Ligeour : Fixed Ubuntu dependency list

[Yoda-JM <yo...@us...>]

Module: performous
Branch: master
Commit: 1954418a45671e6b6f8ab6a0d732d8746e33c0ab

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Jan 13 21:54:56 2010 +0100

Fixed Ubuntu dependency list

---

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

diff --git a/cmake/performous-packaging.cmake b/cmake/performous-packaging.cmake
index fcfa28c..04fb4c2 100644
--- a/cmake/performous-packaging.cmake
+++ b/cmake/performous-packaging.cmake
@@ -52,7 +52,7 @@ if(UNIX)
 		endif("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
 		# Set the dependencies based on the distro version
 		if("${LSB_DISTRIB}" MATCHES "Ubuntu9.10")
-			set(CPACK_DEBIAN_PACKAGE_DEPENDS "libsdl1.2debian, libcairo2, librsvg2-2, libboost-thread1.38.0, libboost-program-options1.38.0, libboost-regex1.38.0, libboost-filesystem1.38.0, libboost-date-time1.38.0, libavcodec52, libavformat52, libswscale0, libmagick++2, libxml++2.6-2, libglew1.5 libpng12-0 libjpeg62")
+			set(CPACK_DEBIAN_PACKAGE_DEPENDS "libsdl1.2debian, libcairo2, librsvg2-2, libboost-thread1.38.0, libboost-program-options1.38.0, libboost-regex1.38.0, libboost-filesystem1.38.0, libboost-date-time1.38.0, libavcodec52, libavformat52, libswscale0, libmagick++2, libxml++2.6-2, libglew1.5, libpng12-0, libjpeg62")
 		endif("${LSB_DISTRIB}" MATCHES "Ubuntu9.10")
 		if("${LSB_DISTRIB}" MATCHES "Debian5.*")
 			set(CPACK_DEBIAN_PACKAGE_DEPENDS "libsdl1.2debian, libcairo2, librsvg2-2, libboost-dev, libavcodec51, libavformat52, libswscale0, libmagick++10, libxml++2.6-2, libglew1.5")

[Performous-commit] Vincent Le Ligeour : Added 0.5.0 ebuild

[Yoda-JM <yo...@us...>]

Module: performous
Branch: master
Commit: 1af4d8ba8c50e51fd4239b3591486fc563fdb3aa

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Jan 13 21:55:37 2010 +0100

Added 0.5.0 ebuild

---

 .../performous/performous-0.5.0.ebuild             |  102 ++++++++++++++++++++
 1 files changed, 102 insertions(+), 0 deletions(-)

diff --git a/portage-overlay/games-arcade/performous/performous-0.5.0.ebuild b/portage-overlay/games-arcade/performous/performous-0.5.0.ebuild
new file mode 100644
index 0000000..1af2d4b
--- /dev/null
+++ b/portage-overlay/games-arcade/performous/performous-0.5.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /cvsroot/ultrastar-ng/UltraStar-ng/portage-overlay/games-arcade/performous/performous-9999.ebuild,v 1.10 2007/09/29 13:04:19 yoda-jm Exp $
+
+EAPI=2
+inherit games cmake-utils
+
+RESTRICT="nostrip"
+
+SONGS_PN=ultrastar-songs
+
+MY_PN=Performous
+MY_P=${MY_PN}-${PV}-Source
+SONGS_PN=ultrastar-songs
+
+DESCRIPTION="Karaoke game similar to Singstar"
+HOMEPAGE="http://performous.org"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	songs? ( 
+		mirror://sourceforge/${PN}/${SONGS_PN}-jc-1.zip
+		mirror://sourceforge/${PN}/${SONGS_PN}-libre-3.zip
+		mirror://sourceforge/${PN}/${SONGS_PN}-restricted-3.zip
+		mirror://sourceforge/${PN}/${SONGS_PN}-shearer-1.zip
+	)"
+
+LICENSE="GPL-2
+	songs? (
+		CCPL-Attribution-ShareAlike-NonCommercial-2.5
+		CCPL-Attribution-NonCommercial-NoDerivs-2.5
+	)"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~ppc64"
+
+IUSE="debug alsa portaudio pulseaudio jack songs gstreamer tools editor"
+
+RDEPEND="gnome-base/librsvg
+	dev-libs/boost
+	x11-libs/pango
+	dev-cpp/libxmlpp
+	media-libs/glew
+	media-libs/libsdl[joystick,opengl]
+	media-libs/libpng
+	media-libs/jpeg
+	tools? ( media-gfx/imagemagick[png] )
+	editor? ( media-gfx/imagemagick[png] )
+	>=media-video/ffmpeg-0.4.9_p20070616-r20
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	portaudio? ( media-libs/portaudio )
+	gstreamer? ( media-libs/gstreamer )
+	pulseaudio? ( media-sound/pulseaudio )
+	sys-apps/help2man
+	!games-arcade/ultrastar-ng"
+DEPEND="${RDEPEND}
+    >=dev-util/cmake-2.6.0"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack "${MY_P}.tar.bz2"
+	if use songs; then
+		cd "${S}"
+		unpack "${SONGS_PN}-jc-1.zip"
+		unpack "${SONGS_PN}-libre-3.zip"
+		unpack "${SONGS_PN}-restricted-3.zip"
+		unpack "${SONGS_PN}-shearer-1.zip"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs="
+		$(cmake-utils_use alsa LIBDA_PLUGIN_ALSA)
+		$(cmake-utils_use jack LIBDA_PLUGIN_JACK)
+		$(cmake-utils_use gstreamer LIBDA_PLUGIN_GSTREAMER)
+		$(cmake-utils_use portaudio LIBDA_PLUGIN_PORTAUDIO)
+		$(cmake-utils_use pulseaudio LIBDA_PLUGIN_PULSEAUDIO)
+		$(cmake-utils_use_enable tools TOOLS)
+		$(cmake-utils_use_enable editor EDITOR)
+		-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
+		-DSHARE_INSTALL=share/performous
+		-DLIBDA_AUTODETECT_PLUGINS=false
+		-DLIBDA_PLUGIN_TESTING=false
+		-DCMAKE_BUILD_TYPE=Release"
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	DOCS="docs/*.txt" cmake-utils_src_install
+
+	if use songs; then
+		insinto "/usr/share/games/ultrastar"
+		doins -r "${S}/songs" || die "doins songs failed"
+	fi
+	doicon "${S}/data/${PN}.xpm"
+	domenu "${S}/data/${PN}.desktop"
+	prepgamesdirs
+}

[Performous-commit] Xaldyz : Updated Italian translation

[Stefano A. <xa...@us...>]

Module: performous
Branch: master
Commit: a12c9a27761c7b5a3a5bc4da7dc82a63176f65dd

Author: Xaldyz <xa...@us...>
Date:   Wed Jan 13 18:42:54 2010 +0100

Updated Italian translation

---

 lang/it.po |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lang/it.po b/lang/it.po
index f9f1e89..d1784ea 100644
--- a/lang/it.po
+++ b/lang/it.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Performous\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-30 22:52+0100\n"
+"POT-Creation-Date: 2010-01-13 15:27+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Xaldyz <xa...@us...>\n"
 "Language-Team: \n"
@@ -78,6 +78,7 @@ msgid "Press enter to create player!"
 msgstr "Premi invio per creare il giocatore!"
 
 #: ../game/screen_players.cc:119
+#, boost-format
 msgid "You reached %1% points!"
 msgstr "Hai fatto %1% punti!"
 
@@ -117,20 +118,15 @@ msgstr "Star"
 msgid "Lead singer"
 msgstr "Cantante"
 
-#: ../game/screen_sing.cc:438
-#: ../game/screen_sing.cc:444
-#: ../game/screen_sing.cc:450
+#: ../game/screen_sing.cc:428
 msgid "Rising star"
 msgstr "Dilettante"
 
-#: ../game/screen_sing.cc:439
-#: ../game/screen_sing.cc:445
-#: ../game/screen_sing.cc:451
+#: ../game/screen_sing.cc:429
 msgid "Amateur"
 msgstr "Amatore"
 
-#: ../game/screen_sing.cc:440
-#: ../game/screen_sing.cc:452
+#: ../game/screen_sing.cc:424
 msgid "Tone deaf"
 msgstr "Stonato"
 
@@ -206,3 +202,7 @@ msgstr "ordinato per percorso"
 msgid "sorted by language"
 msgstr "ordinato per lingua"
 
+#: ../game/screen_songs.cc:196
+msgid "(press END to view hiscores)"
+msgstr "(premi END per vedere i punteggi migliori)"
+

[Performous-commit] Tapio Vierros : Updated about-page with some dancing stuff.

[Tapio V. <aa...@us...>]

Module: web
Branch: master
Commit: 7b41e44ff1cb1404da6d51d8f4f702b3b217cd48

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Jan 13 23:07:25 2010 +0200

Updated about-page with some dancing stuff.

---

 htdocs-source/about.txt |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/htdocs-source/about.txt b/htdocs-source/about.txt
index 59545f7..7ae41d6 100644
--- a/htdocs-source/about.txt
+++ b/htdocs-source/about.txt
@@ -19,6 +19,10 @@ Until version 0.3 we aimed to create a free cross-platform alternative for SingS
 
 Performous uses the same instruments and songs as these games and obviously the gameplay is quite similar. However, we have deviated from the original concept by changing the scoring system and other things. We aim to make the game fun to play with and to make the scoring system judge playing skills as accurately as possible so that scores rather than percentages can be used for comparing players.
 
+:h2:StepMania or Dance Dance Revolution?
+
+Since 0.5.0 you can use dance pad to play dance songs in StepMania format. Again, the performance is scored based on how accurately the scrolling notes are hit. Let the rhythm guide your feet!
+
 :h2:Features
 
 	Should work on almost any platform
@@ -29,8 +33,10 @@ Performous uses the same instruments and songs as these games and obviously the
 		The engine determines what was intended rather than simply picking the nearest chord
 		Hammer-ons and pull-offs are undoed when the player accidentally does them and then picks the note in the regular way
 	Drums
+	Dance pads
 	Device autodetection
 		Guitar Hero and Rock Band instruments
+		Generic dance pads
 		SingStar and Rock Band microphones (Linux only)
 		Fallback to other audio devices when no SS/RB mics are detected
 	Top-notch visuals

[Performous-commit] Lasse Karkkainen : Updated screenshots, fixed new features

[Lasse Kärkkäi. <tr...@us...>]

Module: web
Branch: master
Commit: c0cfe8f51b2fcd7837ab5214f243199e7e6b8cfa

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Jan 13 23:03:47 2010 +0200

Updated screenshots, fixed new features

---

 htdocs-source/index.txt       |    9 +++++++--
 htdocs-source/screenshots.txt |    6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs-source/index.txt b/htdocs-source/index.txt
index dd1283c..d286fa9 100644
--- a/htdocs-source/index.txt
+++ b/htdocs-source/index.txt
@@ -12,7 +12,7 @@ This is the first release to include <strong>Windows</strong> and <strong>Mac</s
 		Crappy graphics and no customization (for now)
 	Band mode improvements
 		God Mode for guitars (similar to StarPower)
-		Better graphics (glow, fire, ...)
+		More graphical effects (glow, fire, ...)
 		Joining during game &amp; dead coming back to life
 		Whammy bar gameplay
 		Streak counter popup
@@ -20,7 +20,12 @@ This is the first release to include <strong>Windows</strong> and <strong>Mac</s
 	Star when singing a note well
 	Main menu completely reworked
 	Localizations: Finnish, French, German, Italian and Spanish
-	Support for random background images
+	New song folder [Performous data]/songs
+		The data folders depend on the OS the game is running on, including:
+		On UNIX ~/.local/share/games/performous
+		On Windows [Application data]/performous
+		On all systems the data installation path (relative to executable)
+		Old ~/.ultrastar/songs and other such folders continue to function.
 	Usability
 		Confirmation for song quitting
 		Better usb controller navigation (e.g. drum/dancepads can be used)
diff --git a/htdocs-source/screenshots.txt b/htdocs-source/screenshots.txt
index 7de984b..5181b24 100644
--- a/htdocs-source/screenshots.txt
+++ b/htdocs-source/screenshots.txt
@@ -7,13 +7,13 @@ Fully animated cover browser, live background video preview and other visual goo
 :h2:Perform
 Scrolling notes allow singing without unwanted interruptions. As usual, plenty of animations are included as eyecandy.
 <img src="screenshots/Performous-0.3.1-sing.jpg" alt=""/>
-The major new feature of 0.4 is that you can also play drums and guitar at the same time:
+Add some instruments and play as a band with your friends:
 <img src="screenshots/Performous-0.4.0-band.jpg" alt=""/>
+<img src="screenshots/0.5.0/band.jpg" alt=""/>
 Custom background images or videos can be used as a fallback when the song doesn't have any:
 <img src="screenshots/Performous-0.4.0-choose_instruments.jpg" alt=""/>
-<img src="screenshots/Performous-0.4.0-guitar_sing.jpg" alt=""/>
 <img src="screenshots/Performous-0.4.0-guitar.jpg" alt=""/>
-Since 0.5 you can also dance (with rather basic graphics):
+The major new feature of 0.5 is that you can also dance (with rather basic graphics):
 <img src="screenshots/0.5.0/dance-solo.jpg" alt=""/>
 
 :h2:Practice screen

[Performous-commit] Lasse Karkkainen : Preparing for 0.5.0 release, linking to Wiki, ...

[Lasse Kärkkäi. <tr...@us...>]

Module: web
Branch: master
Commit: 1e37a42cd3305a956af13ec0cbe7b613c99320d3

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Jan 13 22:43:23 2010 +0200

Preparing for 0.5.0 release, linking to Wiki, ...

---

 htdocs-binary/imgs/dance-multi2-small.jpg         |  Bin 0 -> 33857 bytes
 htdocs-binary/imgs/menu_fi-small.jpg              |  Bin 0 -> 16059 bytes
 htdocs-binary/screenshots/0.5.0/band.jpg          |  Bin 0 -> 105652 bytes
 htdocs-binary/screenshots/0.5.0/dance-multi.jpg   |  Bin 0 -> 105430 bytes
 htdocs-binary/screenshots/0.5.0/dance-multi2.jpg  |  Bin 0 -> 106645 bytes
 htdocs-binary/screenshots/0.5.0/dance-solo.jpg    |  Bin 0 -> 91495 bytes
 htdocs-binary/screenshots/0.5.0/drum_streak.jpg   |  Bin 0 -> 59793 bytes
 htdocs-binary/screenshots/0.5.0/flames_drums.jpg  |  Bin 0 -> 83827 bytes
 htdocs-binary/screenshots/0.5.0/flames_guitar.jpg |  Bin 0 -> 86688 bytes
 htdocs-binary/screenshots/0.5.0/godmode.jpg       |  Bin 0 -> 87192 bytes
 htdocs-binary/screenshots/0.5.0/menu_fi.jpg       |  Bin 0 -> 47524 bytes
 htdocs-binary/screenshots/0.5.0/sing.jpg          |  Bin 0 -> 111246 bytes
 htdocs-binary/screenshots/0.5.0/sing2.jpg         |  Bin 0 -> 110245 bytes
 htdocs-binary/screenshots/0.5.0/whammy.jpg        |  Bin 0 -> 97658 bytes
 htdocs-source/AWC-cfg.txt                         |    5 +--
 htdocs-source/index.txt                           |   34 +++++++++++++++++++++
 htdocs-source/screenshots.txt                     |    2 +
 17 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/htdocs-binary/imgs/dance-multi2-small.jpg b/htdocs-binary/imgs/dance-multi2-small.jpg
new file mode 100644
index 0000000..71dc27d
Binary files /dev/null and b/htdocs-binary/imgs/dance-multi2-small.jpg differ
diff --git a/htdocs-binary/imgs/menu_fi-small.jpg b/htdocs-binary/imgs/menu_fi-small.jpg
new file mode 100644
index 0000000..648dae4
Binary files /dev/null and b/htdocs-binary/imgs/menu_fi-small.jpg differ
diff --git a/htdocs-binary/screenshots/0.5.0/band.jpg b/htdocs-binary/screenshots/0.5.0/band.jpg
new file mode 100644
index 0000000..8be3b29
Binary files /dev/null and b/htdocs-binary/screenshots/0.5.0/band.jpg differ
diff --git a/htdocs-binary/screenshots/0.5.0/dance-multi.jpg b/htdocs-binary/screenshots/0.5.0/dance-multi.jpg
new file mode 100644
index 0000000..2e918ed
Binary files /dev/null and b/htdocs-binary/screenshots/0.5.0/dance-multi.jpg differ
diff --git a/htdocs-binary/screenshots/0.5.0/dance-multi2.jpg b/htdocs-binary/screenshots/0.5.0/dance-multi2.jpg
new file mode 100644
index 0000000..65a7483
Binary files /dev/null and b/htdocs-binary/screenshots/0.5.0/dance-multi2.jpg differ
diff --git a/htdocs-binary/screenshots/0.5.0/dance-solo.jpg b/htdocs-binary/screenshots/0.5.0/dance-solo.jpg
new file mode 100644
index 0000000..272a9be
Binary files /dev/null and b/htdocs-binary/screenshots/0.5.0/dance-solo.jpg differ
diff --git a/htdocs-binary/screenshots/0.5.0/drum_streak.jpg b/htdocs-binary/screenshots/0.5.0/drum_streak.jpg
new file mode 100644
index 0000000..a00d621
Binary files /dev/null and b/htdocs-binary/screenshots/0.5.0/drum_streak.jpg differ
diff --git a/htdocs-binary/screenshots/0.5.0/flames_drums.jpg b/htdocs-binary/screenshots/0.5.0/flames_drums.jpg
new file mode 100644
index 0000000..da90c05
Binary files /dev/null and b/htdocs-binary/screenshots/0.5.0/flames_drums.jpg differ
diff --git a/htdocs-binary/screenshots/0.5.0/flames_guitar.jpg b/htdocs-binary/screenshots/0.5.0/flames_guitar.jpg
new file mode 100644
index 0000000..cb14de8
Binary files /dev/null and b/htdocs-binary/screenshots/0.5.0/flames_guitar.jpg differ
diff --git a/htdocs-binary/screenshots/0.5.0/godmode.jpg b/htdocs-binary/screenshots/0.5.0/godmode.jpg
new file mode 100644
index 0000000..3ccd746
Binary files /dev/null and b/htdocs-binary/screenshots/0.5.0/godmode.jpg differ
diff --git a/htdocs-binary/screenshots/0.5.0/menu_fi.jpg b/htdocs-binary/screenshots/0.5.0/menu_fi.jpg
new file mode 100644
index 0000000..4468dfa
Binary files /dev/null and b/htdocs-binary/screenshots/0.5.0/menu_fi.jpg differ
diff --git a/htdocs-binary/screenshots/0.5.0/sing.jpg b/htdocs-binary/screenshots/0.5.0/sing.jpg
new file mode 100644
index 0000000..4e3fb86
Binary files /dev/null and b/htdocs-binary/screenshots/0.5.0/sing.jpg differ
diff --git a/htdocs-binary/screenshots/0.5.0/sing2.jpg b/htdocs-binary/screenshots/0.5.0/sing2.jpg
new file mode 100644
index 0000000..7084800
Binary files /dev/null and b/htdocs-binary/screenshots/0.5.0/sing2.jpg differ
diff --git a/htdocs-binary/screenshots/0.5.0/whammy.jpg b/htdocs-binary/screenshots/0.5.0/whammy.jpg
new file mode 100644
index 0000000..e2562f7
Binary files /dev/null and b/htdocs-binary/screenshots/0.5.0/whammy.jpg differ
diff --git a/htdocs-source/AWC-cfg.txt b/htdocs-source/AWC-cfg.txt
index 5263089..8dad036 100644
--- a/htdocs-source/AWC-cfg.txt
+++ b/htdocs-source/AWC-cfg.txt
@@ -5,11 +5,8 @@
 +screenshots Screenshots
 +install Download
 +songs Songs
-% Documentation:
-+manual Manual
-+commands Keys
-+develop Hacking
 % Project links:
+.http://wiki.performous.org/ Documentation
 .http://sourceforge.net/projects/performous/forums/forum/871563 Forum
 .http://sourceforge.net/projects/performous/ SF.net
 .http://www.ohloh.net/projects/performous Ohloh.net
diff --git a/htdocs-source/index.txt b/htdocs-source/index.txt
index d84aeee..dd1283c 100644
--- a/htdocs-source/index.txt
+++ b/htdocs-source/index.txt
@@ -1,5 +1,39 @@
 Announcements
 
+:h2:2010-01-13 - 0.5.0 released
+<img src="imgs/menu_fi-small.jpg" alt=""/><img src="imgs/dance-multi2-small.jpg" style="margin-left: 1mm" alt=""/>
+This is the first release to include <strong>Windows</strong> and <strong>Mac</strong> binaries as well. A lot of work has been done by Xaldyz, Zar, Stump and others to make this possible. Meanwhile a large number of improvements and new features have been added, including of course the all new dance simulator developed during December by Aave, JNikkola and Kemppi, out of whom Aave has already become a core developer, already boosting about 200 commits. Another new developer who has been very active in this release is Peque who created the new main menu and gave some face lift for the default theme, among other things. The new features include:
+
+	Dance mode
+		StepMania .sm format
+		4-8 panels on one dancepad
+		Multiplayer (but not together with band yet)
+		Keyboard and USB dancepad support
+		Crappy graphics and no customization (for now)
+	Band mode improvements
+		God Mode for guitars (similar to StarPower)
+		Better graphics (glow, fire, ...)
+		Joining during game &amp; dead coming back to life
+		Whammy bar gameplay
+		Streak counter popup
+		Guitar Hero X0 guitar support (not tested)
+	Star when singing a note well
+	Main menu completely reworked
+	Localizations: Finnish, French, German, Italian and Spanish
+	Support for random background images
+	Usability
+		Confirmation for song quitting
+		Better usb controller navigation (e.g. drum/dancepads can be used)
+		Instrumental part skipping for singing with FoF songs
+		Previews start from further of the song
+		In-game volume control
+	Internal
+		Use libpng/libjpeg directly, instead of Magick++
+		Navigation abstraction
+		Windows fixes
+
+Head over to the download page to get the new version. Because of the very large number of new features and due to porting to two new platforms we expect the release to be buggy. Please let us know if you find any problems. We'll try to release 0.5.1 soon with possible fixes and more new features.
+
 :h2:2009-12-12 - 0.4.1 cancelled, Windows alpha available
 We have rather large new features in the development version and because of this the next release will be 0.5.0 rather than 0.4.1. The hilights include a new menu and of course the dance game feature, which we just tested in two player mode with actual dance pads. No release date other than "soon" has been set.
 
diff --git a/htdocs-source/screenshots.txt b/htdocs-source/screenshots.txt
index 4948bdc..7de984b 100644
--- a/htdocs-source/screenshots.txt
+++ b/htdocs-source/screenshots.txt
@@ -13,6 +13,8 @@ Custom background images or videos can be used as a fallback when the song doesn
 <img src="screenshots/Performous-0.4.0-choose_instruments.jpg" alt=""/>
 <img src="screenshots/Performous-0.4.0-guitar_sing.jpg" alt=""/>
 <img src="screenshots/Performous-0.4.0-guitar.jpg" alt=""/>
+Since 0.5 you can also dance (with rather basic graphics):
+<img src="screenshots/0.5.0/dance-solo.jpg" alt=""/>
 
 :h2:Practice screen
 This is a good place to setup microphone levels or to do voice-opening exercises.

[Performous-commit] Lasse Karkkainen : Website updates

[Lasse Kärkkäi. <tr...@us...>]

Module: web
Branch: master
Commit: ea71ad49f1fb5a7549e440139f6e65124d242504

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Jan  6 23:07:58 2010 +0200

Website updates

---

 htdocs-source/develop.txt |    6 ++++--
 htdocs-source/manual.txt  |   14 ++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/htdocs-source/develop.txt b/htdocs-source/develop.txt
index e51f30e..7d7cda5 100644
--- a/htdocs-source/develop.txt
+++ b/htdocs-source/develop.txt
@@ -13,7 +13,7 @@ If you happen to be running one of these, please start by installing the followi
 
 Debian (testing/unstable) and Ubuntu:
 
-	<strong>sudo aptitude install</strong> git-core cmake build-essential help2man libglew1.5-dev libsdl1.2-dev libcairo2-dev librsvg2-dev libboost1.40-all-dev libavcodec-dev libavformat-dev libswscale-dev libmagick++-dev libsamplerate0-dev libxml++2.6-dev libasound2-dev libjack-dev libpulse-dev portaudio19-dev libgstreamer0.10-dev
+	<strong>sudo aptitude install</strong> git-core cmake build-essential gettext help2man libglew1.5-dev libsdl1.2-dev libcairo2-dev librsvg2-dev libboost1.40-all-dev libavcodec-dev libavformat-dev libswscale-dev libpng-dev libjpeg-dev libsamplerate0-dev libxml++2.6-dev libasound2-dev libjack-dev libpulse-dev portaudio19-dev libgstreamer0.10-dev
 
 Note: the audio libraries (at the end of the list) are optional. Install only the ones that you are going to use. If you are packaging Performous, install all of them (the ones actually available are detected runtime).
 
@@ -23,7 +23,9 @@ Gentoo:
 
 Fedora:
 
-	<strong>sudo yum install</strong> git cmake gtk2-devel cairo-devel librsvg2-devel libsigc++20-devel glibmm24-devel libxml++-devel ImageMagick-c++-devel boost-devel SDL-devel glew-devel ffmpeg-devel pulseaudio-libs-devel
+	<strong>sudo yum install</strong> git cmake gcc-c++ gettext gtk2-devel cairo-devel librsvg2-devel libsigc++20-devel glibmm24-devel libxml++-devel ImageMagick-c++-devel boost-devel SDL-devel glew-devel ffmpeg-devel pulseaudio-libs-devel
+
+Note: <a href="http://rpmfusion.org/Configuration">RPM Fusion Free</a> repository is needed for ffmpeg.
 
 OS X:
 
diff --git a/htdocs-source/manual.txt b/htdocs-source/manual.txt
index 63d516b..7aeccdf 100644
--- a/htdocs-source/manual.txt
+++ b/htdocs-source/manual.txt
@@ -89,23 +89,33 @@ Use --pdev &lt;device string&gt; to set the audio API (alsa, pulse, jack, ...).
 
 If you don't specify anything, Performous defaults to two microphones and will prefer the SingStar or Rock Band ones, if available.
 
+:h3:Microphone to speakers
+
+Performous does not currently support forwarding audio from microphones to audio playback device. Preferrably you should use hardware for this, e.g. see if you can adjust your volume controls to allow this, if the microphones are connected to your sound card. With separate USB microphones you may use some external software for forwarding but we haven't tried that.
+
+Adding software forwarding (and effects) in Performous is planned, but it will take a while to get implemented.
+
 
 :h2:Adjusting audio sync
 
 Usually it takes a fraction of a second for the sound to come out of the speakers after it has been sent out by Performous. Similarly, there's a delay on audio input. Some flat panel displays also introduce rather long delay from when the image is rendered to when it is actually displayed. Performous has to compensate for all these latencies in order to allow smooth gameplay.
 
-:h3:A/V synchronization
+:h3:A/V synchronization (all modes)
 
 This is the difference between the time it takes for the audio and the video to get out of the system. If the setting is incorrect, notes on screen will pass the black line at an incorrect time.
 
 Adjust with <strong>F5</strong> and <strong>F6</strong> in singing screen.
 
-:h3:Audio roundtrip latency
+:h3:Audio roundtrip latency (singing only)
 
 This is the time it takes for the audio to go out thru the sound card, to the speakers, and in via the microphone and the sound card back, all around until Performous has detected the tone. If the setting is incorrect, the pitch wave will appear mispositioned on the notes, when the singer matches his timing on what he hears (rather than on the notes seen on screen).
 
 While in singing screen, press <strong>F4</strong> to enter synth mode, which will play the notes using synthesized sine waves. Place the microphone near a speaker and adjust with <strong>F7</strong> and <strong>F8</strong> until the pitch wave matches the notes.
 
+:h3:Audio/controller latency (instruments and dancing)
+
+This setting controls the synchronization between audio output and controller input. The value should be the controller input latency plus the audio output latency. Adjust it so that you can hit the notes most precisely by ear (without looking on the screen).
+
 :h3:Tips for reducing audio latency
 
 In order to see your singing on screen as realtime as possible, you should try to minimize the audio input latency and the video output latency. The video output latency can be affected by frame rate and by your display, but there is little you can do about it, and also the amount of latency is usually not more than 50 milliseconds at most. The audio input latency is affected by resampling/mixing audio servers such as PulseAudio. Preferrably you should use ALSA or JACK directly with your card, as this will provide the minimum latency.

[Performous-commit] Lasse Karkkainen : Merge branch 'master' of ssh://git.performous.org/ gitroot/performous/web

[Lasse Kärkkäi. <tr...@us...>]

Module: web
Branch: master
Commit: edef61e4d1b5ca2a1d06ec37bf3ebe19ac0479fc

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Jan 13 20:55:59 2010 +0200

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

---

[Performous-commit] Lasse Karkkainen : Version number 0.5.0

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: 28e47f7a7274af8088f07a90bd33ab548e05097c

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Jan 13 16:46:33 2010 +0200

Version number 0.5.0

---

 CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9303c0..5c532d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(Performous CXX)
 cmake_minimum_required(VERSION 2.6)
 cmake_policy(VERSION 2.6)
-set(PROJECT_VERSION "0.4.0+")
+set(PROJECT_VERSION "0.5.0")
 
 # Avoid source tree pollution
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)

[Performous-commit] Vincent Le Ligeour : Updated lang reference and French translation

[Yoda-JM <yo...@us...>]

Module: performous
Branch: master
Commit: 1b3270de25c7f126b9e34d2464380fed1f26d38c

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Jan 13 15:31:09 2010 +0100

Updated lang reference and French translation

---

 lang/fr.po          |   13 +++++++++----
 lang/performous.pot |   17 ++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/lang/fr.po b/lang/fr.po
index e31f262..c292363 100644
--- a/lang/fr.po
+++ b/lang/fr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Performous\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-30 22:52+0100\n"
+"POT-Creation-Date: 2010-01-13 15:27+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Yoda-JM <yo...@us...>\n"
 "Language-Team: \n"
@@ -78,6 +78,7 @@ msgid "Press enter to create player!"
 msgstr "Pressez Entrer pour créer un nouveau joueur!"
 
 #: ../game/screen_players.cc:119
+#, boost-format
 msgid "You reached %1% points!"
 msgstr "%1% points marqués!"
 
@@ -117,15 +118,15 @@ msgstr "Superstar"
 msgid "Lead singer"
 msgstr "Soliste"
 
-#: ../game/screen_sing.cc:438
+#: ../game/screen_sing.cc:428
 msgid "Rising star"
 msgstr "Etoile montante"
 
-#: ../game/screen_sing.cc:439
+#: ../game/screen_sing.cc:429
 msgid "Amateur"
 msgstr "Amateur"
 
-#: ../game/screen_sing.cc:440
+#: ../game/screen_sing.cc:424
 msgid "Tone deaf"
 msgstr "Casserole"
 
@@ -200,3 +201,7 @@ msgstr "classement par chemin"
 #: ../game/songs.cc:210
 msgid "sorted by language"
 msgstr "classement par langue"
+
+#: ../game/screen_songs.cc:196
+msgid "(press END to view hiscores)"
+msgstr "(presser Fin pour voir le classement)"
diff --git a/lang/performous.pot b/lang/performous.pot
index c4ad2cd..9bbe78b 100644
--- a/lang/performous.pot
+++ b/lang/performous.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-30 22:52+0100\n"
+"POT-Creation-Date: 2010-01-13 15:27+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -79,6 +79,7 @@ msgid "Press enter to create player!"
 msgstr ""
 
 #: ../game/screen_players.cc:119
+#, boost-format
 msgid "You reached %1% points!"
 msgstr ""
 
@@ -118,20 +119,15 @@ msgstr ""
 msgid "Lead singer"
 msgstr ""
 
-#: ../game/screen_sing.cc:438
-#: ../game/screen_sing.cc:444
-#: ../game/screen_sing.cc:450
+#: ../game/screen_sing.cc:428
 msgid "Rising star"
 msgstr ""
 
-#: ../game/screen_sing.cc:439
-#: ../game/screen_sing.cc:445
-#: ../game/screen_sing.cc:451
+#: ../game/screen_sing.cc:429
 msgid "Amateur"
 msgstr ""
 
-#: ../game/screen_sing.cc:440
-#: ../game/screen_sing.cc:452
+#: ../game/screen_sing.cc:424
 msgid "Tone deaf"
 msgstr ""
 
@@ -205,3 +201,6 @@ msgstr ""
 msgid "sorted by language"
 msgstr ""
 
+#: ../game/screen_songs.cc:196
+msgid "(press END to view hiscores)"
+msgstr ""

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

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: ba8b2a00b6a50ca0948ac7d85d75b66441318b3b

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Jan 13 16:15:10 2010 +0200

Updated FI translation.

---

 lang/fi.po |   62 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/lang/fi.po b/lang/fi.po
index 968bbd3..1982ed2 100644
--- a/lang/fi.po
+++ b/lang/fi.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Performous\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-09 16:59+0200\n"
+"POT-Creation-Date: 2010-01-13 16:14+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Tapio Vierros <tap...@gm...>\n"
 "Language-Team: \n"
@@ -61,88 +61,88 @@ msgstr ""
 "\n"
 "Säädä ääniasetuksia ennen pelaamista."
 
-#: ../game/screen_sing.cc:330
+#: ../game/screen_sing.cc:322
 msgid "   ENTER to skip instrumental break"
 msgstr "   ENTER hypätäksesi lauluosaan"
 
-#: ../game/screen_sing.cc:331
+#: ../game/screen_sing.cc:323
 msgid "   Remember to wait for grading!"
 msgstr "   Muista odottaa arvostelua!"
 
-#: ../game/screen_sing.cc:419
+#: ../game/screen_sing.cc:411
 msgid "No player!"
 msgstr "Pelaajia ei löytynyt!"
 
-#: ../game/screen_sing.cc:428
+#: ../game/screen_sing.cc:420
 msgid "Hit singer"
 msgstr "Tähti"
 
-#: ../game/screen_sing.cc:429
+#: ../game/screen_sing.cc:421
 msgid "Lead singer"
 msgstr "Solisti"
 
-#: ../game/screen_sing.cc:430
-#: ../game/screen_sing.cc:436
-#: ../game/screen_sing.cc:442
+#: ../game/screen_sing.cc:422
+#: ../game/screen_sing.cc:428
+#: ../game/screen_sing.cc:434
 msgid "Rising star"
 msgstr "Harrastaja"
 
-#: ../game/screen_sing.cc:431
-#: ../game/screen_sing.cc:437
-#: ../game/screen_sing.cc:443
+#: ../game/screen_sing.cc:423
+#: ../game/screen_sing.cc:429
+#: ../game/screen_sing.cc:435
 msgid "Amateur"
 msgstr "Amatööri"
 
-#: ../game/screen_sing.cc:432
-#: ../game/screen_sing.cc:444
+#: ../game/screen_sing.cc:424
+#: ../game/screen_sing.cc:436
 msgid "Tone deaf"
 msgstr "Lahjaton"
 
-#: ../game/screen_sing.cc:434
+#: ../game/screen_sing.cc:426
 msgid "Maniac"
 msgstr "Maanikko"
 
-#: ../game/screen_sing.cc:435
+#: ../game/screen_sing.cc:427
 msgid "Hoofer"
 msgstr "Ekspertti"
 
-#: ../game/screen_sing.cc:438
+#: ../game/screen_sing.cc:430
 msgid "Loser"
 msgstr "Luuseri"
 
-#: ../game/screen_sing.cc:440
+#: ../game/screen_sing.cc:432
 msgid "Virtuoso"
 msgstr "Virtuoosi"
 
-#: ../game/screen_sing.cc:441
+#: ../game/screen_sing.cc:433
 msgid "Rocker"
 msgstr "Rokkari"
 
-#: ../game/songs.cc:204
+#: ../game/songs.cc:201
 msgid "random order"
 msgstr "satunnainen järjestys"
 
-#: ../game/songs.cc:205
+#: ../game/songs.cc:202
 msgid "sorted by song"
 msgstr "järjestetty kappaleen mukaan"
 
-#: ../game/songs.cc:206
+#: ../game/songs.cc:203
 msgid "sorted by artist"
 msgstr "järjestetty esittäjän mukaan"
 
-#: ../game/songs.cc:207
+#: ../game/songs.cc:204
 msgid "sorted by edition"
 msgstr "järjestetty julkaisun mukaan"
 
-#: ../game/songs.cc:208
+#: ../game/songs.cc:205
 msgid "sorted by genre"
 msgstr "järjestetty lajityypin mukaan"
 
-#: ../game/songs.cc:209
+#: ../game/songs.cc:206
 msgid "sorted by path"
 msgstr "järjestetty polun mukaan"
 
-#: ../game/songs.cc:210
+#: ../game/songs.cc:207
 msgid "sorted by language"
 msgstr "järjestetty kielen mukaan"
 
@@ -162,11 +162,15 @@ msgstr ""
 msgid "no songs match search"
 msgstr "yksikään kappale ei vastannut hakuasi"
 
-#: ../game/screen_songs.cc:195
+#: ../game/screen_songs.cc:196
+msgid "(press END to view hiscores)"
+msgstr "(paina END nähdäksesi ennätykset)"
+
+#: ../game/screen_songs.cc:197
 msgid "filter: "
 msgstr "suodatin: "
 
-#: ../game/screen_songs.cc:195
+#: ../game/screen_songs.cc:197
 msgid "none"
 msgstr "tyhjä"
 
@@ -202,7 +206,7 @@ msgstr "Kirjoita etsiäksesi tai luodaksesi uuden pelaajan."
 msgid "Search Text:"
 msgstr "Etsi:"
 
-#: ../game/screen_hiscore.cc:104
+#: ../game/screen_hiscore.cc:88
 msgid "Hiscore for "
 msgstr "Ennätykset kappaleelle "
 

[Performous-commit] Lasse Karkkainen : Improved message for hiscore key

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: 264b6623ceec02e372089d73908a3951748516cd

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Jan 13 16:12:40 2010 +0200

Improved message for hiscore key

---

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

diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index fc140c7..d495486 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -193,7 +193,7 @@ void ScreenSongs::draw() {
 		// Format the song information text
 		oss_song << song.title << '\n' << song.artist;
 		if(m_database.hasHiscore(song))
-			oss_hiscore << _("(hiscore available, push \"End\" key to see them)");
+			oss_hiscore << _("(press END to view hiscores)");
 		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() << ")";

[Performous-commit] Tapio Vierros : Don't display 'GodMode ready' for drums.

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: 63fd4be66dfdd01e53e4309563b1fbdf843d41d6

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Jan 13 15:41:54 2010 +0200

Don't display 'GodMode ready' for drums.

---

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

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 2098934..606d117 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -57,8 +57,6 @@ namespace {
 		c.b = blend(starpowerC.b, c.b, f);
 		return c;
 	}
-
-	bool canActivateStarpower(int meter) { return (meter > 6000); }
 }
 
 GuitarGraph::GuitarGraph(Audio& audio, Song const& song, std::string track):
@@ -257,7 +255,7 @@ bool GuitarGraph::dead() const {
 
 /// Attempt to activate GodMode
 void GuitarGraph::activateStarpower() {
-	if (canActivateStarpower(m_starmeter)) {
+	if (canActivateStarpower()) {
 		m_starmeter = 0;
 		m_starpower.setValue(1.0);
 		m_godmodePopup.setTarget(1.0);
@@ -752,7 +750,7 @@ void GuitarGraph::drawInfo(double time, double offsetX, Dimensions dimensions) {
 		  + boost::lexical_cast<std::string>(unsigned(m_longestStreak)));
 	}
 	// Is Starpower ready?
-	if (canActivateStarpower(m_starmeter)) {
+	if (canActivateStarpower()) {
 		float a = (int(time * 1000.0) % 1000) / 1000.0;
 		m_text.dimensions.screenBottom(-0.02).middle(-0.12 + offsetX);
 		m_text.draw("God Mode Ready!", a);
diff --git a/game/guitargraph.hh b/game/guitargraph.hh
index 0e57fbf..7d529d2 100644
--- a/game/guitargraph.hh
+++ b/game/guitargraph.hh
@@ -67,6 +67,7 @@ class GuitarGraph {
 	std::string getTrack() const { return m_track_index->first; }
 	std::string getDifficultyString() const;
   private:
+	bool canActivateStarpower() { return !m_drums && (m_starmeter > 6000); }
 	void activateStarpower();
 	void fail(double time, int fret);
 	void endHold(int fret, double time = 0.0);

[Performous-commit] Vincent Le Ligeour : Added indication to tell if highscore is available

[Yoda-JM <yo...@us...>]

Module: performous
Branch: master
Commit: 266ac464229c4274a5eee15a410c3cc5f797d807

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Jan 13 13:19:25 2010 +0100

Added indication to tell if highscore is available

---

 game/database.cc                 |    2 +-
 game/database.hh                 |    2 +-
 game/screen_songs.cc             |    5 ++-
 game/songitems.cc                |    7 ++++
 game/songitems.hh                |    1 +
 game/theme.cc                    |    3 +-
 game/theme.hh                    |    2 +
 themes/default/songs_hiscore.svg |   72 ++++++++++++++++++++++++++++++++++++++
 8 files changed, 90 insertions(+), 4 deletions(-)

diff --git a/game/database.cc b/game/database.cc
index ee68700..92d22ad 100644
--- a/game/database.cc
+++ b/game/database.cc
@@ -130,7 +130,7 @@ void Database::queryPerPlayerHiscore (std::ostream & os, std::string const& trac
 	}
 }
 
-bool Database::hasHiscore(boost::shared_ptr<Song> s) const {
+bool Database::hasHiscore(Song& s) const {
 	int songid = m_songs.lookup(s);
 	return m_hiscores.hasHiscore(songid);
 }
diff --git a/game/database.hh b/game/database.hh
index 259be37..d842f46 100644
--- a/game/database.hh
+++ b/game/database.hh
@@ -101,7 +101,7 @@ class Database
 	void queryPerSongHiscore (std::ostream & os, boost::shared_ptr<Song> s, std::string const& track = "") const;
 	void queryPerPlayerHiscore (std::ostream & os, std::string const& track = "") const;
 
-	bool hasHiscore(boost::shared_ptr<Song> s) const;
+	bool hasHiscore(Song& s) const;
 	bool noPlayers() const;
 
   private:
diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index a5f151b..fc140c7 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -177,7 +177,7 @@ void ScreenSongs::draw() {
 	info.videoGap = 0.0;
 
 	drawMultimedia();
-	std::ostringstream oss_song, oss_order;
+	std::ostringstream oss_song, oss_order, oss_hiscore;
 	// Test if there are no songs
 	if (m_songs.empty()) {
 		// Format the song information text
@@ -192,6 +192,8 @@ void ScreenSongs::draw() {
 		Song& song = m_songs.current();
 		// Format the song information text
 		oss_song << song.title << '\n' << song.artist;
+		if(m_database.hasHiscore(song))
+			oss_hiscore << _("(hiscore available, push \"End\" key to see them)");
 		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() << ")";
@@ -311,6 +313,7 @@ void ScreenSongs::draw() {
 		// Draw song and order texts
 		theme->song.draw(oss_song.str());
 		theme->order.draw(oss_order.str());
+		theme->hiscore.draw(oss_hiscore.str());
 	}
 	stopMultimedia(info);
 	if (m_jukebox) {
diff --git a/game/songitems.cc b/game/songitems.cc
index a35a434..1491100 100644
--- a/game/songitems.cc
+++ b/game/songitems.cc
@@ -83,6 +83,13 @@ int SongItems::lookup(boost::shared_ptr<Song> song) const {
 	return -1;
 }
 
+int SongItems::lookup(Song& song) const {
+	for (songs_t::const_iterator it = m_songs.begin(); it != m_songs.end(); ++it) {
+		if (song.collateByArtistOnly == it->artist && song.collateByTitleOnly == it->title) return it->id;
+	}
+	return -1;
+}
+
 std::string SongItems::lookup (int id) const {
 	SongItem si;
 	si.id = id;
diff --git a/game/songitems.hh b/game/songitems.hh
index 4575c45..27b74c1 100644
--- a/game/songitems.hh
+++ b/game/songitems.hh
@@ -82,6 +82,7 @@ struct SongItems
 	/**Lookup a songid for a specific song.
 	  @return -1 if no song found.*/
 	int lookup(boost::shared_ptr<Song> song) const;
+	int lookup(Song& song) const;
 
 	/**Lookup the artist + title for a specific song.
 	  @return "Unknown Song" if nothing is found.
diff --git a/game/theme.cc b/game/theme.cc
index 7e928f2..6699a64 100755
--- a/game/theme.cc
+++ b/game/theme.cc
@@ -11,7 +11,8 @@ Theme::Theme(const std::string path) : bg(path)
 ThemeSongs::ThemeSongs():
 	Theme(getThemePath("songs_bg.svg")),
 	song(getThemePath("songs_song.svg"), config["graphic/text_lod"].f()),
-	order(getThemePath("songs_order.svg"), config["graphic/text_lod"].f())
+	order(getThemePath("songs_order.svg"), config["graphic/text_lod"].f()),
+	hiscore(getThemePath("songs_hiscore.svg"), config["graphic/text_lod"].f())
 {}
 
 ThemePractice::ThemePractice():
diff --git a/game/theme.hh b/game/theme.hh
index 3cbba53..6fcce45 100755
--- a/game/theme.hh
+++ b/game/theme.hh
@@ -22,6 +22,8 @@ struct ThemeSongs: Theme {
 	SvgTxtTheme song;
 	/// ordering display
 	SvgTxtTheme order;
+	/// hiscore display
+	SvgTxtTheme hiscore;
 };
 
 /// theme for practice screen
diff --git a/themes/default/songs_hiscore.svg b/themes/default/songs_hiscore.svg
new file mode 100644
index 0000000..e56ea6b
--- /dev/null
+++ b/themes/default/songs_hiscore.svg
@@ -0,0 +1,72 @@
+<?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="800.000000"
+   height="600.000000"
+   id="svg559"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="songs_hiscore.svg"
+   sodipodi:docbase="/home/yoda/UltraStar/sf/UltraStar-ng/themes/default"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <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" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="797"
+     inkscape:window-width="1081"
+     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="0.89095454"
+     inkscape:cx="141.39663"
+     inkscape:cy="249.62029"
+     inkscape:window-x="235"
+     inkscape:window-y="25"
+     inkscape:current-layer="svg559"
+     showgrid="false" />
+  <defs
+     id="defs561">
+    <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>
+  <text
+     xml:space="preserve"
+     style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Verdana;-inkscape-font-specification:Verdana Bold"
+     x="400"
+     y="240.31577"
+     id="text1990"><tspan
+       sodipodi:role="line"
+       id="tspan1992"
+       x="400"
+       y="332.31577">Hiscore</tspan></text>
+</svg>

[Performous-commit] Lasse Karkkainen : Better messages on hold notes

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: 44f0d9af2d49233fb459dd236629d10db8254e40

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Jan 13 13:10:57 2010 +0200

Better messages on hold notes

---

 game/dancegraph.cc |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index 172a539..d80c147 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -463,13 +463,21 @@ void DanceGraph::drawNote(DanceNote& note, double time) {
 		}
 	}
 	// Draw a text telling how well we hit
-	if (glow > 0 && ac > 0 && !mine) {
-		double s = 1.2 * arrowSize * (1.0 + glow);
-		glColor3f(1.0f, 1.0f, 1.0f);
-		std::string rank = getRank(ac);
-		m_popupText->render(rank);
-		m_popupText->dimensions().middle(x).center(time2y(0.0)).stretch(s,s/2.0);
-		m_popupText->draw();
+	if (!mine && note.isHit) {
+		std::string text;
+		if (note.releaseTime <= 0.0 && tBeg < tEnd) { // Is being held down and is a hold note
+			text = "HOLD";
+			glow = 1.0;
+		} else if (glow > 0.0) { // Released already, display rank
+			text = getRank(ac);
+		}
+		if (!text.empty()) {
+			glColor3f(1.0f, 1.0f, 1.0f);
+			double s = 1.2 * arrowSize * (1.0 + glow);
+			m_popupText->render(text);
+			m_popupText->dimensions().middle(x).center(time2y(0.0)).stretch(s,s/2.0);
+			m_popupText->draw();
+		}
 	}
 }
 

[Performous-commit] Tapio Vierros : Fixed broken patch.

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: f1e739be96e350a3f63ea7bc90c6b4891f81e702

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Jan 13 08:40:45 2010 +0200

Fixed broken patch.

---

 game/songparser-sm.cc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/game/songparser-sm.cc b/game/songparser-sm.cc
index c1281ba..85229ca 100644
--- a/game/songparser-sm.cc
+++ b/game/songparser-sm.cc
@@ -118,8 +118,9 @@ bool SongParser::smParseField(std::string line) {
 
 			//Here all note data from the current track is inserted into containers 
 			// TODO: support other track types. For now all others are simply ignored.
-			if (notestype == "dance-single" || notestype == "dance-double" || "dance-solo"
-			  || "pump-single" || "ez2-single" || "ez2-real" || "para-single") {
+			if (notestype == "dance-single" || notestype == "dance-double" || notestype == "dance-solo"
+			  || notestype == "pump-single" || notestype == "ez2-single" || notestype == "ez2-real"
+			  || notestype == "para-single") {
 				DanceTrack danceTrack(description, notes);
 				if (m_song.danceTracks.find(notestype) == m_song.danceTracks.end() ) {
 					DanceDifficultyMap danceDifficultyMap;

[Performous-commit] Lasse Karkkainen : Disable SDL key repeat to avoid bogus keypressed ( need to implement it manually for functions that need repeating)

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: 9801cb16a800fef3aa6980e612712b24e6d36c38

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Jan 13 02:52:14 2010 +0200

Disable SDL key repeat to avoid bogus keypressed (need to implement it manually for functions that need repeating)

---

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

diff --git a/game/video_driver.cc b/game/video_driver.cc
index 5f6cc2d..5eb3625 100644
--- a/game/video_driver.cc
+++ b/game/video_driver.cc
@@ -34,7 +34,6 @@ Window::Window(unsigned int width, unsigned int height, bool fs): m_windowW(widt
 	resize();
 	SDL_ShowCursor(SDL_DISABLE);
 	SDL_EnableUNICODE(SDL_ENABLE);
-	SDL_EnableKeyRepeat(80, 80);
 	input::SDL::init();
 }
 

[Performous-commit] Lasse Karkkainen : Add beats processing to songparser.hh, fixing an issue created by my songparser fix.

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: 4d06600a670fb77b8746938c71d6a928ccc85481

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Jan 13 02:49:21 2010 +0200

Add beats processing to songparser.hh, fixing an issue created by my songparser fix.

---

 game/dancegraph.cc    |    4 ++--
 game/songparser-sm.cc |    5 ++---
 game/songparser.hh    |   10 +++++++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index 20afdcb..172a539 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -392,11 +392,11 @@ void DanceGraph::drawBeats(double time) {
 	for (Song::Beats::const_iterator it = m_song.beats.begin(); it != m_song.beats.end() && tBeg < future; ++it, texCoord += texCoordStep, tBeg = tEnd) {
 		tEnd = *it - time;
 		//if (tEnd < past) continue;
-		if (tEnd > future) {
+		/*if (tEnd > future) {
 			// Crop the end off
 			texCoord -= texCoordStep * (tEnd - future) / (tEnd - tBeg);
 			tEnd = future;
-		}
+		}*/
 		glutil::Color c(1.0f, 1.0f, 1.0f, time2a(tEnd));
 		glNormal3f(0.0f, 1.0f, 0.0f); glTexCoord2f(0.0f, texCoord); glVertex2f(-w, time2y(tEnd));
 		glNormal3f(0.0f, 1.0f, 0.0f); glTexCoord2f(1.0f, texCoord); glVertex2f(w, time2y(tEnd));
diff --git a/game/songparser-sm.cc b/game/songparser-sm.cc
index 5ad8433..c1281ba 100644
--- a/game/songparser-sm.cc
+++ b/game/songparser-sm.cc
@@ -68,6 +68,7 @@ void SongParser::smParse() {
 	// Convert stops to the format required in Song
 	s.stops.resize(m_stops.size());
 	for (std::size_t i = 0; i < m_stops.size(); ++i) s.stops[i] = stopConvert(m_stops[i]);
+	m_tsPerBeat = 4;
 }
 	
 bool SongParser::smParseField(std::string line) {
@@ -256,8 +257,6 @@ Notes SongParser::smParseNotes(std::string line) {
 		}
 		chords.push_back(chord);
 	}
-	//The code reaches here only when all data is read from the file.
-	// Add song beat markers
-	for (uint32_t ts = 0, end = 16 * measure; ts < end; ts += 4) m_song.beats.push_back(tsTime(ts));
+	m_tsEnd = std::max(m_tsEnd, measure * 16);
 	return notes;
 }
diff --git a/game/songparser.hh b/game/songparser.hh
index 5a195ad..8165d94 100644
--- a/game/songparser.hh
+++ b/game/songparser.hh
@@ -20,7 +20,9 @@ class SongParser {
 	  m_prevtime(),
 	  m_prevts(),
 	  m_relativeShift(),
-	  m_maxScore()
+	  m_maxScore(),
+	  m_tsPerBeat(),
+	  m_tsEnd()
 	{
 		enum { NONE, TXT, INI, SM } type = NONE;
 		// Read the file, determine the type and do some initial validation checks
@@ -81,6 +83,10 @@ class SongParser {
 		// Set begin/end times
 		if (!s.notes.empty()) s.beginTime = s.notes.front().begin, s.endTime = s.notes.back().end;
 		m_song.m_scoreFactor = 1.0 / m_maxScore;
+		if (m_tsPerBeat) {
+			// Add song beat markers
+			for (unsigned ts = 0; ts < m_tsEnd; ts += m_tsPerBeat) m_song.beats.push_back(tsTime(ts));
+		}
 	}
   private:
 	Song& m_song;
@@ -113,6 +119,8 @@ class SongParser {
 	};
 	typedef std::vector<BPM> bpms_t;
 	bpms_t m_bpms;
+	unsigned m_tsPerBeat;  ///< The ts increment per beat
+	unsigned m_tsEnd;  ///< The ending ts of the song
 	void addBPM(double ts, double bpm) {
 		if (!(bpm >= 1.0 && bpm < 1e12)) throw std::runtime_error("Invalid BPM value");
 		if (!m_bpms.empty() && m_bpms.back().ts >= ts) {

[Performous-commit] Lasse Karkkainen : Fix song parsing to avoid segfaults and to get rid of the bogus notes

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: 52c3ba82b8ec63d75a3b3c5664143659a7feb08d

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Jan 13 02:20:21 2010 +0200

Fix song parsing to avoid segfaults and to get rid of the bogus notes

---

 game/songparser-sm.cc |   42 ++++++++++++++++++++++--------------------
 1 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/game/songparser-sm.cc b/game/songparser-sm.cc
index a9140de..5ad8433 100644
--- a/game/songparser-sm.cc
+++ b/game/songparser-sm.cc
@@ -71,9 +71,10 @@ void SongParser::smParse() {
 }
 	
 bool SongParser::smParseField(std::string line) {
-	if (line.empty() || line == "\r") return true;
-	if (line[0] == '/' && line[1] == '/') return true; //jump over possible comments
-	if (line[0] == ';') return true;
+	boost::trim(line);
+	if (line.empty()) return true;
+	if (line.substr(0, 2) == "//") return true; //jump over possible comments
+	if (line[0] == ';') return true; // HACK: Skip ; left over from previous field
 
 	//Here the data contained by the current line is separated in key and value.
 	//However, because of the differing format of notedata the value is analyzed only if key is not NOTES
@@ -126,7 +127,7 @@ bool SongParser::smParseField(std::string line) {
 				m_song.danceTracks[notestype].insert(std::make_pair(danceDifficulty, danceTrack));
 			}
 		}
-			return false;
+		return false;
 	}
 	std::string value = boost::trim_copy(line.substr(pos + 1));
 	//In case the value continues to several lines, all text before the ending character ';' is read to single line.
@@ -164,18 +165,18 @@ bool SongParser::smParseField(std::string line) {
 	
 			}
 	}
-		/*.sm fileformat has also the following constants but they are ignored in this version of the parser:
-		#SUBTITLE
-		#TITLETRANSLIT
-		#SUBTITLETRANSLIT
-   		#ARTISTTRANSLIT
-		#CREDIT
-   		#CDTITLE
-		#SAMPLESTART
-    		#SAMPLELENGTH
-		#SELECTABLE
-		#BGCHANGE
-		*/
+	/*.sm fileformat has also the following constants but they are ignored in this version of the parser:
+	#SUBTITLE
+	#TITLETRANSLIT
+	#SUBTITLETRANSLIT
+	#ARTISTTRANSLIT
+	#CREDIT
+	#CDTITLE
+	#SAMPLESTART
+		#SAMPLELENGTH
+	#SELECTABLE
+	#BGCHANGE
+	*/
 	// Add beat info to song
 	return true;
 }
@@ -196,9 +197,10 @@ Notes SongParser::smParseNotes(std::string line) {
 	std::map<int, int> holdMarks; // Keeps track of hold notes not yet terminated
 
 	while (getline(line)) {
-		if (line.empty() || line == "\r") continue;
-		if (line[0] == '/' && line[1] == '/') continue;
-		if (line[0] == '#') return notes;
+		boost::trim(line); // Remove whitespace
+		if (line.empty()) continue;
+		if (line.substr(0, 2) == "//") continue;  // Skip comments
+		if (line[0] == '#') break;  // HACK: This should read away the next #NOTES: line
 		if (line[0] == ',' || line[0] == ';') {
 			double end = tsTime(measure * 16.0);
 			unsigned div = chords.size();
@@ -248,7 +250,7 @@ Notes SongParser::smParseNotes(std::string line) {
 			else if(notetype == 'L') note.type = Note::LIFT;
 			else if(notetype >= 'a' && notetype <= 'z') note.type = Note::TAP;
 			else if(notetype >= 'A' && notetype <= 'Z') note.type = Note::TAP;
-			else continue;
+			else throw std::runtime_error(std::string("Invalid note command: ") + notetype);
 			note.note = i;
 			chord[i] = note;
 		}

[Performous-commit] Tapio Vierros : Updated package description.

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: 8aabaf31790ef5176397507b01373e458a68d8a4

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Jan 13 02:19:00 2010 +0200

Updated package description.

---

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

diff --git a/cmake/performous-packaging.cmake b/cmake/performous-packaging.cmake
index 953d7a5..fcfa28c 100644
--- a/cmake/performous-packaging.cmake
+++ b/cmake/performous-packaging.cmake
@@ -1,6 +1,6 @@
 set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
 set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A karaoke and band game where one or more players perform a song and the game scores their performances. Supports songs in UltraStar and Frets on Fire formats. Microphones and instruments from SingStar, Guitar Hero and Rock Band are autodetected.")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A karaoke, band and dancing game where one or more players perform a song and the game scores their performances. Supports songs in UltraStar, Frets on Fire and StepMania formats. Microphones and instruments from SingStar, Guitar Hero and Rock Band as well as some dance pads are autodetected.")
 set(CPACK_PACKAGE_CONTACT "http://performous.org/")
 set(CPACK_SOURCE_IGNORE_FILES
    "/.cvsignore"

[Performous-commit] Tapio Vierros : Enabled 5-7 panel dance game modes after correcting their arrow mappings.

[Tapio V. <aa...@us...>]

Module: performous
Branch: master
Commit: 957e8da426ca2b3867ba08e12865dd8ccb0274cd

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Jan 13 02:08:49 2010 +0200

Enabled 5-7 panel dance game modes after correcting their arrow mappings.

---

 game/dancegraph.cc    |    6 +++---
 game/songparser-sm.cc |    3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index 7c08a2d..20afdcb 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -106,9 +106,9 @@ DanceGraph::DanceGraph(Audio& audio, Song const& song):
 void DanceGraph::gameMode(int direction) {
 	// Position mappings for panels
 	static const int mapping4[max_panels] = {0, 1, 2, 3,-1,-1,-1,-1,-1,-1};
-	static const int mapping5[max_panels] = {0, 1, 2, 4, 3,-1,-1,-1,-1,-1};
+	static const int mapping5[max_panels] = {0, 1, 3, 4, 2,-1,-1,-1,-1,-1};
 	static const int mapping6[max_panels] = {0, 2, 3, 5, 1, 4,-1,-1,-1,-1};
-	static const int mapping7[max_panels] = {0, 3, 4, 7, 1, 6, 2,-1,-1,-1};
+	static const int mapping7[max_panels] = {0, 2, 4, 6, 1, 5, 3,-1,-1,-1};
 	static const int mapping8[max_panels] = {0, 3, 4, 7, 1, 6, 2, 5,-1,-1};
 	static const int mapping10[max_panels]= {0, 3, 4, 7, 1, 6, 2, 5,-1,-1};
 	// Cycling
@@ -135,7 +135,7 @@ void DanceGraph::gameMode(int direction) {
 	else if (gm == "pump-couple") { m_pads = 10; std::copy(mapping10, mapping10+max_panels, m_arrow_map); }
 	else if (gm == "ez2-single") { m_pads = 5; std::copy(mapping5, mapping5+max_panels, m_arrow_map); }
 	else if (gm == "ez2-double") { m_pads = 10; std::copy(mapping10, mapping10+max_panels, m_arrow_map); }
-	else if (gm == "ex2-real") { m_pads = 7; std::copy(mapping7, mapping7+max_panels, m_arrow_map); }
+	else if (gm == "ez2-real") { m_pads = 7; std::copy(mapping7, mapping7+max_panels, m_arrow_map); }
 	else if (gm == "para-single") { m_pads = 5; std::copy(mapping5, mapping5+max_panels, m_arrow_map); }
 	else throw std::runtime_error("Unknown track " + gm);
 	
diff --git a/game/songparser-sm.cc b/game/songparser-sm.cc
index 03ec824..a9140de 100644
--- a/game/songparser-sm.cc
+++ b/game/songparser-sm.cc
@@ -116,7 +116,8 @@ bool SongParser::smParseField(std::string line) {
 
 			//Here all note data from the current track is inserted into containers 
 			// TODO: support other track types. For now all others are simply ignored.
-			if (notestype == "dance-single" || notestype == "dance-double") {
+			if (notestype == "dance-single" || notestype == "dance-double" || "dance-solo"
+			  || "pump-single" || "ez2-single" || "ez2-real" || "para-single") {
 				DanceTrack danceTrack(description, notes);
 				if (m_song.danceTracks.find(notestype) == m_song.danceTracks.end() ) {
 					DanceDifficultyMap danceDifficultyMap;

[Performous-commit] Vincent Le Ligeour : Added song database inside screen songs

[Yoda-JM <yo...@us...>]

Module: performous
Branch: master
Commit: c6f96faf64de7303b43f4e8e42a9ef62ccc4d6b9

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Jan 13 01:06:18 2010 +0100

Added song database inside screen songs

---

 game/main.cc           |    2 +-
 game/screen_hiscore.cc |    2 +-
 game/screen_songs.cc   |    4 ++--
 game/screen_songs.hh   |    4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/game/main.cc b/game/main.cc
index 605c8f6..ba91912 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -145,7 +145,7 @@ void mainLoop(std::string const& songlist) {
 		ScreenManager sm;
 		Window window(config["graphic/window_width"].i(), config["graphic/window_height"].i(), config["graphic/fullscreen"].b());
 		sm.addScreen(new ScreenIntro("Intro", audio, capture));
-		sm.addScreen(new ScreenSongs("Songs", audio, songs));
+		sm.addScreen(new ScreenSongs("Songs", audio, songs, database));
 		sm.addScreen(new ScreenSing("Sing", audio, capture, database, backgrounds));
 		sm.addScreen(new ScreenPractice("Practice", audio, capture));
 		sm.addScreen(new ScreenConfiguration("Configuration", audio));
diff --git a/game/screen_hiscore.cc b/game/screen_hiscore.cc
index eec3f3d..424aed5 100644
--- a/game/screen_hiscore.cc
+++ b/game/screen_hiscore.cc
@@ -13,7 +13,7 @@
 #include <boost/format.hpp>
 
 ScreenHiscore::ScreenHiscore(std::string const& name, Audio& audio, Songs& songs, Database& database):
-  ScreenSongs(name, audio, songs), m_database(database), m_players(database.m_players)
+  ScreenSongs(name, audio, songs, database), m_database(database), m_players(database.m_players)
 {
 	m_players.setAnimMargins(5.0, 5.0);
 }
diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 380bb8f..a5f151b 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -12,8 +12,8 @@
 
 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()
+ScreenSongs::ScreenSongs(std::string const& name, Audio& audio, Songs& songs, Database& database):
+  Screen(name), m_audio(audio), m_songs(songs), m_database(database), m_covers(20), m_jukebox()
 {
 	m_songs.setAnimMargins(5.0, 5.0);
 	m_playTimer.setTarget(getInf()); // Using this as a simple timer counting seconds
diff --git a/game/screen_songs.hh b/game/screen_songs.hh
index 7a59146..964985d 100644
--- a/game/screen_songs.hh
+++ b/game/screen_songs.hh
@@ -3,6 +3,7 @@
 #include <boost/scoped_ptr.hpp>
 #include "animvalue.hh"
 #include "cachemap.hh"
+#include "database.hh"
 #include "screen.hh"
 #include "surface.hh"
 #include "textinput.hh"
@@ -26,7 +27,7 @@ struct ScreenSharedInfo
 class ScreenSongs : public Screen {
   public:
 	/// constructor
-	ScreenSongs(std::string const& name, Audio& audio, Songs& songs);
+	ScreenSongs(std::string const& name, Audio& audio, Songs& songs, Database& database);
 	void enter();
 	void exit();
 	void manageSharedKey(input::NavButton nav); ///< same behaviour for jukebox and normal mode
@@ -41,6 +42,7 @@ class ScreenSongs : public Screen {
 
 	Audio& m_audio;
 	Songs& m_songs;
+	Database& m_database;
 	boost::scoped_ptr<Surface> m_songbg;
 	boost::scoped_ptr<Surface> m_songbg_default;
 	boost::scoped_ptr<Video> m_video;