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: Peque <ms...@us...> - 2009-12-06 01:57:17
|
Module: performous Branch: master Commit: debfb431f8cf6277eab13047cbc54998d29e4a05 Author: Miguel Sánchez de León Peque <msd...@gm...> Date: Fri Nov 27 23:02:34 2009 +0100 Added changes on SVG images, still trying Intro Menu, not working... --- game/screen_intro.cc | 7 +++ game/theme.cc | 2 +- game/theme.hh | 2 +- themes/default/songs_bg.svg | 61 +++++++++++---------------- themes/default/songs_bg_default.svg | 78 ++++------------------------------- 5 files changed, 43 insertions(+), 107 deletions(-) |
|
From: Peque <ms...@us...> - 2009-12-06 01:57:15
|
Module: performous Branch: master Commit: 2c8fee2a641993fea7ed9e7b2105cee4ce84de85 Author: Miguel Sánchez de León Peque <msd...@gm...> Date: Fri Nov 27 21:24:50 2009 +0100 testing intro menu, not working yet... --- docs/Compiling.txt | 2 +- game/screen_intro.cc | 18 +- game/screen_intro.hh | 5 +- game/theme.cc | 7 + game/theme.hh | 12 + themes/default/prueba_configure.svg | 499 +++++++++++++++++++++++++++++++++++ themes/default/prueba_intro.svg | 416 +++++++++++++++++++++++++++++ themes/default/prueba_practice.svg | 499 +++++++++++++++++++++++++++++++++++ themes/default/prueba_quit.svg | 499 +++++++++++++++++++++++++++++++++++ themes/default/prueba_sing.svg | 499 +++++++++++++++++++++++++++++++++++ 10 files changed, 2450 insertions(+), 6 deletions(-) |
|
From: Peque <ms...@us...> - 2009-12-06 01:57:14
|
Module: performous
Branch: master
Commit: f0115ff02ab2faae17ecc39145d9c2a58861f0e5
Author: Miguel Sánchez de León Peque <miguel@vostro1520.(none)>
Date: Wed Nov 25 17:28:44 2009 +0100
Little change for testing GIT
---
game/screen_intro.cc | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index c48e9b6..e8a9acc 100644
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -29,6 +29,11 @@ void ScreenIntro::manageEvent(SDL_Event event) {
else if (key == SDLK_s) sm->activateScreen("Songs");
else if (key == SDLK_c) sm->activateScreen("Configuration");
else if (key == SDLK_p) sm->activateScreen("Practice");
+
+ else if (key == SDLK_LEFT) {
+ sm->activateScreen("Practice");
+ }
+
else if (key == SDLK_SPACE || key == SDLK_PAUSE) m_audio.togglePause();
} else if (event.type == SDL_JOYBUTTONDOWN) {
int button = event.jbutton.button;
|
|
From: Peque <ms...@us...> - 2009-12-06 01:57:13
|
Module: performous
Branch: master
Commit: 5c57eb8ccf571551f5c72a6a29ec9d1eb79703f4
Author: Miguel Sánchez de León Peque <msd...@gm...>
Date: Wed Nov 25 17:55:56 2009 +0100
Revert "Little change for testing GIT"
This reverts commit f0115ff02ab2faae17ecc39145d9c2a58861f0e5.
---
game/screen_intro.cc | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index e8a9acc..c48e9b6 100644
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -29,11 +29,6 @@ void ScreenIntro::manageEvent(SDL_Event event) {
else if (key == SDLK_s) sm->activateScreen("Songs");
else if (key == SDLK_c) sm->activateScreen("Configuration");
else if (key == SDLK_p) sm->activateScreen("Practice");
-
- else if (key == SDLK_LEFT) {
- sm->activateScreen("Practice");
- }
-
else if (key == SDLK_SPACE || key == SDLK_PAUSE) m_audio.togglePause();
} else if (event.type == SDL_JOYBUTTONDOWN) {
int button = event.jbutton.button;
|
|
From: Peque <ms...@us...> - 2009-12-05 17:39:36
|
Module: performous Branch: menu Commit: 76b732d09e4ce8f354513fbddc0c711a1f1d6f2e Author: Miguel Sánchez de León Peque <peq...@ho...> Date: Sat Dec 5 18:38:37 2009 +0100 Fixed logo position in all screens. --- themes/default/configuration_bg.svg | 2 +- themes/default/intro_bg.svg | 2 +- themes/default/practice_bg.svg | 2 +- themes/default/songs_bg.svg | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) |
|
From: Peque <ms...@us...> - 2009-12-05 17:30:20
|
Module: performous
Branch: menu
Commit: f406fc93f47b383aaeab2e3c39ae1d6a90dc1317
Author: Miguel Sánchez de León Peque <peq...@ho...>
Date: Sat Dec 5 18:29:30 2009 +0100
Fixed dialog text quality
---
game/dialog.hh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/game/dialog.hh b/game/dialog.hh
index b6ca088..65b7d8e 100644
--- a/game/dialog.hh
+++ b/game/dialog.hh
@@ -3,6 +3,7 @@
#include "opengl_text.hh"
#include "fs.hh"
#include "surface.hh"
+#include "configuration.hh"
/// class for printing dialogues
class Dialog {
@@ -11,7 +12,7 @@ class Dialog {
Dialog(std::string const& text):
m_text(text),
m_dialog(getThemePath("warning.svg")),
- m_svgText(getThemePath("dialog_txt.svg"))
+ m_svgText(getThemePath("dialog_txt.svg"), config["graphic/text_lod"].f())
{
m_dialog.dimensions.fixedWidth(0.8);
}
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-12-05 17:20:37
|
Module: performous
Branch: menu
Commit: 9c1cd8e4779101e2617d053ddb75f8240e9cd124
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Dec 5 19:20:24 2009 +0200
Use text_lod for selected menu item too
---
game/theme.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/game/theme.cc b/game/theme.cc
index a11ed03..69feb9b 100755
--- a/game/theme.cc
+++ b/game/theme.cc
@@ -43,7 +43,7 @@ ThemeConfiguration::ThemeConfiguration():
ThemeIntro::ThemeIntro():
Theme(getThemePath("intro_bg.svg")),
back_h(getThemePath("menu_back_highlight.svg")),
- option_selected(getThemePath("menu_option_selected.svg")),
+ option_selected(getThemePath("menu_option_selected.svg"), config["graphic/text_lod"].f()),
comment(getThemePath("menu_comment.svg"), config["graphic/text_lod"].f()),
comment_bg(getThemePath("menu_comment_bg.svg"))
{
|
|
From: Yoda-JM <yo...@us...> - 2009-12-05 13:12:41
|
Module: web Branch: master Commit: 02f714b61cf4c6880b707ffd6b348a5f7fd49a3a Author: Vincent Le Ligeour <yo...@us...> Date: Sat Dec 5 14:12:28 2009 +0100 Removed unsused RSH env --- deploy.sh | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index 0cef3e7..76d81dc 100644 --- a/deploy.sh +++ b/deploy.sh @@ -9,12 +9,10 @@ case $1 in tronic) GITPATH=~/performous-web SITEPATH=performous.org:/wwwhome/performous/ - RSH=sh ;; yoda) GITPATH=~/git/web SITEPATH=root@www:/pub/www/performous/ - RSH=ssh ;; *) echo "-!- \"$1\" is not a valid profile" |
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-12-05 13:07:37
|
Module: web
Branch: master
Commit: 68fe890ecbb32097810601c842521e99201a66f7
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Dec 5 15:06:22 2009 +0200
Change rsync commands so that they work for me, hopefully not breaking Yoda...
Update the news post.
---
deploy.sh | 4 ++--
htdocs-binary/imgs/lifehacker-effect.png | Bin 0 -> 1542 bytes
htdocs-binary/imgs/windows.jpg | Bin 0 -> 11609 bytes
.../screenshots/Performous-0.4.0-Windows.jpg | Bin 0 -> 68332 bytes
htdocs-source/index.txt | 13 ++++++++-----
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/deploy.sh b/deploy.sh
index e4017d7..0cef3e7 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -29,8 +29,8 @@ echo ">>> Rebuilding and installing the website"
TEMPPATH=`mktemp -d`
${GITPATH}/webconv/webconv-x86-linux.bin ${GITPATH}/htdocs-source ${TEMPPATH} &&
-rsync --rsh ${RSH} --archive --verbose ${TEMPPATH}/* ${SITEPATH} &&
-rsync --rsh ${RSH} --archive --verbose ${GITPATH}/htdocs-binary/* ${SITEPATH} &&
+rsync -r --verbose ${TEMPPATH}/* ${SITEPATH} &&
+rsync -r --verbose ${GITPATH}/htdocs-binary/* ${SITEPATH} &&
echo ">>> INSTALLATION SUCCESSFUL" ||
echo "-!- INSTALLATION FAILED"
diff --git a/htdocs-binary/imgs/lifehacker-effect.png b/htdocs-binary/imgs/lifehacker-effect.png
new file mode 100644
index 0000000..5191f97
Binary files /dev/null and b/htdocs-binary/imgs/lifehacker-effect.png differ
diff --git a/htdocs-binary/imgs/windows.jpg b/htdocs-binary/imgs/windows.jpg
new file mode 100644
index 0000000..976777d
Binary files /dev/null and b/htdocs-binary/imgs/windows.jpg differ
diff --git a/htdocs-binary/screenshots/Performous-0.4.0-Windows.jpg b/htdocs-binary/screenshots/Performous-0.4.0-Windows.jpg
new file mode 100644
index 0000000..df9f42a
Binary files /dev/null and b/htdocs-binary/screenshots/Performous-0.4.0-Windows.jpg differ
diff --git a/htdocs-source/index.txt b/htdocs-source/index.txt
index 7eb06fd..f9e4fb9 100644
--- a/htdocs-source/index.txt
+++ b/htdocs-source/index.txt
@@ -1,12 +1,15 @@
Announcements
-:h2:2009-12-05 - The Slashd-- Life Hacker Effect
-I was wondering why my network connection was getting slow while playing <a href="http://springrts.com/">TA Spring</a> (a great open-source RTS game, you should check it out too). The site stats revealed that <a href="http://lifehacker.com/5419099/performous-is-like-rock-band-for-your-linux-pc">LifeHacker</a> had linked to us and even though I had never heard of that site before, it is apparently very popular. Just today there have been more page views than in the entire October and the day isn't even over yet :)
+:h2:2009-12-05 - The Slashd-- LifeHacker Effect
+<img src="imgs/lifehacker-effect.png" style="float: right; border: 0;">
+I was wondering why my network connection was lagging while playing <a href="http://springrts.com/">TA Spring</a> (a great open-source RTS game which you should also check out). The site stats revealed that <a href="http://lifehacker.com/5419099/performous-is-like-rock-band-for-your-linux-pc">LifeHacker</a> had linked to us and even though I had never heard of that site before, it is apparently very popular, as seen in the statistic where you can see a huge peak even though the day isn't even over yet (picture taken at 15:00). :)
-Someone also made a <a href="http://www.youtube.com/watch?v=nmSTnbBZoqI">Youtube video</a> of Performous 0.3.2 today. Check it out and see if you can listen. He doesn't have microphone connected to the game, apparently, so you can't see the pitch display and scoring parts at all :(
+Someone also made a <a href="http://www.youtube.com/watch?v=nmSTnbBZoqI">Youtube video</a> of Performous 0.3.2 today. Unfortunately he doesn't have microphone connected to the game, apparently, so you can't see the pitch display and scoring parts at all :(
-<img src="imgs/windows.jpg">
-In other news, we have working Windows binaries (thanks to the hard work by <strong>Xaldyz</strong>) and it seems that we will be able to release these with the upcoming 0.4.1 release. OSX bundle doesn't look so good as apparently there are problems with bundling some of the libraries use. Compiling on MacPorts yourself is easy, so please consider that if you are a Mac user (instructions on the Hacking page).
+<a href="screenshots/Performous-0.4.0-Windows.jpg"><img src="imgs/windows.jpg" style="float: left; margin-right: 2mm;"></a>
+In other news, we have working <strong>Windows binaries</strong> (thanks to the hard work by Xaldyz) and it seems that we will be able to release these with the upcoming 0.4.1 release, even though some cleanup and an installer are required.
+
+The OSX bundle doesn't look so good as apparently there are problems with bundling some of the libraries used. Compiling on MacPorts yourself is easy, so please consider that if you are a Mac user (there are instructions on the Hacking page).
:h2:2009-11-28 - Performous 0.4.0 released
<img src="imgs/guitar_sing-small.jpg"><img src="imgs/band-small.jpg" style="margin-left: 1mm">
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-12-05 13:07:36
|
Module: web Branch: master Commit: 72b0ad316c8d5b7e1672a01bf556ba49dd90acac Author: Lasse Karkkainen <tro...@tr...> Date: Sat Dec 5 14:34:53 2009 +0200 Tronic's path in deploy.sh --- htdocs-source/deploy.sh => deploy.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs-source/deploy.sh b/deploy.sh similarity index 91% rename from htdocs-source/deploy.sh rename to deploy.sh index eb1005b..e4017d7 100644 --- a/htdocs-source/deploy.sh +++ b/deploy.sh @@ -7,8 +7,8 @@ fi case $1 in tronic) - GITPATH=~/src/performous-web - SITEPATH=~/public_html/performous + GITPATH=~/performous-web + SITEPATH=performous.org:/wwwhome/performous/ RSH=sh ;; yoda) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-12-05 13:07:36
|
Module: web Branch: master Commit: f534654b2553796788f6f8f25f0f7de153ee0f33 Author: Lasse Karkkainen <tro...@tr...> Date: Sat Dec 5 14:35:14 2009 +0200 News update --- htdocs-source/index.txt | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/htdocs-source/index.txt b/htdocs-source/index.txt index 22f3001..7eb06fd 100644 --- a/htdocs-source/index.txt +++ b/htdocs-source/index.txt @@ -1,5 +1,13 @@ Announcements +:h2:2009-12-05 - The Slashd-- Life Hacker Effect +I was wondering why my network connection was getting slow while playing <a href="http://springrts.com/">TA Spring</a> (a great open-source RTS game, you should check it out too). The site stats revealed that <a href="http://lifehacker.com/5419099/performous-is-like-rock-band-for-your-linux-pc">LifeHacker</a> had linked to us and even though I had never heard of that site before, it is apparently very popular. Just today there have been more page views than in the entire October and the day isn't even over yet :) + +Someone also made a <a href="http://www.youtube.com/watch?v=nmSTnbBZoqI">Youtube video</a> of Performous 0.3.2 today. Check it out and see if you can listen. He doesn't have microphone connected to the game, apparently, so you can't see the pitch display and scoring parts at all :( + +<img src="imgs/windows.jpg"> +In other news, we have working Windows binaries (thanks to the hard work by <strong>Xaldyz</strong>) and it seems that we will be able to release these with the upcoming 0.4.1 release. OSX bundle doesn't look so good as apparently there are problems with bundling some of the libraries use. Compiling on MacPorts yourself is easy, so please consider that if you are a Mac user (instructions on the Hacking page). + :h2:2009-11-28 - Performous 0.4.0 released <img src="imgs/guitar_sing-small.jpg"><img src="imgs/band-small.jpg" style="margin-left: 1mm"> A major new release that not only contains improvements to the singing game you all love but more importantly extends the game into a full-fledged band game. Since the pre-release at <a href="http://assembly.org/">Assembly Summer 2009</a> demo party, a large amount of improvements have been done, improving both the gameplay and the graphics. It is not perfect yet, but this certainly is a good time to make a release. Changes since 0.3.2 include: |
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-12-05 13:07:34
|
Module: web Branch: master Commit: e46becfc28490d4fb6258dda20eb58dfe3d74e14 Author: Lasse Karkkainen <tro...@tr...> Date: Sat Dec 5 13:47:27 2009 +0200 Add JamLegend --- htdocs-source/AWC-cfg.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/htdocs-source/AWC-cfg.txt b/htdocs-source/AWC-cfg.txt index 1f1e28c..5263089 100644 --- a/htdocs-source/AWC-cfg.txt +++ b/htdocs-source/AWC-cfg.txt @@ -24,6 +24,7 @@ % Guitar games: .http://fretsonfire.sourceforge.net/ Frets on Fire .http://code.google.com/p/fofix/ FoFiX +.http://www.jamlegend.com/ JamLegend % Dance games: .http://www.stepmania.com/ StepMania |
|
From: Jaakko N. <jni...@us...> - 2009-12-05 13:05:01
|
Module: performous Branch: dance Commit: 3699f705ede676e12243700f7d489924bb1d9201 Author: Jaakko Nikkola <jaa...@tk...> Date: Sat Dec 5 15:01:29 2009 +0200 Merge branch 'dance' of jni...@gi...:/gitroot/performous/performous into dance --- |
|
From: Jaakko N. <jni...@us...> - 2009-12-05 13:05:01
|
Module: performous
Branch: dance
Commit: 5fb62f793d147322e4c7d79ee69f35b7ebed4108
Author: Jaakko Nikkola <jaa...@tk...>
Date: Sat Dec 5 15:00:36 2009 +0200
Multiple BPM reading problems fixed.
---
game/songparser-sm.cc | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/game/songparser-sm.cc b/game/songparser-sm.cc
index c6b2e25..2054d92 100644
--- a/game/songparser-sm.cc
+++ b/game/songparser-sm.cc
@@ -49,7 +49,7 @@ void SongParser::smParse() {
while (getline(line) && smParseField(line)) {}
if (m_song.danceTracks.empty() ) throw std::runtime_error("No note data in the file");
if (s.title.empty() || s.artist.empty()) throw std::runtime_error("Required header fields missing");
- if (m_bpm != 0.0) addBPM(0, m_bpm);
+ //if (m_bpm != 0.0) addBPM(0, m_bpm);
}
bool SongParser::smParseField(std::string line) {
if (line.empty() || line == "\r") return true;
@@ -102,7 +102,13 @@ bool SongParser::smParseField(std::string line) {
}
return false;
}
- std::string value = boost::trim_copy(line.substr(pos + 1));
+ std::string value = boost::trim_copy(line.substr(pos + 1));
+ //values that continue to next line are handeled here
+ while (value[value.size() -1] != ';') {
+ std::string str;
+ getline (str);
+ value += boost::trim_copy(str);
+ }
value = value.substr(0, value.size() - 1); // compared to txtParseField, here last character(';') is eliminated
if (value.empty()) return true;
if (key == "TITLE") m_song.title = value.substr(value.find_first_not_of(" :"));
@@ -112,13 +118,14 @@ bool SongParser::smParseField(std::string line) {
else if (key == "BACKGROUND") m_song.background = value;
else if (key == "OFFSET") assign(m_song.start, value);
else if (key == "BPMS"){
- std::replace(value.begin(), value.end(), ';', ','); // replacing the last ';'
- std::istringstream iss(value);
- std::string ts, bpm; //ts is the timestamp of the bpm
- while(std::getline(iss, ts, '=') && std::getline(iss, bpm, ',')) {
- if(atof(ts.c_str()) == 0) assign(m_bpm, bpm);
- else addBPM(atof(ts.c_str()), atof(bpm.c_str()));
- }
+ std::istringstream iss(value);
+ double ts, bpm;
+ char chr;
+ while (iss >> ts >> chr >> bpm) {
+ if (ts == 0.0) m_bpm = bpm;
+ addBPM(ts, bpm);
+ if (!(iss >> chr)) break;
+ }
}
/*additionally .sm fileformat has following constants:
#SUBTITLE
|
|
From: Yoda-JM <yo...@us...> - 2009-12-05 13:02:10
|
Module: performous
Branch: master
Commit: 8a07936067e48beee8d3a061e6b8c7ac3fcb6a54
Author: Vincent Le Ligeour <yo...@us...>
Date: Sat Dec 5 14:01:13 2009 +0100
Added track name to highscore display
---
game/database.cc | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/game/database.cc b/game/database.cc
index 5b06dda..d04741c 100644
--- a/game/database.cc
+++ b/game/database.cc
@@ -113,8 +113,8 @@ void Database::queryPerSongHiscore (std::ostream & os, boost::shared_ptr<Song> s
{
os << i+1 << ".\t"
<< m_players.lookup(hi[i].playerid) << "\t"
- // << hi[i].track << "\t"
- << hi[i].score << "\n";
+ << hi[i].score << "\t"
+ << "(" << hi[i].track << ")\n";
}
}
@@ -125,8 +125,8 @@ void Database::queryPerPlayerHiscore (std::ostream & os, std::string const& trac
{
os << i+1 << ".\t"
<< m_songs.lookup(hi[i].songid) << "\t"
- // << hi[i].track << "\t"
- << hi[i].score << "\n";
+ << hi[i].score << "\t"
+ << "(" << hi[i].track << ")\n";
}
}
|
|
From: Yoda-JM <yo...@us...> - 2009-12-05 11:00:23
|
Module: web
Branch: master
Commit: 2a3ac806a6c6fdcb4adee8756d2b0e47f74194a5
Author: Vincent Le Ligeour <yo...@us...>
Date: Sat Dec 5 11:59:57 2009 +0100
Fixed robot filename
---
htdocs-binary/{robot.txt => robots.txt} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/htdocs-binary/robot.txt b/htdocs-binary/robots.txt
similarity index 100%
rename from htdocs-binary/robot.txt
rename to htdocs-binary/robots.txt
|
|
From: Yoda-JM <yo...@us...> - 2009-12-05 10:27:17
|
Module: web Branch: master Commit: f9da3d3df67f18b5cc9fa2be4fc0ca27b41bf376 Author: Vincent Le Ligeour <yo...@us...> Date: Sat Dec 5 11:27:01 2009 +0100 Added robot.txt file --- htdocs-binary/robot.txt | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/htdocs-binary/robot.txt b/htdocs-binary/robot.txt new file mode 100644 index 0000000..eb05362 --- /dev/null +++ b/htdocs-binary/robot.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: |
|
From: Yoda-JM <yo...@us...> - 2009-12-05 10:16:35
|
Module: web Branch: master Commit: 46fe07037884601e2fea6fa99cf742ee8b5273dd Author: Vincent Le Ligeour <yo...@us...> Date: Sat Dec 5 11:15:44 2009 +0100 Enhanced deploy script / Added non-generated files --- htdocs-binary/icon.png | Bin 0 -> 1892 bytes htdocs-binary/imgs/band-small.jpg | Bin 0 -> 19894 bytes htdocs-binary/imgs/bday.png | Bin 0 -> 47110 bytes htdocs-binary/imgs/guitar_sing-small.jpg | Bin 0 -> 20498 bytes htdocs-binary/imgs/intro.png | Bin 0 -> 4157 bytes htdocs-binary/imgs/songs-small.jpg | Bin 0 -> 18784 bytes htdocs-binary/imgs/title.png | Bin 0 -> 42038 bytes htdocs-binary/photos/img1.jpg | Bin 0 -> 42956 bytes htdocs-binary/photos/img2.jpg | Bin 0 -> 65443 bytes htdocs-binary/photos/img3.jpg | Bin 0 -> 52396 bytes htdocs-binary/photos/img4.jpg | Bin 0 -> 52343 bytes htdocs-binary/photos/img5.jpg | Bin 0 -> 67097 bytes htdocs-binary/photos/youtube-joanna.jpg | Bin 0 -> 32095 bytes htdocs-binary/screenshots/Performous-0.3-menu.png | Bin 0 -> 54559 bytes htdocs-binary/screenshots/Performous-0.3-score.png | Bin 0 -> 140474 bytes .../screenshots/Performous-0.3-score2.png | Bin 0 -> 51296 bytes htdocs-binary/screenshots/Performous-0.3-songs.png | Bin 0 -> 64809 bytes .../screenshots/Performous-0.3.1-menu.png | Bin 0 -> 87089 bytes .../screenshots/Performous-0.3.1-practice.png | Bin 0 -> 95165 bytes .../screenshots/Performous-0.3.1-sing.jpg | Bin 0 -> 86637 bytes .../screenshots/Performous-0.3.1-sing.png | Bin 0 -> 540555 bytes .../screenshots/Performous-0.3.1-songs.jpg | Bin 0 -> 60518 bytes .../screenshots/Performous-0.3.1-songs.png | Bin 0 -> 337855 bytes .../screenshots/Performous-0.4.0-band.jpg | Bin 0 -> 63092 bytes .../Performous-0.4.0-choose_instruments.jpg | Bin 0 -> 84700 bytes .../screenshots/Performous-0.4.0-guitar.jpg | Bin 0 -> 104689 bytes .../screenshots/Performous-0.4.0-guitar_sing.jpg | Bin 0 -> 77946 bytes .../screenshots/Performous-0.4.0-sing.jpg | Bin 0 -> 88096 bytes .../screenshots/Performous-0.4.0-songs.jpg | Bin 0 -> 78816 bytes htdocs-binary/screenshots/intro_0.2.1.png | Bin 0 -> 43735 bytes htdocs-binary/screenshots/sing_0.2.1-svn.png | Bin 0 -> 336219 bytes htdocs-binary/screenshots/sing_0.2.1.png | Bin 0 -> 228478 bytes htdocs-binary/screenshots/sing_pre-0.3.png | Bin 0 -> 247157 bytes htdocs-binary/screenshots/songs_0.2.1.png | Bin 0 -> 113624 bytes htdocs-binary/songimgs/jc.jpg | Bin 0 -> 31429 bytes htdocs-binary/songimgs/libre.png | Bin 0 -> 51680 bytes htdocs-binary/songimgs/restricted.png | Bin 0 -> 5230 bytes htdocs-binary/songimgs/shearer.jpg | Bin 0 -> 15368 bytes htdocs-binary/style.css | 139 ++++++++++++++++++++ htdocs-source/deploy.sh | 29 ++++- 40 files changed, 163 insertions(+), 5 deletions(-) |
|
From: Peque <ms...@us...> - 2009-12-05 02:07:01
|
Module: performous Branch: menu Commit: 83dd5d279fda6ad5e17982005ed8e3b24c2ae60c Author: Miguel Sánchez de León Peque <peq...@ho...> Date: Sat Dec 5 03:06:12 2009 +0100 Icon updated. --- themes/default/icon.bmp | Bin 3126 -> 3126 bytes themes/default/icon.png | Bin 2630 -> 6108 bytes themes/default/icon.svg | 195 ++++++++++++++++++++++++++++++++++++----------- 3 files changed, 149 insertions(+), 46 deletions(-) |
|
From: Peque <ms...@us...> - 2009-12-05 01:46:34
|
Module: performous Branch: menu Commit: 00268586b0074661e1dcf9945341ebe93298d678 Author: Miguel Sánchez de León Peque <peq...@ho...> Date: Sat Dec 5 02:42:47 2009 +0100 Fixed excessive CPU consumption in main menu. --- game/screen_intro.cc | 4 +- game/theme.cc | 5 +- game/theme.hh | 2 +- themes/default/intro_configure.svg | 395 ++++++------------------------- themes/default/menu_option_selected.svg | 6 +- 5 files changed, 82 insertions(+), 330 deletions(-) |
|
From: Stefano A. <xa...@us...> - 2009-12-04 22:43:18
|
Module: performous Branch: master Commit: bd75d6b1d43f1a0308dc697f81e621719bf983c0 Author: Xaldyz <xa...@us...> Date: Fri Dec 4 23:43:05 2009 +0100 Fixed flush for main.cc Added std::ios::binary in ifstream for I/O problem in Windows Defined m_help in screen_sing.cc/screen_sing.hh only for non-Windows platform Modified CMakeLists.txt with audio.cpp to add a workaround (Windows only) Modified win32/install.sh to disable shared library of ffmpeg, that causes crashes on performous startup Deleted copy of portaudio.patch, because last time simple i forgot to delete it before a push :) --- game/3dobject.cc | 12 +- game/main.cc | 2 + game/midifile.cc | 2 +- game/screen_sing.cc | 17 +- game/screen_sing.hh | 2 + game/songparser.hh | 6 +- game/surface.cc | 16 +- libs/libda/plugins/CMakeLists.txt | 337 +++++++++++++------------- libs/libda/src/CMakeLists.txt | 14 + libs/libda/src/audio.cpp | 4 + libs/plugin++/include/plugin++/plugin.hpp | 6 +- tools/ipu_decode.cpp | 10 +- win32/install.sh | 2 +- win32/portaudio - Copia.patch | 380 ----------------------------- 14 files changed, 228 insertions(+), 582 deletions(-) |
|
From: Yoda-JM <yo...@us...> - 2009-12-04 16:35:18
|
Module: performous
Branch: master
Commit: e9516b593b2573e392e0b4b6746b6de3901ded65
Author: Vincent Le Ligeour <yo...@us...>
Date: Fri Dec 4 17:34:43 2009 +0100
Added shared data dir outside prefix (gentoo requirement)
---
game/configuration.cc | 6 +++++-
game/fs.cc | 9 +++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/game/configuration.cc b/game/configuration.cc
index 26d41b6..c40686e 100644
--- a/game/configuration.cc
+++ b/game/configuration.cc
@@ -316,7 +316,11 @@ void readConfig() {
typedef std::vector<std::string> ConfigList;
ConfigList config_list;
char const* root = getenv("PERFORMOUS_ROOT");
- if (root) config_list.push_back(std::string(root) + "/" SHARED_DATA_DIR CONFIG_SCHEMA);
+ if( SHARED_DATA_DIR[0] == '/' ) {
+ config_list.push_back(SHARED_DATA_DIR CONFIG_SCHEMA);
+ } else {
+ if (root) config_list.push_back(std::string(root) + "/" SHARED_DATA_DIR CONFIG_SCHEMA);
+ }
fs::path exec = plugin::execname();
if (!exec.empty()) config_list.push_back(exec.parent_path().string() + "/../" SHARED_DATA_DIR CONFIG_SCHEMA);
ConfigList::const_iterator it = std::find_if(config_list.begin(), config_list.end(), static_cast<bool(&)(fs::path const&)>(fs::exists));
diff --git a/game/fs.cc b/game/fs.cc
index 852529a..3d3fc30 100644
--- a/game/fs.cc
+++ b/game/fs.cc
@@ -88,8 +88,13 @@ std::string getPath(fs::path const& filename) {
dirs.push_back(xdg_data_home ? xdg_data_home / shortDir : getHomeDir() / ".local" / shareDir);
}
#endif
- // Adding relative path from executable
- dirs.push_back(plugin::execname().parent_path().parent_path() / shareDir);
+ if( shareDir.string()[0] == '/' ) {
+ // Adding absolute path
+ dirs.push_back(shareDir);
+ } else {
+ // Adding relative path from executable
+ dirs.push_back(plugin::execname().parent_path().parent_path() / shareDir);
+ }
#ifndef _WIN32
// Adding XDG_DATA_DIRS
{
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-12-04 02:17:59
|
Module: web Branch: master Commit: 16cae2db8851ad079a73dd7a3153f980d2764352 Author: Lasse Karkkainen <tro...@tr...> Date: Fri Dec 4 04:17:48 2009 +0200 Added ways for getting more songs --- htdocs-source/songs.txt | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/htdocs-source/songs.txt b/htdocs-source/songs.txt index 6130bf6..f11d4c6 100644 --- a/htdocs-source/songs.txt +++ b/htdocs-source/songs.txt @@ -68,3 +68,9 @@ Download <a href="http://sourceforge.net/projects/performous/files/ultrastar-son Download <a href="http://sourceforge.net/projects/performous/files/ultrastar-songs-shearer/ultrastar-songs-shearer-1.zip">ZIP</a> (50 MB) </p><br clear="both"></div><p> +:h2:More songs? + +Performous comes with a tool named <b>ss_extract</b> that can be used for extracting your SingStar DVDs. + +Additionally, you may search Google for good songs in <a href="http://www.google.com/search?q=ultrastar+djpo">UltraStar</a> or <a href="http://www.google.fi/search?q=frets+on+fire+filetype:torrent">FoF</a> formats. + |
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-12-04 01:35:55
|
Module: performous Branch: portaudio Commit: 7fb1deab161af818a5af4b310b588538c4ddbe31 Author: Lasse Karkkainen <tro...@tr...> Date: Fri Dec 4 03:33:43 2009 +0200 Remove libs from repository and build, fix capitalization on PortAudio module --- CMakeLists.txt | 5 - cmake/Modules/FindPortAudio.cmake | 35 ++ cmake/Modules/FindPortaudio.cmake | 35 -- game/CMakeLists.txt | 10 +- libs/CMakeLists.txt | 8 - libs/libda/CMakeLists.txt | 71 --- libs/libda/cmake/CMakeLists.txt | 11 - libs/libda/cmake/LibDAConfig.cmake.in | 10 - libs/libda/cmake/LibDAConfigVersion.cmake.in | 13 - libs/libda/cmake/Modules/FindALSA.cmake | 34 -- libs/libda/cmake/Modules/FindAVCodec.cmake | 48 -- libs/libda/cmake/Modules/FindAVFormat.cmake | 46 -- libs/libda/cmake/Modules/FindAVUtil.cmake | 44 -- libs/libda/cmake/Modules/FindAtk.cmake | 34 -- libs/libda/cmake/Modules/FindAtkmm.cmake | 35 -- libs/libda/cmake/Modules/FindBoost.cmake | 413 -------------- libs/libda/cmake/Modules/FindCairo.cmake | 34 -- libs/libda/cmake/Modules/FindCairomm.cmake | 34 -- libs/libda/cmake/Modules/FindClanLib.cmake | 48 -- libs/libda/cmake/Modules/FindDL.cmake | 23 - libs/libda/cmake/Modules/FindFAAC.cmake | 24 - libs/libda/cmake/Modules/FindFreetype.cmake | 31 - libs/libda/cmake/Modules/FindGDK-PixBuf.cmake | 32 -- libs/libda/cmake/Modules/FindGDK.cmake | 43 -- libs/libda/cmake/Modules/FindGDKmm.cmake | 44 -- libs/libda/cmake/Modules/FindGIO.cmake | 27 - libs/libda/cmake/Modules/FindGIOmm.cmake | 35 -- libs/libda/cmake/Modules/FindGLEW.cmake | 29 - libs/libda/cmake/Modules/FindGLFW.cmake | 38 -- libs/libda/cmake/Modules/FindGObject.cmake | 31 - libs/libda/cmake/Modules/FindGStreamer.cmake | 33 -- libs/libda/cmake/Modules/FindGTK.cmake | 38 -- libs/libda/cmake/Modules/FindGTKmm.cmake | 46 -- libs/libda/cmake/Modules/FindGlib.cmake | 39 -- libs/libda/cmake/Modules/FindGlibmm.cmake | 42 -- libs/libda/cmake/Modules/FindJack.cmake | 28 - libs/libda/cmake/Modules/FindJpeg.cmake | 28 - libs/libda/cmake/Modules/FindLibPulse.cmake | 28 - libs/libda/cmake/Modules/FindLibPulseSimple.cmake | 28 - libs/libda/cmake/Modules/FindLibRSVG.cmake | 35 -- libs/libda/cmake/Modules/FindLibXML++.cmake | 42 -- libs/libda/cmake/Modules/FindLibXML2.cmake | 29 - libs/libda/cmake/Modules/FindMagick++.cmake | 33 -- libs/libda/cmake/Modules/FindMagick.cmake | 38 -- libs/libda/cmake/Modules/FindOpenGL.cmake | 35 -- libs/libda/cmake/Modules/FindPThread.cmake | 21 - libs/libda/cmake/Modules/FindPango.cmake | 36 -- libs/libda/cmake/Modules/FindPangoCairo.cmake | 35 -- libs/libda/cmake/Modules/FindPangomm.cmake | 36 -- libs/libda/cmake/Modules/FindPng.cmake | 28 - libs/libda/cmake/Modules/FindPortMidi.cmake | 21 - libs/libda/cmake/Modules/FindPortaudio.cmake | 35 -- libs/libda/cmake/Modules/FindProjectM.cmake | 30 - libs/libda/cmake/Modules/FindSDL.cmake | 59 -- libs/libda/cmake/Modules/FindSDL_mixer.cmake | 32 -- libs/libda/cmake/Modules/FindSWScale.cmake | 46 -- libs/libda/cmake/Modules/FindSigC++.cmake | 38 -- libs/libda/cmake/Modules/FindTiff.cmake | 28 - libs/libda/cmake/Modules/FindZ.cmake | 28 - libs/libda/cmake/Modules/LibFindMacros.cmake | 76 --- libs/libda/cmake/config.h.in | 11 - libs/libda/cmake/libda-packaging.cmake | 61 -- libs/libda/examples/CMakeLists.txt | 7 - libs/libda/examples/capture.cpp | 71 --- libs/libda/include/libda/audio.hpp | 171 ------ libs/libda/include/libda/audio_dev.hpp | 35 -- libs/libda/include/libda/fft.hpp | 111 ---- libs/libda/include/libda/mixer.hpp | 309 ----------- libs/libda/include/libda/sample.hpp | 55 -- libs/libda/plugins/CMakeLists.txt | 168 ------ libs/libda/plugins/alsa/alsa.hpp | 581 -------------------- libs/libda/plugins/audio_dev_alsa.cpp | 260 --------- libs/libda/plugins/audio_dev_gst.cpp | 94 ---- libs/libda/plugins/audio_dev_jack.cpp | 134 ----- libs/libda/plugins/audio_dev_pa18.cpp | 90 --- libs/libda/plugins/audio_dev_pa19.cpp | 119 ---- libs/libda/plugins/audio_dev_pulse.cpp | 122 ---- libs/libda/plugins/audio_dev_tone.cpp | 109 ---- libs/libda/src/CMakeLists.txt | 17 - libs/libda/src/audio.cpp | 99 ---- libs/plugin++/CMakeLists.txt | 67 --- libs/plugin++/cmake/CMakeLists.txt | 11 - libs/plugin++/cmake/Modules/FindBoost.cmake | 413 -------------- libs/plugin++/cmake/Modules/FindDL.cmake | 23 - libs/plugin++/cmake/Modules/LibFindMacros.cmake | 76 --- libs/plugin++/cmake/Plugin++Config.cmake.in | 10 - libs/plugin++/cmake/Plugin++ConfigVersion.cmake.in | 13 - libs/plugin++/cmake/config.h.in | 9 - libs/plugin++/cmake/plugin++-packaging.cmake | 61 -- libs/plugin++/include/plugin++/dll.hpp | 40 -- libs/plugin++/include/plugin++/execname.hpp | 13 - libs/plugin++/include/plugin++/loader.hpp | 24 - libs/plugin++/include/plugin++/plugin.hpp | 161 ------ libs/plugin++/src/dll.cc | 40 -- libs/plugin++/src/execname.cc | 58 -- libs/plugin++/src/loader.cc | 70 --- 96 files changed, 36 insertions(+), 6073 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-12-04 01:23:09
|
Module: performous
Branch: portaudio
Commit: 97663ba0d761e887a845644ebb5aef108de07dda
Author: Lasse Karkkainen <tro...@tr...>
Date: Thu Dec 3 22:37:39 2009 +0200
Testing another approach for plugin framework (hopefully making it work on Windows)
---
libs/plugin++/include/plugin++/plugin.hpp | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/libs/plugin++/include/plugin++/plugin.hpp b/libs/plugin++/include/plugin++/plugin.hpp
index 1258481..7edc2e6 100644
--- a/libs/plugin++/include/plugin++/plugin.hpp
+++ b/libs/plugin++/include/plugin++/plugin.hpp
@@ -57,10 +57,14 @@ namespace plugin {
// being a static member variable of this class to ensure that it gets
// initialized when it is used the first time. If it were static member,
// the initialization (on program startup) might occur too late.
- static map_t& map() {
+#ifdef PLUGIN_MASTER
+ static map_t& PLUGIN_REGISTRY_API map() {
static map_t m;
return m;
}
+#else
+ static map_t& PLUGIN_REGISTRY_API map();
+#endif
public:
/** An iterator for browsing the available keys. **/
class iterator:
|
