Menu
▾
▴
performous-commit — SCM commits
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(25) |
Jul
(288) |
Aug
(119) |
Sep
(31) |
Oct
(59) |
Nov
(458) |
Dec
(359) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(268) |
Feb
(26) |
Mar
(36) |
Apr
(48) |
May
(119) |
Jun
(37) |
Jul
(173) |
Aug
(429) |
Sep
(137) |
Oct
(156) |
Nov
(59) |
Dec
(45) |
| 2011 |
Jan
(398) |
Feb
(257) |
Mar
(49) |
Apr
(5) |
May
(34) |
Jun
(11) |
Jul
(38) |
Aug
(12) |
Sep
(1) |
Oct
(49) |
Nov
(5) |
Dec
(10) |
| 2012 |
Jan
(21) |
Feb
(32) |
Mar
(20) |
Apr
(1) |
May
(2) |
Jun
|
Jul
(173) |
Aug
|
Sep
(25) |
Oct
(6) |
Nov
(44) |
Dec
|
|
From: Tapio V. <aa...@us...> - 2010-10-24 13:40:29
|
Module: performous Branch: master Commit: eea7dc9da70636b17d9a2498dd75480cf9cb0f76 Author: Tapio Vierros <tap...@gm...> Date: Sun Oct 24 16:39:22 2010 +0300 Bump cross-compilation dependency library versions. --- win32/cross-from-debian/makedeps.sh | 64 ++++++++++++++++++++++------------- 1 files changed, 40 insertions(+), 24 deletions(-) diff --git a/win32/cross-from-debian/makedeps.sh b/win32/cross-from-debian/makedeps.sh index 253614f..b229876 100755 --- a/win32/cross-from-debian/makedeps.sh +++ b/win32/cross-from-debian/makedeps.sh @@ -151,7 +151,7 @@ if test ! -f "$PREFIX"/build-stamps/zlib; then fi # libpng -LIBPNG="libpng-1.4.2" +LIBPNG="libpng-1.4.4" if test ! -f "$PREFIX"/build-stamps/libpng; then download http://download.sourceforge.net/libpng/$LIBPNG.tar.gz tar zxvf $LIBPNG.tar.gz @@ -179,7 +179,7 @@ if test ! -f "$PREFIX"/build-stamps/libjpeg; then fi # Runtime (libintl) of GNU Gettext -GETTEXT="gettext-0.18" +GETTEXT="gettext-0.18.1.1" if test ! -f "$PREFIX"/build-stamps/gettext-runtime; then download http://ftp.gnu.org/gnu/gettext/$GETTEXT.tar.gz tar zxvf $GETTEXT.tar.gz @@ -301,7 +301,7 @@ if test ! -f "$PREFIX"/build-stamps/sdl; then fi # Freetype -FREETYPE="freetype-2.3.12" +FREETYPE="freetype-2.4.3" if test ! -f "$PREFIX"/build-stamps/freetype; then download http://download.sourceforge.net/freetype/$FREETYPE.tar.bz2 tar jxvf $FREETYPE.tar.bz2 @@ -315,9 +315,9 @@ if test ! -f "$PREFIX"/build-stamps/freetype; then fi # GLib -GLIB="glib-2.24.1" +GLIB="glib-2.26.0" if test ! -f "$PREFIX"/build-stamps/glib; then - download http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/$GLIB.tar.bz2 + download http://ftp.gnome.org/pub/GNOME/sources/glib/2.26/$GLIB.tar.bz2 tar jxvf $GLIB.tar.bz2 cd $GLIB ./configure $COMMON_AUTOCONF_FLAGS @@ -350,7 +350,7 @@ if test ! -f "$PREFIX"/build-stamps/fontconfig; then fi # Pixman -PIXMAN="pixman-0.18.2" +PIXMAN="pixman-0.19.6" if test ! -f "$PREFIX"/build-stamps/pixman; then download http://cairographics.org/releases/$PIXMAN.tar.gz tar zxvf $PIXMAN.tar.gz @@ -380,7 +380,7 @@ fi # Pango # For some reason, the libraries are installed in an extremely uncharacteristic # layout for libtool. Luckily, we have all that we need to make it sane again. -PANGO="pango-1.28.1" +PANGO="pango-1.28.3" if test ! -f "$PREFIX"/build-stamps/pango; then download http://ftp.gnome.org/pub/GNOME/sources/pango/1.28/$PANGO.tar.bz2 tar jxvf $PANGO.tar.bz2 @@ -402,9 +402,9 @@ fi # ATK # We don't really need to build the parts of GTK that use ATK, but GTK's # configure script won't be happy otherwise. -ATK="atk-1.30.0" +ATK="atk-1.32.0" if test ! -f "$PREFIX"/build-stamps/atk; then - download http://ftp.gnome.org/pub/GNOME/sources/atk/1.30/$ATK.tar.bz2 + download http://ftp.gnome.org/pub/GNOME/sources/atk/1.32/$ATK.tar.bz2 tar jxvf $ATK.tar.bz2 cd $ATK ./configure $COMMON_AUTOCONF_FLAGS --disable-glibtest @@ -415,21 +415,35 @@ if test ! -f "$PREFIX"/build-stamps/atk; then $RM_RF $ATK fi +# Gdk-pixbuf +# New versions of GTK require this separately +GDKPIXBUF="gdk-pixbuf-2.22.0" +if test ! -f "$PREFIX"/build-stamps/gdkpixbuf; then + download http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.22/$GDKPIXBUF.tar.bz2 + tar jxvf $GDKPIXBUF.tar.bz2 + cd $GDKPIXBUF + ./configure $COMMON_AUTOCONF_FLAGS --without-libtiff + make + wine-shwrap gdk-pixbuf/gdk-pixbuf-csource + wine-shwrap gdk-pixbuf/gdk-pixbuf-query-loaders + make install + cd .. + touch "$PREFIX"/build-stamps/gdkpixbuf + $RM_RF $ATK +fi + # GTK # Even though Performous only needs libgdk_pixbuf (and then only because # that's how librsvg likes to play ball), having the rest of GTK around # lets other packages build some handy test programs that can be run # under Wine to sanity-check the dependency build. The choice of included # pixbuf loaders is tailored to satisfy said programs. -GTK="gtk+-2.20.1" +GTK="gtk+-2.22.0" if test ! -f "$PREFIX"/build-stamps/gtk; then - download http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.20/$GTK.tar.bz2 + download http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.22/$GTK.tar.bz2 tar jxvf $GTK.tar.bz2 cd $GTK ./configure $COMMON_AUTOCONF_FLAGS --disable-glibtest --disable-modules --without-libtiff --with-included-loaders=png,jpeg,gif,xpm,xbm - make -C gdk-pixbuf - wine-shwrap gdk-pixbuf/gdk-pixbuf-csource - wine-shwrap gdk-pixbuf/gdk-pixbuf-query-loaders make -C gdk make -C gtk gtk-update-icon-cache.exe wine-shwrap gtk/gtk-update-icon-cache @@ -465,7 +479,7 @@ fi # It will try to install a gconf schema on the host unless we tell it not to, # despite the fact that it doesn't have the GNOME libraries it would need to # make any use of it... -LIBGSF="libgsf-1.14.18" +LIBGSF="libgsf-1.14.19" if test ! -f "$PREFIX"/build-stamps/libgsf; then download http://ftp.gnome.org/pub/GNOME/sources/libgsf/1.14/$LIBGSF.tar.bz2 tar jxvf $LIBGSF.tar.bz2 @@ -479,9 +493,9 @@ if test ! -f "$PREFIX"/build-stamps/libgsf; then fi # librsvg -LIBRSVG="librsvg-2.26.3" +LIBRSVG="librsvg-2.32.0" if test ! -f "$PREFIX"/build-stamps/librsvg; then - download http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.26/$LIBRSVG.tar.bz2 + download http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.32/$LIBRSVG.tar.bz2 tar jxvf $LIBRSVG.tar.bz2 cd $LIBRSVG ./configure $COMMON_AUTOCONF_FLAGS --disable-pixbuf-loader --disable-gtk-theme @@ -507,9 +521,9 @@ if test ! -f "$PREFIX"/build-stamps/libsigc++; then fi # libglibmm -GLIBMM="glibmm-2.24.2" +GLIBMM="glibmm-2.25.2" if test ! -f "$PREFIX"/build-stamps/libglibmm; then - download http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.24/$GLIBMM.tar.bz2 + download http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.25/$GLIBMM.tar.bz2 tar jxvf $GLIBMM.tar.bz2 cd $GLIBMM ./configure $COMMON_AUTOCONF_FLAGS @@ -521,9 +535,9 @@ if test ! -f "$PREFIX"/build-stamps/libglibmm; then fi # libxml++ -LIBXMLPP="libxml++-2.30.1" +LIBXMLPP="libxml++-2.32.0" if test ! -f "$PREFIX"/build-stamps/libxml++; then - download http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.30/$LIBXMLPP.tar.bz2 + download http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.32/$LIBXMLPP.tar.bz2 tar jxvf $LIBXMLPP.tar.bz2 cd $LIBXMLPP ./configure $COMMON_AUTOCONF_FLAGS @@ -537,7 +551,7 @@ fi # GLEW, which lacks a build system amenable to cross-compilation. # glewinfo and visualinfo are handy if you ever need something # similar to glxinfo under Windows. -GLEW="glew-1.5.4" +GLEW="glew-1.5.6" if test ! -f "$PREFIX"/build-stamps/glew; then download http://download.sourceforge.net/glew/$GLEW.tgz tar zxvf $GLEW.tgz @@ -560,7 +574,7 @@ if test ! -f "$PREFIX"/build-stamps/glew; then fi # liborc -LIBORC="orc-0.4.5" +LIBORC="orc-0.4.10" if test ! -f "$PREFIX"/build-stamps/liborc; then download http://code.entropywave.com/download/orc/$LIBORC.tar.gz tar zxvf $LIBORC.tar.gz @@ -574,12 +588,14 @@ if test ! -f "$PREFIX"/build-stamps/liborc; then fi # libschroedinger -LIBSCHROE="schroedinger-1.0.9" +LIBSCHROE="schroedinger-1.0.10" if test ! -f "$PREFIX"/build-stamps/libschroedinger; then download http://diracvideo.org/download/schroedinger/$LIBSCHROE.tar.gz tar zxvf $LIBSCHROE.tar.gz cd $LIBSCHROE ./configure $COMMON_AUTOCONF_FLAGS + # We don't want testsuite, so create a dummy Makefile + echo "all:\n\ninstall:" > testsuite/Makefile make make install cd .. |
|
From: Tapio V. <aa...@us...> - 2010-10-24 13:31:52
|
Module: performous
Branch: master
Commit: 9f0802dc0fd60fdff884fd139ac50c8f06846d6c
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 24 16:30:36 2010 +0300
Quick hack to fix per-track volume control.
---
game/screen_sing.cc | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index a0c634a..c9a214b 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -189,18 +189,19 @@ bool ScreenSing::instrumentLayout(double time) {
m_help->draw();
}
// Set volume levels (averages of all instruments playing that track)
+ // FIXME: There should NOT be gettext calls here!
for( std::map<std::string,std::string>::iterator it = m_song->music.begin() ; it != m_song->music.end() ; ++it ) {
double level = 1.0;
- if (volume.find(it->first) == volume.end()) {
+ if (volume.find(_(it->first.c_str())) == volume.end()) {
m_audio.streamFade(it->first, level);
} else {
- CountSum cs = volume[it->first];
+ CountSum cs = volume[_(it->first.c_str())];
if (cs.first > 0) level = cs.second / cs.first;
if (m_song->music.size() <= 1) level = std::max(0.333, level);
m_audio.streamFade(it->first, level);
}
- if (pitchbend.find(it->first) != pitchbend.end()) {
- CountSum cs = pitchbend[it->first];
+ if (pitchbend.find(_(it->first.c_str())) != pitchbend.end()) {
+ CountSum cs = pitchbend[_(it->first.c_str())];
level = cs.second;
m_audio.streamBend(it->first, level);
}
|
|
From: Fredrik K. <sci...@us...> - 2010-10-24 11:16:54
|
Module: performous Branch: master Commit: a5f446f934b077cd108fbfc5f20dd4b0e307cee9 Author: Fredrik Klasson <sci...@gm...> Date: Sun Oct 24 13:16:20 2010 +0200 [ ] Word de-dup. Not bothering to update wiki for this... --- lang/TRANSLATORS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lang/TRANSLATORS b/lang/TRANSLATORS index fb52372..78bf75b 100644 --- a/lang/TRANSLATORS +++ b/lang/TRANSLATORS @@ -22,7 +22,7 @@ fr:STATUS active fr:CONTACT [[User:Yoda|yoda]] (French native speaker) -ja:COMMENT Translations translations not ready for release. +ja:COMMENT Translations not ready for release. ja:STATUS not yet ready #ja:TRANSLATOR [[User:Scientica|scientica]] (not native speaker) ja:CONTACT [[User:Scientica|scientica]] (not native speaker) |
|
From: Fredrik K. <sci...@us...> - 2010-10-24 11:09:34
|
Module: performous Branch: master Commit: 6b8ce73a41c079f1c3ff84bbc4ce9fec4940425e Author: Fredrik Klasson <sci...@gm...> Date: Sun Oct 24 13:08:58 2010 +0200 [ ] Updating all .po files from sources (soon updating the overview on the wiki) --- lang/da.po | 564 +++++++++++++++++++++++++----------------------- lang/de.po | 558 +++++++++++++++++++++++++---------------------- lang/es.po | 544 ++++++++++++++++++++++++---------------------- lang/fi.po | 707 ++++++++++++++++++++++++++++++------------------------------ lang/fr.po | 649 +++++++++++++++++++++++++++---------------------------- lang/hu.po | 539 ++++++++++++++++++++++++---------------------- lang/it.po | 543 ++++++++++++++++++++++++---------------------- lang/ja.po | 311 ++++++++++++++++----------- lang/nl.po | 537 ++++++++++++++++++++++++---------------------- lang/sv.po | 159 +++++++------- 10 files changed, 2663 insertions(+), 2448 deletions(-) |
|
From: Tapio V. <aa...@us...> - 2010-10-24 10:08:37
|
Module: performous
Branch: master
Commit: 7d197dec9de7b77a8bbb72b3df9186e433816efd
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 24 13:07:51 2010 +0300
Handle Windows drive names in backgrounds' cache path construction.
---
game/cache.cc | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/game/cache.cc b/game/cache.cc
index e549763..69974e2 100644
--- a/game/cache.cc
+++ b/game/cache.cc
@@ -1,8 +1,9 @@
#include "cache.hh"
-
#include "fs.hh"
#include <boost/format.hpp>
+#include <algorithm>
+#include <boost/algorithm/string/classification.hpp>
namespace cache {
fs::path constructSVGCacheFileName(fs::path const& svgfilename, double factor){
@@ -16,7 +17,10 @@ namespace cache {
} else {
// We use the full path under cache to avoid name collisions
// with images other than theme files (mostly backgrounds).
- cache_filename = getCacheDir() / "misc" / svgfilename.parent_path() / cache_basename;
+ std::string fullpath = svgfilename.parent_path().string();
+ // Windows drive name handling
+ std::replace_if(fullpath.begin(), fullpath.end(), boost::is_any_of(":"), '_');
+ cache_filename = getCacheDir() / "misc" / fullpath / cache_basename;
}
return cache_filename;
|
|
From: Tapio V. <aa...@us...> - 2010-10-24 09:56:11
|
Module: performous Branch: master Commit: 1872e11e05973a097eeafa27a3418bd4a62a6572 Author: Tapio Vierros <tap...@gm...> Date: Sun Oct 24 12:55:34 2010 +0300 Increase suggested latency for Windows compatibility. --- data/schema.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/data/schema.xml b/data/schema.xml index b5e330a..b84572e 100644 --- a/data/schema.xml +++ b/data/schema.xml @@ -168,7 +168,7 @@ to save the current settings to XML. </entry> <!-- Audio preferences --> - <entry name="audio/latency" type="float" value="0.05"> + <entry name="audio/latency" type="float" value="0.075"> <ui unit=" ms" multiplier="1000" /> <limits min="0.0" max="0.25" step="0.005" /> <locale name="C"> |
|
From: Tapio V. <aa...@us...> - 2010-10-24 09:51:15
|
Module: performous
Branch: master
Commit: 43abd6dfe20a8d9d45c09b4fe64ab335cd49729a
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 24 12:50:45 2010 +0300
Fix a float error.
---
game/screenmanager.cc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/game/screenmanager.cc b/game/screenmanager.cc
index ccdf6d2..640a678 100644
--- a/game/screenmanager.cc
+++ b/game/screenmanager.cc
@@ -2,6 +2,7 @@
#include "fs.hh"
#include "configuration.hh"
#include "glutil.hh"
+#include "util.hh"
#include <boost/thread.hpp>
#include <boost/lexical_cast.hpp>
@@ -42,7 +43,7 @@ Screen* ScreenManager::getScreen(std::string const& name) {
void ScreenManager::loading(std::string const& message, float progress) {
// TODO: Create a better one, this is quite ugly
- flashMessage(message + " " + boost::lexical_cast<std::string>(progress*100) + "%", 0.0f, 1.0f, 1.0f);
+ flashMessage(message + " " + boost::lexical_cast<std::string>(int(round(progress*100))) + "%", 0.0f, 1.0f, 1.0f);
m_window.blank();
drawNotifications();
const int maxi = 20;
|
|
From: Tapio V. <aa...@us...> - 2010-10-24 07:56:14
|
Module: performous
Branch: master
Commit: b843f79c379c3b2278442c2b2c1bbc80a9020946
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 24 10:54:52 2010 +0300
CPack dependencies for Ubuntu 10.04 and 10.10.
---
cmake/performous-packaging.cmake | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/cmake/performous-packaging.cmake b/cmake/performous-packaging.cmake
index b712693..5d5f8dc 100644
--- a/cmake/performous-packaging.cmake
+++ b/cmake/performous-packaging.cmake
@@ -42,7 +42,7 @@ if(UNIX)
set(CPACK_GENERATOR "DEB")
set(CPACK_DEBIAN_PACKAGE_PRIORITY "extra")
set(CPACK_DEBIAN_PACKAGE_SECTION "universe/games")
- set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "ultrastar-songs, ultrastar-songs-restricted, msttcorefonts")
+ set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "ultrastar-songs, ultrastar-songs-restricted, ttf-mscorefonts-installer")
# 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)
@@ -50,16 +50,31 @@ if(UNIX)
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
+
+ # Ubuntu
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")
endif("${LSB_DISTRIB}" MATCHES "Ubuntu9.10")
+
+ if("${LSB_DISTRIB}" MATCHES "Ubuntu10.04")
+ set(CPACK_DEBIAN_PACKAGE_DEPENDS "libsdl1.2debian, libcairo2, librsvg2-2, libboost-thread1.40.0, libboost-program-options1.40.0, libboost-regex1.40.0, libboost-filesystem1.40.0, libboost-date-time1.40.0, libavcodec52|libavcodec-extra-52, libavformat52|libavformat-extra-52, libswscale0, libmagick++2, libxml++2.6-2, libglew1.5, libpng12-0, libjpeg62, libportmidi0, libcv4, libhighgui4")
+ endif("${LSB_DISTRIB}" MATCHES "Ubuntu10.04")
+
+ if("${LSB_DISTRIB}" MATCHES "Ubuntu10.10")
+ set(CPACK_DEBIAN_PACKAGE_DEPENDS "libsdl1.2debian, libcairo2, librsvg2-2, libboost-thread1.42.0, libboost-program-options1.42.0, libboost-regex1.42.0, libboost-filesystem1.42.0, libboost-date-time1.42.0, libavcodec52|libavcodec-extra-52, libavformat52|libavformat-extra-52, libswscale0, libmagick++2, libxml++2.6-2, libglew1.5, libpng12-0, libjpeg62, libportmidi0, libcv2.1, libhighgui2.1")
+ endif("${LSB_DISTRIB}" MATCHES "Ubuntu10.10")
+
+ # Debian
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")
endif("${LSB_DISTRIB}" MATCHES "Debian5.*")
+
if("${LSB_DISTRIB}" MATCHES "Debiantesting")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libsdl1.2debian, libcairo2, librsvg2-2, libboost-dev, libavcodec52, libavformat52, libswscale0, libmagick++3, libxml++2.6-2, libglew1.5")
endif("${LSB_DISTRIB}" MATCHES "Debiantesting")
+
if(NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
message("WARNING: ${LSB_DISTRIB} not supported yet.\nPlease set deps in cmake/performous-packaging.cmake before packaging.")
endif(NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
|
|
From: Yoda-JM <yo...@us...> - 2010-10-24 07:36:09
|
Module: performous
Branch: master
Commit: 33b3ba7f4a751c52554b3288f7cbb6e9e86d498e
Author: Vincent Le Ligeour <yo...@us...>
Date: Sun Oct 24 09:35:18 2010 +0200
Fixed git ebuild and added 0.6.0 ebuild
---
.../performous/performous-0.6.0.ebuild | 111 ++++++++++++++++++++
.../games-arcade/performous/performous-9999.ebuild | 2 +
2 files changed, 113 insertions(+), 0 deletions(-)
diff --git a/portage-overlay/games-arcade/performous/performous-0.6.0.ebuild b/portage-overlay/games-arcade/performous/performous-0.6.0.ebuild
new file mode 100644
index 0000000..7eb426c
--- /dev/null
+++ b/portage-overlay/games-arcade/performous/performous-0.6.0.ebuild
@@ -0,0 +1,111 @@
+# 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 $
+
+[[ ${PV} = 9999 ]] && GIT="git"
+EAPI=2
+
+inherit cmake-utils ${GIT} games
+
+SONGS_PN=ultrastar-songs
+
+DESCRIPTION="Party game similar to Singstar, RockBand, Guitar Hero and Stepmania"
+HOMEPAGE="http://performous.org"
+SRC_URI="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
+ )"
+
+if [ "$PV" != "9999" ]; then
+ MY_PN=Performous
+ MY_P=${MY_PN}-${PV}-Source
+ SRC_URI=" mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+ $SRC_URI"
+else
+ EGIT_REPO_URI="git://performous.git.sourceforge.net/gitroot/performous/performous"
+ EGIT_BRANCH="master"
+fi
+
+LICENSE="GPL-2
+ songs? (
+ CCPL-Attribution-ShareAlike-NonCommercial-2.5
+ CCPL-Attribution-NonCommercial-NoDerivs-2.5
+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug midi songs tools webcam"
+
+RDEPEND="gnome-base/librsvg
+ >=dev-libs/boost-1.39.0
+ 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] )
+ webcam? ( media-libs/opencv[v4l] )
+ >=media-video/ffmpeg-0.4.9_p20070616-r20
+ media-libs/portaudio
+ sys-apps/help2man
+ !games-arcade/ultrastar-ng"
+# Waiting for portmidi to enter portage (#90614)
+#RDEPEND="${RDEPEND}
+# midi? ( media-libs/portmidi )"
+DEPEND="${RDEPEND}
+ >=dev-util/cmake-2.6.0"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+ if [ "${PV}" != "9999" ]; then
+ unpack "${MY_P}.tar.bz2"
+ else
+ git_src_unpack
+ fi
+ cd "${S}"
+ if use songs; then
+ unpack "${SONGS_PN}-jc-1.zip" "${SONGS_PN}-libre-3.zip" "${SONGS_PN}-restricted-3.zip" "${SONGS_PN}-shearer-1.zip"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-gentoopaths.patch
+}
+
+src_configure() {
+ local mycmakeargs="
+ $(cmake-utils_use_enable tools TOOLS)
+ $(cmake-utils_use_no webcam WEBCAM)
+ -DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
+ -DGENTOO_DATA_DIR=${GAMES_DATADIR}/${PN}
+ -DLOCALE_DIR=/usr/share
+ -DCMAKE_BUILD_TYPE=Release"
+# local mycmakeargs="
+# $(cmake-utils_use_no midi MIDI)
+# ${mycmakeargs}"
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ DOCS="docs/*.txt" cmake-utils_src_install
+ mv -f "${D}/${GAMES_PREFIX}/share/man" "${D}/usr/share/"
+ mkdir -p "${D}/${GAMES_DATADIR}/${PN}"
+ mv -f "${D}/${GAMES_PREFIX}/share/games/performous" "${D}/${GAMES_DATADIR}/"
+
+ if use songs; then
+ insinto "${GAMES_DATADIR}/${PN}"
+ doins -r "${S}/songs" || die "doins songs failed"
+ fi
+ doicon "${S}/data/${PN}.xpm"
+ domenu "${S}/data/${PN}.desktop"
+ prepgamesdirs
+}
diff --git a/portage-overlay/games-arcade/performous/performous-9999.ebuild b/portage-overlay/games-arcade/performous/performous-9999.ebuild
index bb9baa1..7eb426c 100644
--- a/portage-overlay/games-arcade/performous/performous-9999.ebuild
+++ b/portage-overlay/games-arcade/performous/performous-9999.ebuild
@@ -19,6 +19,8 @@ SRC_URI="songs? (
)"
if [ "$PV" != "9999" ]; then
+ MY_PN=Performous
+ MY_P=${MY_PN}-${PV}-Source
SRC_URI=" mirror://sourceforge/${PN}/${MY_P}.tar.bz2
$SRC_URI"
else
|
|
From: Tapio V. <aa...@us...> - 2010-10-23 22:22:13
|
Module: performous
Branch: master
Commit: 6f714bb9f1df970e56429454c7d38459f1f8e01e
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 24 01:21:33 2010 +0300
Update TODO (regarding config menu).
---
docs/TODO.txt | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/docs/TODO.txt b/docs/TODO.txt
index 2eb7331..aca4375 100644
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -22,6 +22,7 @@ Big features:
Features:
+- Paths config GUI
- Latency calibration
* Audio roundtrip by analyzing the sound captured by the microphone
* Controller/audio latency by playing blindly (listening to the beat only)
@@ -44,13 +45,6 @@ Text rendering bugs:
- Lyric hilighted should be rendered in front of the others
-New config menu:
-
-- Multiple items visible at once
-- Modifying strings and stringlist items
-- Predefined options from config schema and libda device enumeration
-
-
SS Ripper:
- Compress into Vorbis Ogg and H.264 MKV
|
|
From: Tapio V. <aa...@us...> - 2010-10-23 16:22:24
|
Module: performous
Branch: master
Commit: 1446553a71dd9d7a2124abe6f9bcd078b7cf38d3
Author: Tapio Vierros <tap...@gm...>
Date: Sat Oct 23 19:21:45 2010 +0300
Fix a wrong image used with a menu item.
---
game/screen_intro.cc | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index 1da49db..84e9a7a 100644
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -153,7 +153,6 @@ void ScreenIntro::populateMenu() {
configmain.push_back(MenuOption(_("Graphics"), _("Configure rendering and video settings"), gfxmenu, "intro_configure.svg"));
configmain.push_back(MenuOption(_("Game"), _("Gameplay related options"), gamemenu, "intro_configure.svg"));
configmain.push_back(MenuOption(_("Paths"), _("Setup song and data paths"), "Paths", "intro_configure.svg"));
- configmain.back().image.reset(new Surface(getThemePath("intro_quit.svg")));
// Add to root menu
m_menu.add(MenuOption(_("Configure"), _("Configure audio and game options"), configmain, "intro_configure.svg"));
}
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-10-23 16:13:36
|
Module: performous
Branch: master
Commit: e5f84f909950df964ac1a492b018960effe17f91
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Oct 23 18:11:51 2010 +0200
Further audio init/hang tuning.
---
game/libda/portaudio.hpp | 9 +--------
game/main.cc | 9 ++++-----
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/game/libda/portaudio.hpp b/game/libda/portaudio.hpp
index fb8f9d2..6172e69 100644
--- a/game/libda/portaudio.hpp
+++ b/game/libda/portaudio.hpp
@@ -70,14 +70,7 @@ namespace portaudio {
struct Init {
Init() { PORTAUDIO_CHECKED(Pa_Initialize, ()); }
- ~Init() {
- // Give audio a little time to shutdown but then just quit
- boost::thread audiokiller(Pa_Terminate);
- if (!audiokiller.timed_join(boost::posix_time::milliseconds(5000))) {
- std::cout << "PortAudio BUG: Pa_Terminate hung for more than five seconds. Exiting program." << std::endl;
- exit(1);
- }
- }
+ ~Init() { Pa_Terminate(); }
};
struct Params {
diff --git a/game/main.cc b/game/main.cc
index 8596583..1ce92ff 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -115,18 +115,17 @@ static void checkEvents_SDL(ScreenManager& sm) {
}
void mainLoop(std::string const& songlist) {
- Window window(config["graphic/window_width"].i(), config["graphic/window_height"].i(), config["graphic/fullscreen"].b());
Audio audio;
{ // Print the devices
portaudio::AudioDevices ads;
std::clog << "audio/info:\n" << ads.dump();
}
+ Window window(config["graphic/window_width"].i(), config["graphic/window_height"].i(), config["graphic/fullscreen"].b());
+ Backgrounds backgrounds;
+ Database database(getConfigDir() / "database.xml");
+ Songs songs(database, songlist);
ScreenManager sm(window);
try {
- sm.loading(_("Launching background loaders..."), 0.4);
- Backgrounds backgrounds;
- Database database(getConfigDir() / "database.xml");
- Songs songs(database, songlist);
boost::scoped_ptr<input::MidiDrums> midiDrums;
// TODO: Proper error handling...
try { midiDrums.reset(new input::MidiDrums); } catch (std::runtime_error&) {}
|
|
From: Tapio V. <aa...@us...> - 2010-10-23 16:10:47
|
Module: performous
Branch: master
Commit: 5be9ea201fd5cac029bec1ed50fd47e57ef24963
Author: Tapio Vierros <tap...@gm...>
Date: Sat Oct 23 19:09:40 2010 +0300
Tweak audiokiller delays to get message in screen_audiodevices.
---
game/libda/portaudio.hpp | 8 ++++----
game/screen_audiodevices.cc | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/game/libda/portaudio.hpp b/game/libda/portaudio.hpp
index b4d512d..fb8f9d2 100644
--- a/game/libda/portaudio.hpp
+++ b/game/libda/portaudio.hpp
@@ -73,8 +73,8 @@ namespace portaudio {
~Init() {
// Give audio a little time to shutdown but then just quit
boost::thread audiokiller(Pa_Terminate);
- if (!audiokiller.timed_join(boost::posix_time::milliseconds(2000))) {
- std::cout << "PortAudio BUG: Pa_Terminate hung for more than two seconds. Exiting program." << std::endl;
+ if (!audiokiller.timed_join(boost::posix_time::milliseconds(5000))) {
+ std::cout << "PortAudio BUG: Pa_Terminate hung for more than five seconds. Exiting program." << std::endl;
exit(1);
}
}
@@ -125,8 +125,8 @@ namespace portaudio {
~Stream() {
// Give audio a little time to shutdown but then just quit
boost::thread audiokiller(Pa_CloseStream, m_handle);
- if (!audiokiller.timed_join(boost::posix_time::milliseconds(2000))) {
- std::cout << "PortAudio BUG: Pa_CloseStream hung for more than two seconds. Exiting program." << std::endl;
+ if (!audiokiller.timed_join(boost::posix_time::milliseconds(5000))) {
+ std::cout << "PortAudio BUG: Pa_CloseStream hung for more than five seconds. Exiting program." << std::endl;
exit(1);
}
}
diff --git a/game/screen_audiodevices.cc b/game/screen_audiodevices.cc
index 7208117..4bf0afd 100644
--- a/game/screen_audiodevices.cc
+++ b/game/screen_audiodevices.cc
@@ -177,7 +177,7 @@ bool ScreenAudioDevices::save(bool skip_ui_config) {
size_t unassigned_id = m_devs.size();
// Give audio a little time to shutdown but then just quit
boost::thread audiokiller(boost::bind(&Audio::close, boost::ref(m_audio)));
- if (!audiokiller.timed_join(boost::posix_time::milliseconds(4000)))
+ if (!audiokiller.timed_join(boost::posix_time::milliseconds(2500)))
ScreenManager::getSingletonPtr()->fatalError("Audio hung for some reason.\nPlease restart Performous.");
m_audio.restart(); // Reload audio to take the new settings into use
m_audio.playMusic(getThemePath("menu.ogg"), true); // Start music again
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-10-23 15:50:23
|
Module: performous
Branch: master
Commit: 942715a09afc515d89f86f46c25a1f938fc14fe7
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Oct 23 17:31:02 2010 +0200
Fix engine deinit position in ScreenSing::exit. We really should get rid of enter/exit functions to avoid these bugs.
---
game/screen_sing.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 7cba35c..a0c634a 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -238,12 +238,12 @@ void ScreenSing::danceLayout(double time) {
}
void ScreenSing::exit() {
+ m_engine.reset();
m_score_window.reset();
m_menu.clear();
m_instruments.clear();
m_dancers.clear();
m_layout_singer.reset();
- m_engine.reset();
m_help.reset();
m_pause_icon.reset();
m_cam.reset();
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-10-23 15:50:20
|
Module: performous
Branch: master
Commit: 9bb429e19e8e7f4b5680e90b91aa7ac7083a0b16
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Oct 23 17:29:54 2010 +0200
Remove audiokiller from main.cc. Fix Audio/ScreenManager init order (SM needs to be destroyed before audio).
---
game/main.cc | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/game/main.cc b/game/main.cc
index a694de5..8596583 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -116,13 +116,12 @@ static void checkEvents_SDL(ScreenManager& sm) {
void mainLoop(std::string const& songlist) {
Window window(config["graphic/window_width"].i(), config["graphic/window_height"].i(), config["graphic/fullscreen"].b());
- ScreenManager sm(window);
- sm.loading(_("Audio..."), 0.1);
Audio audio;
{ // Print the devices
portaudio::AudioDevices ads;
std::clog << "audio/info:\n" << ads.dump();
}
+ ScreenManager sm(window);
try {
sm.loading(_("Launching background loaders..."), 0.4);
Backgrounds backgrounds;
@@ -214,12 +213,6 @@ void mainLoop(std::string const& songlist) {
} catch (QuitNow&) {
std::cout << "Terminated." << std::endl;
}
- // Give audio a little time to shutdown but then just quit
- boost::thread audiokiller(boost::bind(&Audio::close, boost::ref(audio)));
- if (!audiokiller.timed_join(boost::posix_time::milliseconds(2000))) {
- std::cout << "Audio hung." << std::endl;
- exit(EXIT_SUCCESS);
- }
}
/// Simple test utility to make mapping of joystick buttons/axes easier
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-10-23 15:50:18
|
Module: performous
Branch: master
Commit: 92d9832b10425a7914d764fe2fd92842ad653864
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Oct 23 17:27:33 2010 +0200
Add hang protection/handling in portaudio.hpp.
---
game/libda/portaudio.hpp | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/game/libda/portaudio.hpp b/game/libda/portaudio.hpp
index a298173..b4d512d 100644
--- a/game/libda/portaudio.hpp
+++ b/game/libda/portaudio.hpp
@@ -4,6 +4,7 @@
* @file portaudio.hpp OOP / RAII wrappers & utilities for PortAudio library.
*/
+#include <boost/thread.hpp>
#include <portaudio.h>
#include <cstdlib>
#include <stdexcept>
@@ -69,7 +70,14 @@ namespace portaudio {
struct Init {
Init() { PORTAUDIO_CHECKED(Pa_Initialize, ()); }
- ~Init() { std::cout << "Pa_Terminate..."; std::cout.flush(); Pa_Terminate(); std::cout << "ok" << std::endl; }
+ ~Init() {
+ // Give audio a little time to shutdown but then just quit
+ boost::thread audiokiller(Pa_Terminate);
+ if (!audiokiller.timed_join(boost::posix_time::milliseconds(2000))) {
+ std::cout << "PortAudio BUG: Pa_Terminate hung for more than two seconds. Exiting program." << std::endl;
+ exit(1);
+ }
+ }
};
struct Params {
@@ -114,7 +122,14 @@ namespace portaudio {
{
PORTAUDIO_CHECKED(Pa_OpenStream, (&m_handle, input, output, sampleRate, framesPerBuffer, flags, functorCallback<Functor>, &functor));
}
- ~Stream() { Pa_CloseStream(m_handle); }
+ ~Stream() {
+ // Give audio a little time to shutdown but then just quit
+ boost::thread audiokiller(Pa_CloseStream, m_handle);
+ if (!audiokiller.timed_join(boost::posix_time::milliseconds(2000))) {
+ std::cout << "PortAudio BUG: Pa_CloseStream hung for more than two seconds. Exiting program." << std::endl;
+ exit(1);
+ }
+ }
operator PaStream*() { return m_handle; }
};
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-10-23 15:50:16
|
Module: performous Branch: master Commit: 18791fa3d379a17161ccaa8f96e4af4e6e29cc3c Author: Lasse Karkkainen <tro...@tr...> Date: Sat Oct 23 14:51:21 2010 +0200 Update URL in Compiling.txt to point to wiki --- docs/Compiling.txt | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/docs/Compiling.txt b/docs/Compiling.txt index 19cecdc..f3e8bb0 100644 --- a/docs/Compiling.txt +++ b/docs/Compiling.txt @@ -39,7 +39,9 @@ Dependencies: - OpenCV (optional) for webcam support - Please refer to http://performous.org/develop.html for packages to install. + http://wiki.performous.org/index.php/Building_and_installing_from_source + for package names on various systems (or just performous.org if the above no + longer works). You can find songs online by Google or at your favorite Torrent sites. We |
|
From: Tapio V. <aa...@us...> - 2010-10-23 15:32:37
|
Module: performous
Branch: master
Commit: c7b3fc0f93604f3a3eea98b9219e9298cfe153b2
Author: Tapio Vierros <tap...@gm...>
Date: Sat Oct 23 18:32:05 2010 +0300
Fix neck coloring.
---
game/guitargraph.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 16d89d0..e45da6b 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -822,7 +822,7 @@ void GuitarGraph::draw(double time) {
texCoord -= texCoordStep * (tEnd - future) / (tEnd - tBeg);
tEnd = future;
}
- glutil::Color(colorize(Color(1.0f, 1.0f, 1.0f, time2a(tEnd)), time + tBeg));
+ glutil::Color c(colorize(Color(1.0f, 1.0f, 1.0f, time2a(tEnd)), time + tBeg));
glNormal3f(0.0f, 1.0f, 0.0f);
glTexCoord2f(0.0f, texCoord); glVertex2f(-w, time2y(tEnd));
glNormal3f(0.0f, 1.0f, 0.0f);
|
|
From: Tapio V. <aa...@us...> - 2010-10-23 14:33:42
|
Module: performous
Branch: master
Commit: 108014f409bd149d310f0e743c3bc6d28c275c4c
Author: Tapio Vierros <tap...@gm...>
Date: Sat Oct 23 17:32:12 2010 +0300
Fix fatal exception from vocal track chooser code.
---
game/screen_sing.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 59f800c..7cba35c 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -304,7 +304,7 @@ void ScreenSing::manageEvent(SDL_Event event) {
m_menu.action();
if (!m_menu.isOpen() && m_audio.isPaused()) m_audio.togglePause();
// Handle updates
- if (m_selectedTrack != m_vocalTrackOpts.so()) {
+ if (m_vocalTrackOpts.ol().size() && m_selectedTrack != m_vocalTrackOpts.so()) {
m_selectedTrack = m_vocalTrackOpts.so();
m_selectedTrackLocalized = _(m_selectedTrack.c_str());
}
|
|
From: Fredrik K. <sci...@us...> - 2010-10-23 14:30:41
|
Module: performous Branch: master Commit: 7c001d300069e27b5d9089fa69fc9e4b91d2e8ff Author: Fredrik Klasson <sci...@gm...> Date: Sat Oct 23 16:30:10 2010 +0200 [ ] Updating swedish translation --- lang/sv.po | 163 +++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 100 insertions(+), 63 deletions(-) |
|
From: Yoda-JM <yo...@us...> - 2010-10-23 14:18:02
|
Module: performous
Branch: master
Commit: 7064185e88d4894a0a8da74eac0aefabaead4828
Author: Vincent Le Ligeour <yo...@us...>
Date: Sat Oct 23 16:17:45 2010 +0200
Fixed finilizing song not done for all vocal tracks
---
game/songparser.cc | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/game/songparser.cc b/game/songparser.cc
index 3728d8e..8a20d98 100644
--- a/game/songparser.cc
+++ b/game/songparser.cc
@@ -116,20 +116,23 @@ SongParser::SongParser(Song& s):
void SongParser::finalize() {
- // Adjust negative notes
- VocalTrack& vocal = m_song.getVocalTrack();
- if (vocal.noteMin <= 0) {
- unsigned int shift = (1 - vocal.noteMin / 12) * 12;
- vocal.noteMin += shift;
- vocal.noteMax += shift;
- for (Notes::iterator it = vocal.notes.begin(); it != vocal.notes.end(); ++it) {
- it->note += shift;
- it->notePrev += shift;
+ std::vector<std::string> tracks = m_song.getVocalTrackNames();
+ for(std::vector<std::string>::const_iterator it = tracks.begin() ; it != tracks.end() ; ++it) {
+ // Adjust negative notes
+ VocalTrack& vocal = m_song.getVocalTrack(*it);
+ if (vocal.noteMin <= 0) {
+ unsigned int shift = (1 - vocal.noteMin / 12) * 12;
+ vocal.noteMin += shift;
+ vocal.noteMax += shift;
+ for (Notes::iterator it = vocal.notes.begin(); it != vocal.notes.end(); ++it) {
+ it->note += shift;
+ it->notePrev += shift;
+ }
}
+ // Set begin/end times
+ if (!vocal.notes.empty()) vocal.beginTime = vocal.notes.front().begin, vocal.endTime = vocal.notes.back().end;
+ vocal.m_scoreFactor = 1.0 / m_maxScore;
}
- // Set begin/end times
- if (!vocal.notes.empty()) vocal.beginTime = vocal.notes.front().begin, vocal.endTime = vocal.notes.back().end;
- vocal.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));
|
|
From: Yoda-JM <yo...@us...> - 2010-10-23 13:53:34
|
Module: performous Branch: master Commit: 94db4bc7142baf6acf69826fa4154249bd70cc89 Author: Vincent Le Ligeour <yo...@us...> Date: Sat Oct 23 15:52:42 2010 +0200 Revert "Add back dummy screen_configuration.* as a work-around for ppa troubles." This commit is not needed in new release This reverts commit b9b699fa39d0a9ab0f999a58c4b4d2850ab42b5a. --- game/screen_configuration.cc | 4 ---- game/screen_configuration.hh | 4 ---- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/game/screen_configuration.cc b/game/screen_configuration.cc deleted file mode 100644 index 9b09ff0..0000000 --- a/game/screen_configuration.cc +++ /dev/null @@ -1,4 +0,0 @@ -// Dummy file -// The PPA deb packaging diff doesn't seem to know how to delete files, -// so this is here as a work-around to avoid compilation errors. -// If someone knows how to fix this, the ppa script is tools/ppa/ppa.sh diff --git a/game/screen_configuration.hh b/game/screen_configuration.hh deleted file mode 100644 index 9b09ff0..0000000 --- a/game/screen_configuration.hh +++ /dev/null @@ -1,4 +0,0 @@ -// Dummy file -// The PPA deb packaging diff doesn't seem to know how to delete files, -// so this is here as a work-around to avoid compilation errors. -// If someone knows how to fix this, the ppa script is tools/ppa/ppa.sh |
|
From: Yoda-JM <yo...@us...> - 2010-10-23 13:49:40
|
Module: performous Branch: master Commit: d98a34e2b9a929f393e7af5af2799ed36d69b86f Author: Vincent Le Ligeour <yo...@us...> Date: Sat Oct 23 15:49:24 2010 +0200 Updated French translation (do not forget to add *.hh to C/C++ poedit parser) --- lang/fr.po | 160 ++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 98 insertions(+), 62 deletions(-) |
|
From: Yoda-JM <yo...@us...> - 2010-10-23 13:39:21
|
Module: performous Branch: master Commit: c7ddd6ee7f50aa35060f62aa926c189098e33746 Author: Vincent Le Ligeour <yo...@us...> Date: Sat Oct 23 15:39:04 2010 +0200 Updated French translation --- lang/fr.po | 847 ++++++++++++++++++++++++++++++------------------------------ 1 files changed, 425 insertions(+), 422 deletions(-) |
|
From: Fredrik K. <sci...@us...> - 2010-10-23 13:31:42
|
Module: performous Branch: master Commit: d9d9de8ebc6214df6adb57fcbac9c05fa5e4e3a8 Author: Fredrik Klasson <sci...@gm...> Date: Sat Oct 23 15:31:08 2010 +0200 [ ] Updating swedish translation --- lang/sv.po | 290 ++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 154 insertions(+), 136 deletions(-) |
