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: Lasse Kärkkäi. <tr...@us...> - 2009-12-13 12:07:36
|
Module: web
Branch: master
Commit: 075ccebd16c8a6ac2f9ad42bdf40effc2b947c63
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Dec 13 14:06:46 2009 +0200
Make H3 easier to recognize
---
htdocs-binary/style.css | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index 6ba8207..a042120 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -42,9 +42,9 @@ h2 {
}
h3 {
- font-size: 15px;
+ font-size: 13px;
text-align: left;
- color: black;
+ color: #444;
}
.preface {
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-12-13 11:38:54
|
Module: web Branch: master Commit: fa6e8397892d62917d9f5370e5030442710760a9 Author: Lasse Karkkainen <tro...@tr...> Date: Sun Dec 13 13:38:21 2009 +0200 Add sudo to all commands --- htdocs-source/develop.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs-source/develop.txt b/htdocs-source/develop.txt index 4e4c38b..e51f30e 100644 --- a/htdocs-source/develop.txt +++ b/htdocs-source/develop.txt @@ -19,11 +19,11 @@ Note: the audio libraries (at the end of the list) are optional. Install only th Gentoo: - <strong>emerge</strong> boost ffmpeg help2man imagemagick libsamplerate libsdl libxmlpp git cmake + <strong>sudo emerge</strong> boost ffmpeg help2man imagemagick libsamplerate libsdl libxmlpp git cmake Fedora: - <strong>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 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 OS X: |
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-12-13 11:32:15
|
Module: web Branch: master Commit: 2b0adaac1263f03736d2144091d0171c75c87d41 Author: Lasse Karkkainen <tro...@tr...> Date: Sun Dec 13 13:32:00 2009 +0200 Update Fedora deps --- htdocs-source/develop.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/htdocs-source/develop.txt b/htdocs-source/develop.txt index 6f2a1ae..4e4c38b 100644 --- a/htdocs-source/develop.txt +++ b/htdocs-source/develop.txt @@ -23,7 +23,7 @@ Gentoo: Fedora: - <strong>yum install</strong> cmake gtk2-devel cairo-devel librsvg2-devel libsigc++20-devel glibmm24-devel libxml++-devel ImageMagick-devel ImageMagick-c++-devel pulseaudio-libs-devel + <strong>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 OS X: |
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-12-12 14:28:59
|
Module: performous
Branch: master
Commit: c0cf22a77bddd9079e8a29e56a153e4accc136de
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Dec 12 16:28:47 2009 +0200
Fix FindGettext.cmake; rename HAVE_* defines to USE_*
---
cmake/Modules/FindGettext.cmake | 18 +++++++++++-------
game/CMakeLists.txt | 4 ++--
game/i18n.hh | 2 +-
game/joystick.cc | 2 +-
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/cmake/Modules/FindGettext.cmake b/cmake/Modules/FindGettext.cmake
index 713b150..b25512c 100644
--- a/cmake/Modules/FindGettext.cmake
+++ b/cmake/Modules/FindGettext.cmake
@@ -10,18 +10,22 @@
include(LibFindMacros)
-libfind_pkg_check_modules(Gettext_PKGCONF Gettext)
+# On Linux there is no pkgconfig script and gettext is part of glibc
+if(WIN32)
+ libfind_pkg_check_modules(Gettext_PKGCONF Gettext)
+
+ find_library(Gettext_LIBRARY
+ NAMES libintl
+ PATHS ${Gettext_PKGCONF_LIBRARY_DIRS}
+ )
+ set(Gettext_PROCESS_LIBS Gettext_LIBRARY)
+endif()
find_path(Gettext_INCLUDE_DIR
NAMES libintl.h
PATHS ${Gettext_PKGCONF_INCLUDE_DIRS}
)
-find_library(Gettext_LIBRARY
- NAMES libintl
- PATHS ${Gettext_PKGCONF_LIBRARY_DIRS}
-)
-
set(Gettext_PROCESS_INCLUDES Gettext_INCLUDE_DIR)
-set(Gettext_PROCESS_LIBS Gettext_LIBRARY)
libfind_process(Gettext)
+
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index e7e8ef0..7c411c9 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -31,7 +31,7 @@ find_package(Gettext)
if(Gettext_FOUND)
include_directories(${Gettext_INCLUDE_DIRS})
list(APPEND LIBS ${Gettext_LIBRARIES})
- add_definitions("-DHAVE_GETTEXT")
+ add_definitions("-DUSE_GETTEXT")
message(STATUS "Internationalization: Enabled")
else()
message(STATUS "Internationalization: Disabled (libintl not found)")
@@ -41,7 +41,7 @@ find_package(PortMidi)
if(PortMidi_FOUND)
include_directories(${PortMidi_INCLUDE_DIRS})
list(APPEND LIBS ${PortMidi_LIBRARIES})
- add_definitions("-DHAVE_PORTMIDI")
+ add_definitions("-DUSE_PORTMIDI")
message(STATUS "MIDI I/O: Enabled")
else()
message(STATUS "MIDI I/O: Disabled (libportmidi not found)")
diff --git a/game/i18n.hh b/game/i18n.hh
index 83c74f1..27543bc 100644
--- a/game/i18n.hh
+++ b/game/i18n.hh
@@ -1,6 +1,6 @@
#pragma once
-#ifdef HAVE_GETTEXT
+#ifdef USE_GETTEXT
/* Internationalization Dependances */
#include <libintl.h>
#include <locale.h>
diff --git a/game/joystick.cc b/game/joystick.cc
index d0105fe..f73785e 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -3,7 +3,7 @@
#include <boost/lexical_cast.hpp>
-#ifdef HAVE_PORTMIDI
+#ifdef USE_PORTMIDI
input::MidiDrums::MidiDrums(int devId): stream(devId) {
Private::devices[0x8000] = Private::InputDevPrivate(Private::DRUMS_MIDI);
event.type = Event::PRESS;
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-12-12 01:44:16
|
commit d30529ecfda3ae8f3341d22b9e56d7a22dee2ec4
Merge: baa6861a4553200f6499dd63e311830b8483e516 c8668e3b113f4799c8dbfbe8763e188e4be12a6d
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Dec 12 03:42:41 2009 +0200
Merge branch 'dance'
commit c8668e3b113f4799c8dbfbe8763e188e4be12a6d
Merge: 392b844979df3f57c231c7eebd825b602de6d8c7 28b801578ef10d5283db9f20edc3f23d1af3029e
Author: Tapio Vierros <tap...@gm...>
Date: Fri Dec 11 14:13:09 2009 +0200
Merge branch 'master' into dance
Conflicts:
game/joystick.cc
game/joystick.hh
game/screen_sing.cc
game/surface.cc
libs/libda/plugins/CMakeLists.txt
commit 392b844979df3f57c231c7eebd825b602de6d8c7
Author: Tapio Vierros <tap...@gm...>
Date: Fri Dec 11 12:24:21 2009 +0200
Fixed mine scoring and a related streak counter issue, implemented longest streak counter.
commit ed6d442826f150a06123a602438c4c352fd7e812
Author: Tapio Vierros <tap...@gm...>
Date: Fri Dec 11 08:22:55 2009 +0200
ScoreWindow not early also for dancers.
commit 788707eb921c29b6e6a108254b0e5f9c145883a0
Author: Tapio Vierros <tap...@gm...>
Date: Tue Dec 1 15:31:07 2009 +0200
ScoreWindow no longer appears too early for instruments.
commit 1fb9a950cc8f2dfae0e7af5b9db865b751a93b72
Author: Matti Kemppainen <mpk...@us...>
Date: Fri Dec 11 08:18:11 2009 +0200
Trying to commit dance point calculation once again. In addition, now we have mine calculation in it.
commit fcb9869ab4e878e74f98d7c470f40e0956d309c0
Merge: ed91dc95e9a11227fcecb2f948c28a99cfbd2802 06086cda1b93f2c9ecffdc3a613b92f5d3ed21b2
Author: Matti Kemppainen <mpk...@us...>
Date: Fri Dec 11 08:08:54 2009 +0200
Merge branch 'dance' of git://git.performous.org/gitroot/performous/performous into dance
commit ed91dc95e9a11227fcecb2f948c28a99cfbd2802
Author: Matti Kemppainen <mpk...@us...>
Date: Fri Dec 11 06:57:34 2009 +0200
Point calculation..
commit 06086cda1b93f2c9ecffdc3a613b92f5d3ed21b2
Author: Jaakko Nikkola <jaa...@tk...>
Date: Thu Dec 10 23:30:19 2009 +0200
Fixed the parser to parse the last measure.
commit f845b39ec1d27bcde802fd5ad7fb853bc1ea94b8
Author: Tapio Vierros <tap...@gm...>
Date: Thu Dec 10 23:07:03 2009 +0200
Improvements into dance hold note drawing.
commit 4b1dbe4b93d6080d447a9ab9410863ad964cb534
Author: Tapio Vierros <tap...@gm...>
Date: Thu Dec 10 22:37:22 2009 +0200
Clean up some coloring left behind from change to separate arrow images.
Also some tweks to arrow graphics.
commit 452ca0e577ab2a4bfb51f5429848283c8e6322f1
Author: Matti Kemppainen <mpk...@us...>
Date: Thu Dec 10 20:08:44 2009 +0200
USB dancepad
commit 3f249909360da55d857d39a3e13569a5822a1f44
Author: Tapio Vierros <tap...@gm...>
Date: Thu Dec 10 10:48:00 2009 +0200
Notes are only displayed if the player is joined.
Joining is possible also in the middle of a game.
commit 525c6d55f7c0be1940488c362394fa2df962ff51
Author: Tapio Vierros <tap...@gm...>
Date: Thu Dec 10 09:58:59 2009 +0200
Fixed combo popup always appearing in the center of the screen.
commit 768c0c133612d2b1d6949c6e22fd1afdb3b552c3
Author: Tapio Vierros <tap...@gm...>
Date: Thu Dec 10 09:56:54 2009 +0200
Tweaks to difficulty selection texts.
commit bbf8af6180744ffd52289465dcfb4089d92273fc
Author: Tapio Vierros <tap...@gm...>
Date: Thu Dec 10 09:52:14 2009 +0200
Modifications to arrow images.
commit 4dcc74b328b3104269298dde5950d39bc6c0f85f
Author: Tapio Vierros <tap...@gm...>
Date: Thu Dec 10 00:36:06 2009 +0200
Hack to test streak popup.
commit fa57d47a37db132d2a2fa210d8caae7502b17d85
Author: Tapio Vierros <tap...@gm...>
Date: Thu Dec 10 00:34:15 2009 +0200
Popup for long streak intervals.
commit e9884d335a59398485b40d997b1fb0a5b6a74d71
Author: Tapio Vierros <tap...@gm...>
Date: Thu Dec 10 00:33:24 2009 +0200
Some glutils from master.
commit 5f04e35c8f509b4b0cab842d2f9e42dc574cc9fa
Author: Tapio Vierros <tap...@gm...>
Date: Thu Dec 10 00:00:15 2009 +0200
Feedback on hitting accuracy.
commit 84853c4725686ce9f01e768b009180e35afdb5ab
Author: Tapio Vierros <tap...@gm...>
Date: Wed Dec 9 22:09:40 2009 +0200
Fix warnings about unhandled switch-cases.
commit 93a650f160b26c038190e8b3c2ad4b7d00a337a0
Author: Jaakko Nikkola <jaa...@tk...>
Date: Wed Dec 9 22:53:40 2009 +0200
Songparser modified to read more than one difficulty level. Also some other minor fixes were made.
commit f72ee074e90f6fc23d6e94fad6ec636ab8d7ccd8
Author: Tapio Vierros <tap...@gm...>
Date: Wed Dec 9 21:36:31 2009 +0200
Fixed flipped texture coordinates in some dance arrows.
commit 212bc0f93468058a21c0533e18ab833f664eb70e
Author: Tapio Vierros <tap...@gm...>
Date: Tue Dec 8 23:52:54 2009 +0200
Avoid unnecessary rescaling in texture loading.
(Occured when non-pow2 tex extension is unavailable resulting in lowered quality in some cases.)
commit 82ca64e2d1e45c6c112e59c469d0fc7166adc875
Author: Tapio Vierros <tap...@gm...>
Date: Tue Dec 8 23:50:10 2009 +0200
Separate images for each arrow line in dancing.
(Some tweaking is still needed.)
commit 39bf7a0129167d8be0bfb44bfcd512bb111eedf8
Author: Matti Kemppainen <mpk...@us...>
Date: Sun Dec 6 16:44:31 2009 +0200
Some initial code for recognizing hold end..
commit 15f91ca74372648275851dddf4e0dacc4e4b5975
Author: Matti Kemppainen <ke...@gm...>
Date: Sun Dec 6 16:20:48 2009 +0200
Now recognizes closely timed notes stepped in wrong order (should be accepted within tolerance). Two notes at the same time is a special case of closely timed notes. Not thoroughly tested yet!
commit 3699f705ede676e12243700f7d489924bb1d9201
Merge: 5fb62f793d147322e4c7d79ee69f35b7ebed4108 fe9cbaa7971aaa8e8be876a9c3030ac3a9313111
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
commit 5fb62f793d147322e4c7d79ee69f35b7ebed4108
Author: Jaakko Nikkola <jaa...@tk...>
Date: Sat Dec 5 15:00:36 2009 +0200
Multiple BPM reading problems fixed.
commit fe9cbaa7971aaa8e8be876a9c3030ac3a9313111
Author: Lasse Karkkainen <tro...@tr...>
Date: Wed Dec 2 21:09:02 2009 +0200
Try fixing linking issues on Mac (and Windows)
commit d8013e963b35ed658d935924fb59c563bde0fdb0
Author: Tapio Vierros <tap...@gm...>
Date: Tue Dec 1 13:49:51 2009 +0200
Tweaked note draw timing and removed an old temporary hack.
commit b7f51cdd60545e036dbb3d2c3ea4dae6bbdc6181
Author: Tapio Vierros <tap...@gm...>
Date: Tue Dec 1 12:34:11 2009 +0200
Display difficulty and game mode at start of dance song.
commit efef3d4a99a3cf4234a27489cc7eaa65958c6ccb
Author: Tapio Vierros <tap...@gm...>
Date: Tue Dec 1 11:58:04 2009 +0200
Dancers are drawn in ScoreWindow and included in HiScore.
commit a784a5d758366dee1bcd091fc90ce7772e6ea44f
Merge: 0eddb91770805b02470dbdc3a1686814573be229 b36b781156e7a4ddca064cdb9a24403ba3a90532
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Nov 29 10:20:41 2009 +0200
Merge branch 'master' into dance
Conflicts:
cmake/Modules/FindBoost.cmake
commit 0eddb91770805b02470dbdc3a1686814573be229
Author: Tapio Vierros <tap...@gm...>
Date: Fri Nov 27 15:24:32 2009 +0200
Now cursor arrows cannot be held down (graphicswise).
StepMania does the same.
commit e72effae0a540561b669962047610b5a81596ed8
Author: Tapio Vierros <tap...@gm...>
Date: Fri Nov 27 15:09:10 2009 +0200
Different effect for hitting mines.
commit d76b50a63fce3a7aabdd42974cbf85d87ed22782
Author: Tapio Vierros <tap...@gm...>
Date: Fri Nov 27 14:37:35 2009 +0200
Animation for completing hold note.
commit b65ae226f6b4d6b6eada6e1a30acec57bd55525c
Author: Tapio Vierros <tap...@gm...>
Date: Fri Nov 27 13:41:40 2009 +0200
Graphical handling of hold note hitting ending prematurely.
(Requires DanceNote's releaseTime to be set correctly.)
commit 76ffb6a8825fb3041aa4bd16c6f47ec53bfb4ec6
Author: Tapio Vierros <tap...@gm...>
Date: Fri Nov 27 13:09:22 2009 +0200
Cleaning and code re-arrangement.
commit a297948e9bec8fd74c9875e3306c9fa95df6b1aa
Merge: f559361bc821991697821fb91508a1101f0f2963 7d387e3d9aab4eef04e56e94b40bdce3b0df4340
Author: Jaakko Nikkola <jaa...@tk...>
Date: Wed Nov 25 23:32:04 2009 +0200
Merge branch 'dance' of jni...@gi...:/gitroot/performous/performous into dance
commit f559361bc821991697821fb91508a1101f0f2963
Author: Jaakko Nikkola <jaa...@tk...>
Date: Wed Nov 25 23:30:22 2009 +0200
Hold notes added as hold notes and some types added to note type enumeration.
commit 7d387e3d9aab4eef04e56e94b40bdce3b0df4340
Author: Tapio Vierros <tap...@gm...>
Date: Wed Nov 25 23:06:49 2009 +0200
Basic mine note displaying.
commit 91bee4def7adcb2918b88aaaf0fc2c524fd27c97
Author: Jaakko Nikkola <jaa...@tk...>
Date: Wed Nov 25 22:43:46 2009 +0200
Hold notes added as normal notes, and Mines added in Note type enum.
commit 6e1c14bfc12ddc8cf29291b2c558a9380622eab6
Author: Jaakko Nikkola <jaa...@tk...>
Date: Wed Nov 25 21:46:45 2009 +0200
Some fixes made to get notes correctly.
commit 877e10969f6a0d3dca76b29d9dc59b9704547d71
Author: Tapio Vierros <tap...@gm...>
Date: Mon Nov 23 22:17:23 2009 +0200
Initial graphics side support for long hold notes.
commit 2738d057e167443f5edb2c2105b94eeeee876ac5
Author: Matti Kemppainen <mpk...@us...>
Date: Mon Nov 23 20:36:55 2009 +0200
Showpoints on the screen, initial scorefactor.
commit df271ac829bd9d261d48eb0089ebbdcc4647bd94
Author: Tapio Vierros <tap...@gm...>
Date: Mon Nov 23 20:22:08 2009 +0200
Enabled note hitting animation.
commit 814db5c8acf71bdcc03025c2c6a97fe92a347196
Author: Matti Kemppainen <mpk...@us...>
Date: Mon Nov 23 20:06:16 2009 +0200
Added simple score counting.
commit 0727e25ee94bd79c3b1857428eaf75b796fd66c1
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Nov 22 22:07:17 2009 +0200
Make FindBoost.cmake prefer BoostConfig.cmake when available
commit 4bac03e47d9debb33a87968c827c32e0e95e4629
Author: Tapio Vierros <tap...@gm...>
Date: Sat Nov 21 14:22:21 2009 +0200
Temporary hack for testing note hitting effect.
commit 1af66decb7b5471ec36284ef95df83e193faaa86
Author: Tapio Vierros <tap...@gm...>
Date: Sat Nov 21 14:20:21 2009 +0200
Cursor tweaking and effect for hitting notes.
commit fda4ae089776125803e04fa0e8988ba76ef4753a
Author: Matti Kemppainen <mpk...@us...>
Date: Wed Nov 18 20:42:10 2009 +0200
Added difficulty selection and track search to dancegraph. Modified the way to calculate setup delay before the song starts to suit dance game requirements.
commit 5978fbb504fffe2c3bd3b76cb80da76e5b6d6444
Author: Jaakko Nikkola <jaa...@tk...>
Date: Wed Nov 18 00:27:59 2009 +0200
Extra debug print outs erased.
commit f2f3a1429d674ea61ec4709f1415cbb9d2ed327d
Author: Matti Kemppainen <mpk...@us...>
Date: Wed Nov 18 00:11:00 2009 +0200
First version of DanceNote struct added, and DanceStep enum for more intuitive code. A basic skeleton for difficulty setting.. Commit needed just for keeping different checkouts up-to-date.
commit 80751319809b55c1f40dfd54bc62d306305f88c2
Author: Jaakko Nikkola <jaa...@tk...>
Date: Tue Nov 17 23:57:30 2009 +0200
Changed note container to a single vector containing all the notes.
commit fe3b81cd1a4e62db1cca3bdecf9cba3023610a04
Merge: f068c10fc93cb0f489951e5f05fb58f47f7e914c c9fbf4c02ea6f080abe030335f0845d2d43575ae
Author: Tapio Vierros <tap...@gm...>
Date: Tue Nov 17 22:39:37 2009 +0200
Merge branch 'dance' of ssh://aave000@performous.git.sourceforge.net/gitroot/performous/performous into dance
commit f068c10fc93cb0f489951e5f05fb58f47f7e914c
Author: Tapio Vierros <tap...@gm...>
Date: Tue Nov 17 22:37:20 2009 +0200
Graphics side switch to new data structure.
Breaks compiling.
commit c9fbf4c02ea6f080abe030335f0845d2d43575ae
Author: Jaakko Nikkola <jaa...@tk...>
Date: Mon Nov 16 23:29:53 2009 +0200
One step and a lot of fixes forward... Some songs seem to work all right. However, some songs cause segmentation fault at the end of input.
commit 28ea30d2f41805f50041d1bb420e934a919c3113
Author: Tapio Vierros <tap...@gm...>
Date: Sun Nov 15 18:55:20 2009 +0200
Some notes are actually drawn to the screen.
Works only on some songs (and needs loads of tweaking).
commit 6a3c91ccfda227775a230703e02fe93e8c43df23
Author: Tapio Vierros <tap...@gm...>
Date: Sun Nov 15 17:34:29 2009 +0200
Fixed temporary cursor arrows pressing effect.
commit 5717c546237e693805c29bd2b845cd2da138c7a7
Author: Matti Kemppainen <mpk...@us...>
Date: Sun Nov 15 17:18:48 2009 +0200
One forgotten row..
commit 42a57c09379e2678d64bfcccaf23146e1153abef
Author: Matti Kemppainen <mpk...@us...>
Date: Sun Nov 15 16:46:18 2009 +0200
Hack to get basic user input working and to sync working versions within developers.
commit 33d7e98cb468189e974e7e01f379f9fed8cda72b
Author: Tapio Vierros <tap...@gm...>
Date: Sun Nov 15 15:08:11 2009 +0200
A couple of sm-parser hackish fixes and some test code to get a track to dancegraph.
commit b902fc457478ec8642a7ab5f8bb5b9be31b02cb7
Author: Tapio Vierros <tap...@gm...>
Date: Sun Nov 15 12:59:22 2009 +0200
Dancers are now cleared when singing screen is exited.
commit ca2e7b7c75c26cc6cb251d6d77cff3e5e62e6b1c
Author: Tapio Vierros <tap...@gm...>
Date: Sun Nov 15 12:56:29 2009 +0200
Dance tracks are now correctly reported in the songs screen.
Also removed a temporary hack.
commit 5057b438e594ae40149ad65a683f2951681bccc0
Merge: 47c5caf8a783460db23503a653dc149c5236b62f 839f4c1a6f7c3ab7114216bf1cd1434a16de320b
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Nov 14 20:41:29 2009 +0200
Merge branch 'master' into dance
A difficult merge due to major changes in master. Seems to be working fine, but be prepared for strange automerge results.
Conflicts:
game/screen_sing.hh
game/screen_songs.cc
commit 47c5caf8a783460db23503a653dc149c5236b62f
Author: Jaakko Nikkola <jaa...@tk...>
Date: Sat Nov 14 20:13:07 2009 +0200
Some more fixes...
commit f7b0c3dc9287da9a08356e2136365db40f5e598b
Author: Jaakko Nikkola <jaa...@tk...>
Date: Sat Nov 14 19:40:22 2009 +0200
Functions smParseField and smParseNotes fusioned to smParse.
commit 5a8a1a43aba280e9aaba7a20c6de6ad742656d0d
Merge: 4a046a4fe623fb2ba81516bc41088c3184896c93 39e00d7835b81b7709b2936ae30e5f9232548903
Author: Jaakko Nikkola <jaa...@tk...>
Date: Sat Nov 14 15:57:26 2009 +0200
Merge branch 'dance' of jni...@gi...:/gitroot/performous/performous into dance
commit 4a046a4fe623fb2ba81516bc41088c3184896c93
Author: Jaakko Nikkola <jaa...@tk...>
Date: Sat Nov 14 15:56:52 2009 +0200
some function parameters to references
commit 302bcad6b6a1f5b7186d8996052718ac76251dee
Author: Jaakko Nikkola <jaa...@tk...>
Date: Sat Nov 14 15:55:53 2009 +0200
some function parameters into references
commit 39e00d7835b81b7709b2936ae30e5f9232548903
Author: Tapio Vierros <tap...@gm...>
Date: Sat Nov 14 09:56:07 2009 +0200
Removed some temporary hacks, readded a dancetrack for all songs (for testing).
commit 3c820258ad3d4a361ec4372ba2db1455c54d7d9d
Author: Tapio Vierros <tap...@gm...>
Date: Sat Nov 14 09:32:55 2009 +0200
A couple of fixes for the songparser to call sm-parser.
commit a465f0994a3473a20826db3a7f23913f5d808462
Author: Jaakko Nikkola <jaa...@tk...>
Date: Fri Nov 13 22:37:58 2009 +0200
Now finds also files in format .sm
commit a3b90de1b56277defb82fa0db1b4b09fee76e9a3
Author: Jaakko Nikkola <jaa...@tk...>
Date: Fri Nov 13 18:23:06 2009 +0200
dance file check enabled (checks if DanceTracks container is empty)
commit 47b49b4349c32e6b4cbc50298a9f3518e28006df
Author: Jaakko Nikkola <jaa...@tk...>
Date: Fri Nov 13 16:59:12 2009 +0200
minor fix...
commit d5e6f7058e14b18809379b1085c35f58ba5a22ad
Merge: f818691cc5fff5ac26fa905d37138821838636d0 55411a50a24435e95e5d6c6202c87e0617195425
Author: Jaakko Nikkola <jaa...@tk...>
Date: Fri Nov 13 15:40:53 2009 +0200
Merge branch 'dance' of jni...@gi...:/gitroot/performous/performous into dance
commit f818691cc5fff5ac26fa905d37138821838636d0
Author: Jaakko Nikkola <jaa...@tk...>
Date: Fri Nov 13 15:38:04 2009 +0200
Remaining compile problems fixed, parser is now ready to be tested.
commit 55411a50a24435e95e5d6c6202c87e0617195425
Author: Lasse Karkkainen <tro...@tr...>
Date: Fri Nov 13 14:05:39 2009 +0200
Missing include
commit 93be5f69274393fa8e0f9d74301b4a0dcc3e0662
Author: Tapio Vierros <tap...@gm...>
Date: Fri Nov 13 13:59:10 2009 +0200
Improved arrow image.
commit 161133a4db0c81007b044fe3f609c6d4eacc5c38
Author: Tapio Vierros <tap...@gm...>
Date: Fri Nov 13 13:46:35 2009 +0200
Some code to display dance icon in song browser.
commit 841c66e1a15da1d4e39d0b9d7806d5bd64703832
Author: Tapio Vierros <tap...@gm...>
Date: Fri Nov 13 13:22:50 2009 +0200
Horrible dancer icon added.
commit 2abfb72d05d0c4132bb0ccab4c3f5898cc9bff4e
Author: Tapio Vierros <tap...@gm...>
Date: Fri Nov 13 11:19:31 2009 +0200
Ditched singer_layout for now, improved dance layout (cursor positioning).
commit 63fbebcd87caa4d113652bcd238d98f1ed86243b
Author: Tapio Vierros <tap...@gm...>
Date: Thu Nov 12 20:51:25 2009 +0200
WIP layout plus arrows are now rotated into correct orientations.
commit bf7bccbabcd77b071a13d7c9d8086937a5101947
Author: Jaakko Nikkola <jaa...@tk...>
Date: Thu Nov 12 21:38:44 2009 +0200
Some problems fixed (should compile)
commit 91c36eae3510a69821a155ec69e3a2b48dcb7678
Author: Jaakko Nikkola <jaa...@tk...>
Date: Thu Nov 12 21:07:03 2009 +0200
typedef correction (Chord and Chords for sm-parser to DanceChord DanceChords)
commit e7b4fdc832facdc8b9033c344dfff3ec40a49cdf
Merge: d34c7790df4d36be5cfb1b3937425ad0da90ee8a 0d745ff741c17e75d1d3c8d7c61aa0b498807d9d
Author: Jaakko Nikkola <jaa...@tk...>
Date: Thu Nov 12 18:58:00 2009 +0200
Merge branch 'dance' of jni...@gi...:/gitroot/performous/performous into dance
commit d34c7790df4d36be5cfb1b3937425ad0da90ee8a
Author: Jaakko Nikkola <jaa...@tk...>
Date: Thu Nov 12 18:54:22 2009 +0200
minor corrections
commit 0d745ff741c17e75d1d3c8d7c61aa0b498807d9d
Merge: a4a666d03e892e9ee90609a7007bb7b704685e52 7aa4e54ed2879196d251e662aa68390249fd3fc7
Author: Tapio Vierros <tap...@gm...>
Date: Thu Nov 12 18:31:40 2009 +0200
Merge branch 'dance' of ssh://aave000@performous.git.sourceforge.net/gitroot/performous/performous into dance
commit a4a666d03e892e9ee90609a7007bb7b704685e52
Author: Tapio Vierros <tap...@gm...>
Date: Thu Nov 12 18:29:08 2009 +0200
Various hacks, fixes and additions to get dancegraph to display something on screen.
(Everything is horrible, but it doesn't crash.)
commit 7aa4e54ed2879196d251e662aa68390249fd3fc7
Author: Jaakko Nikkola <jaa...@tk...>
Date: Thu Nov 12 18:19:25 2009 +0200
minor fix to DanceTrack constructor
commit bfbd6aa766ad9f035eeed8b8a33d9e8a23958b97
Author: Jaakko Nikkola <jaa...@tk...>
Date: Thu Nov 12 18:14:17 2009 +0200
songparser-sm edited (propably not working) and additions for DanceTrack struct made in notes.hh and notes.cc
commit b73e5d005897f161be858a00f18aded8623dac04
Author: Tapio Vierros <tap...@gm...>
Date: Thu Nov 12 17:19:25 2009 +0200
Some base for dance graphics from guitargraph.
commit 031f125c6c881dbccf9f8b01acf5b2b4005f094d
Author: Tapio Vierros <tap...@gm...>
Date: Wed Nov 11 15:52:52 2009 +0200
Some initial screen_sing/dancegraph integration.
commit 52595438db1563402d2b2b1fdd3fbda0f893118c
Author: Tapio Vierros <tap...@gm...>
Date: Wed Nov 11 15:51:39 2009 +0200
Added some dummy types for dance tracks.
commit dfb436890d9189aa7e790a04009b23b92557afad
Author: Tapio Vierros <tap...@gm...>
Date: Tue Nov 10 21:17:49 2009 +0200
Preliminary code for vertically split singer layout.
(Needed in order to utilize full screen height for dance graph.)
commit 870eca0953a8b1b2078e27ba4a610308906528d5
Author: Tapio Vierros <tap...@gm...>
Date: Tue Nov 10 21:16:51 2009 +0200
Added some prototypes to allow compilation to pass.
commit 8318e0a6681e4907b4737d0f9c908e9f6d158808
Author: Jaakko Nikkola <jaa...@tk...>
Date: Mon Nov 9 21:36:10 2009 +0200
Some code added to songparser-sm.cc, yet not enough to work correctly.
The beginning of songparser-sm works as songparser-txt reading information
connected to the song. The notes are read in a vector of note "lines", each
line in form of another vector (size of 4) or map.
Additions to songparser.hh and song.hh needed and (most of them)
explained in the file.
commit 5a4dc686d4c233afdd2232f4bcddbd26cbaac207
Merge: 31abba01e0f1f2c9b3d82174d3230c966ba4f948 1f319d424719882f2d5299def9860fc36da81abd
Author: Tapio Vierros <tap...@gm...>
Date: Sun Nov 8 10:28:35 2009 +0200
Merge branch 'master' into dance
commit 31abba01e0f1f2c9b3d82174d3230c966ba4f948
Author: Tapio Vierros <tap...@gm...>
Date: Sun Nov 8 10:27:24 2009 +0200
Some basis for dance graph.
commit 5714c647100c4a14f556e9b758f8680b79230a5d
Author: Tapio Vierros <tap...@gm...>
Date: Fri Oct 30 16:07:55 2009 +0200
Added some dummy files.
commit 20f7361fc537f62d72f373395de85292fc3e53a1
Author: Tapio Vierros <tap...@gm...>
Date: Thu Oct 29 15:06:22 2009 +0200
Added a simple arrow for testing dancegraph.
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-12-12 01:41:02
|
Module: web Branch: master Commit: c3d5d428522101996270afdf1fc5acbff0ee0fdf Author: Lasse Karkkainen <tro...@tr...> Date: Sat Dec 12 03:40:50 2009 +0200 Website updates --- htdocs-source/develop.txt | 4 +++- htdocs-source/index.txt | 5 +++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/htdocs-source/develop.txt b/htdocs-source/develop.txt index 34f02d4..6f2a1ae 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-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 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 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). @@ -29,6 +29,8 @@ OS X: <strong>sudo port install</strong> git-core cmake help2man libsdl glew cairo librsvg portaudio libxmlxx2 boost +complete imagemagick ffmpeg +avfilter libsamplerate +Note: GCC 4.0.1 is very buggy and outdated. We recommend getting at least GCC 4.2 and using that to compile Performous. You will not need to switch the MacPorts default compiler, configuring CMake to use the new compiler is enough. + We try to keep these lists accurate and up-to-date with the development version. If you find that something is missing or that there are unnecessary package installs, please let us know. Installing the latest development version diff --git a/htdocs-source/index.txt b/htdocs-source/index.txt index c241e55..1889180 100644 --- a/htdocs-source/index.txt +++ b/htdocs-source/index.txt @@ -1,5 +1,10 @@ Announcements +: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. + +Windows alpha build from a few days ago is available <a href="http://fast.performous.org/setup.exe">here</a>. A release is coming later, once we manage to remove the rough edges, hopefully with the 0.5.0 Linux release. The OS X bundling effort has ceased for now and we really need more Mac developers to get the job done. Compiling the software is easy, but bundling has proven to be difficult. + :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). :) |
|
From: Yoda-JM <yo...@us...> - 2009-12-11 21:44:26
|
Module: performous
Branch: master
Commit: baa6861a4553200f6499dd63e311830b8483e516
Author: Vincent Le Ligeour <yo...@us...>
Date: Fri Dec 11 22:43:23 2009 +0100
Added tools man pages (void for the moment)
---
docs/CMakeLists.txt | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index a33cd78..4164d9f 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -19,8 +19,24 @@ if(UNIX)
add_custom_target(manpage ALL DEPENDS ${MANFILE})
install(FILES ${MANFILE} DESTINATION share/man/man6)
else(HELP2MAN AND GZIP)
- message("WARNING: Can't locate help2man or gzip; man pages will not be generated")
+ message("WARNING: One of the following is missing: help2man, gzip; performous man page will not be generated")
endif(HELP2MAN AND GZIP)
+ if(ENABLE_TOOLS AND GZIP)
+ set(TOOLS "ss_pak_extract" "ss_extract" "ss_cover_conv" "ss_adpcm_decode" "ss_ipu_decode" "ss_ipu_conv")
+ foreach(TOOL ${TOOLS})
+ set(TOOL_MANFILE ${CMAKE_CURRENT_SOURCE_DIR}/${TOOL}.3)
+ set(TOOL_MANFILE_GZ ${CMAKE_CURRENT_BINARY_DIR}/${TOOL}.3.gz)
+ add_custom_command(
+ OUTPUT ${TOOL_MANFILE_GZ}
+ COMMAND ${GZIP} -c ${TOOL_MANFILE} > ${TOOL_MANFILE_GZ}
+ MAIN_DEPENDENCY ${TOOL_MANFILE}
+ COMMENT "Building ${TOOL} man page"
+ VERBATIM
+ )
+ add_custom_target(${TOOL}.3 ALL DEPENDS ${TOOL_MANFILE_GZ})
+ install(FILES ${TOOL_MANFILE_GZ} DESTINATION share/man/man3)
+ endforeach(TOOL)
+ endif(ENABLE_TOOLS AND GZIP)
endif(UNIX)
diff --git a/docs/ss_adpcm_decode.3 b/docs/ss_adpcm_decode.3
new file mode 100644
index 0000000..e69de29
diff --git a/docs/ss_cover_conv.3 b/docs/ss_cover_conv.3
new file mode 100644
index 0000000..e69de29
diff --git a/docs/ss_extract.3 b/docs/ss_extract.3
new file mode 100644
index 0000000..e69de29
diff --git a/docs/ss_ipu_conv.3 b/docs/ss_ipu_conv.3
new file mode 100644
index 0000000..e69de29
diff --git a/docs/ss_ipu_decode.3 b/docs/ss_ipu_decode.3
new file mode 100644
index 0000000..e69de29
diff --git a/docs/ss_pak_extract.3 b/docs/ss_pak_extract.3
new file mode 100644
index 0000000..e69de29
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-12-11 12:47:01
|
Module: performous Branch: master Commit: 3d2a8b8f3bd4d767cd7cb293dcd46917e848145c Author: Lasse Karkkainen <tro...@tr...> Date: Fri Dec 11 14:45:24 2009 +0200 Remove BOM --- docs/Authors.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Authors.txt b/docs/Authors.txt index 264e43f..cdb1638 100644 --- a/docs/Authors.txt +++ b/docs/Authors.txt @@ -1,4 +1,4 @@ -ACTIVE DEVELOPERS +ACTIVE DEVELOPERS ----------------- Vincent Le Ligeour <yoda-jm at users.sourceforge.net> |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:51
|
Module: performous Branch: dance Commit: c8668e3b113f4799c8dbfbe8763e188e4be12a6d Author: Tapio Vierros <tap...@gm...> Date: Fri Dec 11 14:13:09 2009 +0200 Merge branch 'master' into dance Conflicts: game/joystick.cc game/joystick.hh game/screen_sing.cc game/surface.cc libs/libda/plugins/CMakeLists.txt --- |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:49
|
Module: performous
Branch: dance
Commit: 28b801578ef10d5283db9f20edc3f23d1af3029e
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Dec 9 19:37:57 2009 +0100
Displayed playback/microphone not working only at start
---
game/screen_intro.cc | 15 ++++++++++-----
game/screen_intro.hh | 1 +
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index 2e5aec9..68de5b1 100755
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -5,7 +5,7 @@
#include "record.hh"
#include "i18n.hh"
-ScreenIntro::ScreenIntro(std::string const& name, Audio& audio, Capture& capture): Screen(name), m_audio(audio), m_capture(capture), selected() {
+ScreenIntro::ScreenIntro(std::string const& name, Audio& audio, Capture& capture): Screen(name), m_audio(audio), m_capture(capture), selected(), m_first(true) {
m_menuOptions.push_back(new MenuOption(_("Perform"), "Songs", "intro_sing.svg", _("Start performing!")));
m_menuOptions.push_back(new MenuOption(_("Practice"), "Practice", "intro_practice.svg", _("Check your skills or test the microphones")));
m_menuOptions.push_back(new MenuOption(_("Configure"), "Configuration", "intro_configure.svg", _("Configure game options")));
@@ -15,10 +15,15 @@ ScreenIntro::ScreenIntro(std::string const& name, Audio& audio, Capture& capture
void ScreenIntro::enter() {
m_audio.playMusic(getThemePath("menu.ogg"), true);
theme.reset(new ThemeIntro());
- std::string msg;
- if (!m_audio.isOpen()) msg = _("No playback devices could be used.\n");
- if (m_capture.analyzers().empty()) msg += _("No microphones found.\n");
- if (!msg.empty()) m_dialog.reset(new Dialog(msg + _("\nPlease configure some before playing.")));
+ if( m_first ) {
+ std::string msg;
+ if (!m_audio.isOpen()) msg = _("No playback devices could be used.\n");
+ if (m_capture.analyzers().empty()) msg += _("No microphones found.\n");
+ if (!msg.empty()) m_dialog.reset(new Dialog(msg + _("\nPlease configure some before playing.")));
+ m_first = false;
+ } else {
+ m_dialog.reset();
+ }
}
void ScreenIntro::exit() {
diff --git a/game/screen_intro.hh b/game/screen_intro.hh
index 79ae510..76d7909 100755
--- a/game/screen_intro.hh
+++ b/game/screen_intro.hh
@@ -29,4 +29,5 @@ class ScreenIntro : public Screen {
boost::ptr_vector<MenuOption> m_menuOptions;
boost::scoped_ptr<Dialog> m_dialog;
unsigned int selected;
+ bool m_first;
};
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:48
|
Module: performous
Branch: dance
Commit: 1e51638ed19c6f335953471fcec003d2b0a51f66
Author: Tapio Vierros <tap...@gm...>
Date: Wed Dec 9 17:40:20 2009 +0200
Linux gettext build fixes.
---
cmake/Modules/FindGettext.cmake | 2 +-
game/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/Modules/FindGettext.cmake b/cmake/Modules/FindGettext.cmake
index 43a4220..eb5b325 100644
--- a/cmake/Modules/FindGettext.cmake
+++ b/cmake/Modules/FindGettext.cmake
@@ -24,4 +24,4 @@ find_library(gettext_LIBRARY
set(gettext_PROCESS_INCLUDES gettext_INCLUDE_DIR)
set(gettext_PROCESS_LIBS gettext_LIBRARY)
-libfind_process(gettext)
+libfind_process(Gettext)
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index c84fd5c..c823ded 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -20,7 +20,7 @@ else()
endif()
# Find all the libs that don't require extra parameters
-foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ Magick++ GLEW AVFormat SWScale OpenGL gettext Z Jpeg Tiff Png)
+foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ Magick++ GLEW AVFormat SWScale OpenGL Gettext Z Jpeg Tiff Png)
find_package(${lib} REQUIRED)
include_directories(${${lib}_INCLUDE_DIRS})
list(APPEND LIBS ${${lib}_LIBRARIES})
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:46
|
Module: performous
Branch: dance
Commit: 94ea8c0b018d669847fd910f113274a7e3b9fb6f
Author: Xaldyz <xa...@us...>
Date: Wed Dec 9 16:31:12 2009 +0100
Fixed missing h in the header (i18n.h instead i18n.hh)
---
game/main.cc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/game/main.cc b/game/main.cc
index fb00719..3e9414a 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -8,7 +8,7 @@
#include "database.hh"
#include "xtime.hh"
#include "video_driver.hh"
-#include "i18n.h"
+#include "i18n.hh"
// Screens
#include "screen_intro.hh"
@@ -211,7 +211,7 @@ int main(int argc, char** argv) {
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, "../locale");
textdomain (PACKAGE);
-
+
std::cout << PACKAGE " " VERSION << std::endl;
std::signal(SIGINT, quit);
std::signal(SIGTERM, quit);
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:44
|
Module: performous Branch: dance Commit: 767505221431f46ddad8d40d3dadc60f521937ff Author: Xaldyz <xa...@us...> Date: Wed Dec 9 16:20:26 2009 +0100 Merge branch 'master' of ssh://performous.git.sourceforge.net/gitroot/performous/performous --- |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:42
|
Module: performous
Branch: dance
Commit: a56ee745f09378c6ac2218701c59f270a511dcb9
Author: Xaldyz <xa...@us...>
Date: Wed Dec 9 16:19:52 2009 +0100
Fixed founding gettext under Windows
Fixed searching playback device into schema.xml
Update getting config dir under Windows
Add Italian support (and documentation to how create a language)
---
cmake/Modules/FindGettext.cmake | 14 +++---
data/schema.xml | 1 +
game/CMakeLists.txt | 2 +-
game/fs.cc | 39 +++++++++++++--
game/main.cc | 6 ++
lang/README | 21 ++++++++
lang/it/LC_MESSAGES/performous.mo | Bin 0 -> 1703 bytes
lang/it/LC_MESSAGES/performous.po | 96 +++++++++++++++++++++++++++++++++++++
8 files changed, 166 insertions(+), 13 deletions(-)
diff --git a/cmake/Modules/FindGettext.cmake b/cmake/Modules/FindGettext.cmake
index f1b0f5d..43a4220 100644
--- a/cmake/Modules/FindGettext.cmake
+++ b/cmake/Modules/FindGettext.cmake
@@ -10,18 +10,18 @@
include(LibFindMacros)
-libfind_pkg_check_modules(Gettext_PKGCONF Gettext)
+libfind_pkg_check_modules(gettext_PKGCONF gettext)
-find_path(Gettext_INCLUDE_DIR
+find_path(gettext_INCLUDE_DIR
NAMES libintl.h
- PATHS ${Gettext_PKGCONF_INCLUDE_DIRS}
+ PATHS ${gettext_PKGCONF_INCLUDE_DIRS}
)
-find_library(Gettext_LIBRARY
+find_library(gettext_LIBRARY
NAMES libintl
- PATHS ${Gettext_PKGCONF_LIBRARY_DIRS}
+ PATHS ${gettext_PKGCONF_LIBRARY_DIRS}
)
-set(Gettext_PROCESS_INCLUDES Gettext_INCLUDE_DIR)
-set(Gettext_PROCESS_LIBS Gettext_LIBRARY)
+set(gettext_PROCESS_INCLUDES gettext_INCLUDE_DIR)
+set(gettext_PROCESS_LIBS gettext_LIBRARY)
libfind_process(gettext)
diff --git a/data/schema.xml b/data/schema.xml
index 60fcd55..9d1938d 100644
--- a/data/schema.xml
+++ b/data/schema.xml
@@ -178,6 +178,7 @@ to save the current settings to XML.
<entry name="audio/playback" type="string_list">
<stringvalue></stringvalue>
<stringvalue>alsa:hw:0</stringvalue>
+ <stringvalue>channels=2</stringvalue>
<!-- <stringvalue>channels=2,rate=44100,frames=256@alsa</stringvalue> -->
<locale name="C">
<short>Playback devices</short>
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 816e4c5..c84fd5c 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -20,7 +20,7 @@ else()
endif()
# Find all the libs that don't require extra parameters
-foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ Magick++ GLEW AVFormat SWScale OpenGL Z Jpeg Tiff Png Gettext)
+foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ Magick++ GLEW AVFormat SWScale OpenGL gettext Z Jpeg Tiff Png)
find_package(${lib} REQUIRED)
include_directories(${${lib}_INCLUDE_DIRS})
list(APPEND LIBS ${${lib}_LIBRARIES})
diff --git a/game/fs.cc b/game/fs.cc
index 3d3fc30..5e644f7 100644
--- a/game/fs.cc
+++ b/game/fs.cc
@@ -8,6 +8,11 @@
#include <list>
#include <sstream>
+#ifdef _WIN32
+#include <windows.h>
+#include <Shlobj.h>
+#endif
+
fs::path getHomeDir() {
static fs::path dir;
static bool initialized = false;
@@ -20,13 +25,36 @@ fs::path getHomeDir() {
}
fs::path getConfigDir() {
+
static fs::path dir;
static bool initialized = false;
if (!initialized) {
initialized = true;
- char const* conf = getenv("XDG_CONFIG_HOME");
- if (conf) dir = fs::path(conf) / "performous";
- else dir = getHomeDir() / ".config" / "performous";
+ #ifndef _WIN32
+ {
+ char const* conf = getenv("XDG_CONFIG_HOME");
+ if (conf) dir = fs::path(conf) / "performous";
+ else dir = getHomeDir() / ".config" / "performous";
+ }
+ #else
+ {
+ //open AppData directory
+ std::string str;
+ ITEMIDLIST* pidl;
+ char AppDir[MAX_PATH];
+ HRESULT hRes = SHGetSpecialFolderLocation( NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE , &pidl );
+ if (hRes==NOERROR)
+ {
+ SHGetPathFromIDList( pidl, AppDir );
+ int i;
+ for(i = 0; AppDir[i] != '\0'; i++){
+ if(AppDir[i] == '\\') str += '/';
+ else str += AppDir[i];
+ }
+ dir = fs::path(str) / "performous";
+ }
+ }
+ #endif
}
return dir;
}
@@ -77,8 +105,9 @@ std::string getPath(fs::path const& filename) {
#ifdef _WIN32
// Add APPLIC~1 (user-specific application data) FIXME: Not tested
{
- char const* appdata = getenv("APPDATA");
- if (appdata) dirs.push_back(appdata / shortDir);
+ //char const* appdata = getenv("APPDATA");
+ //if (appdata) dirs.push_back(appdata / shortDir);
+ dirs.push_back(getConfigDir());
}
#else
// Adding XDG_DATA_HOME
diff --git a/game/main.cc b/game/main.cc
index 6e42d13..fb00719 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -8,6 +8,7 @@
#include "database.hh"
#include "xtime.hh"
#include "video_driver.hh"
+#include "i18n.h"
// Screens
#include "screen_intro.hh"
@@ -206,6 +207,11 @@ template <typename Container> void confOverride(Container const& c, std::string
}
int main(int argc, char** argv) {
+ // initialize gettext
+ setlocale (LC_ALL, "");
+ bindtextdomain (PACKAGE, "../locale");
+ textdomain (PACKAGE);
+
std::cout << PACKAGE " " VERSION << std::endl;
std::signal(SIGINT, quit);
std::signal(SIGTERM, quit);
diff --git a/lang/README b/lang/README
new file mode 100644
index 0000000..b33acca
--- /dev/null
+++ b/lang/README
@@ -0,0 +1,21 @@
+To add new languages:
+
+Download POEdit (http://www.poedit.net/)
+ 1. Start POEdit
+ 2. Click File -> New Catalog
+ 3. Enter a project name (performous)
+ 4. Click the Paths tab at the top
+ 5. Click the New Item icon (second one, looks like a little square)
+ 6. Enter the path to the directory containing your plugin file ("." tells POEdit to scan the directory that you will save the file to, usually only need to include ../game), press enter
+ 7. Click the Keywords tab at the top
+ 8. Click the New Item icon
+ 9. Enter _ (that's underscore), press enter
+ 12. Click Okay
+ 13. Choose a name for your .po file (performous)
+
+REMEMBER TO SAVE INTO A SUBDIR WITH <your-locale>/LC_MESSAGES/performous.po
+
+Example for English:
+en/LC_MESSAGES/performous.po
+
+Thanks to guide at http://codex.wordpress.org/User:Skippy/Creating_POT_Files
\ No newline at end of file
diff --git a/lang/it/LC_MESSAGES/performous.mo b/lang/it/LC_MESSAGES/performous.mo
new file mode 100644
index 0000000..160d278
Binary files /dev/null and b/lang/it/LC_MESSAGES/performous.mo differ
diff --git a/lang/it/LC_MESSAGES/performous.po b/lang/it/LC_MESSAGES/performous.po
new file mode 100644
index 0000000..05f88f2
--- /dev/null
+++ b/lang/it/LC_MESSAGES/performous.po
@@ -0,0 +1,96 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Performous\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-07 01:56+0100\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Xaldyz <xa...@us...>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-KeywordsList: _\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: ../game\n"
+
+#: ../game/screen_hiscore.cc:104
+msgid "Hiscore for "
+msgstr "Punteggio per "
+
+#: ../game/screen_intro.cc:9
+msgid "Perform"
+msgstr "Perform"
+
+#: ../game/screen_intro.cc:9
+msgid "Start performing!"
+msgstr "Start performing!"
+
+#: ../game/screen_intro.cc:10
+msgid "Practice"
+msgstr "Pratica"
+
+#: ../game/screen_intro.cc:10
+msgid "Check your skills or test the microphones"
+msgstr "Controlla quanto sei bravo / Test microfono"
+
+#: ../game/screen_intro.cc:11
+msgid "Configure"
+msgstr "Configura"
+
+#: ../game/screen_intro.cc:11
+msgid "Configure game options"
+msgstr "Opzioni di configurazione del gioco"
+
+#: ../game/screen_intro.cc:12
+msgid "Quit"
+msgstr "Esci"
+
+#: ../game/screen_intro.cc:12
+msgid "Leave the game"
+msgstr "Esci dal gioco"
+
+#: ../game/screen_intro.cc:19
+msgid "No playback devices could be used.\n"
+msgstr "Nessun dispositivo di riproduzione trovato.\n"
+
+#: ../game/screen_intro.cc:20
+msgid "No microphones found.\n"
+msgstr "Nessun microfono trovato.\n"
+
+#: ../game/screen_intro.cc:21
+msgid ""
+"\n"
+"Please configure some before playing."
+msgstr ""
+"\n"
+"Per favore controlla le tue impostazioni\n"
+"prima di giocare."
+
+#: ../game/screen_players.cc:110
+msgid "No players found!"
+msgstr "Nessun giocatore trovato!"
+
+#: ../game/screen_players.cc:111
+msgid "Enter a name to create a new player."
+msgstr "Inserisci il nome di un nuovo giocatore"
+
+#: ../game/screen_players.cc:113
+msgid "Press enter to create player!"
+msgstr "Premi invio per creare un giocatore!"
+
+#: ../game/screen_songs.cc:209
+msgid "No songs found!"
+msgstr "Nessuna canzone trovata!"
+
+#: ../game/screen_songs.cc:210
+msgid ""
+"Visit performous.org\n"
+"for free songs"
+msgstr ""
+"Visita il sito performous.org\n"
+"per canzoni gratuite"
+
+#: ../game/screen_songs.cc:212
+msgid "no songs match search"
+msgstr "nessuna corrispondenza trovata"
+
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:40
|
Module: performous Branch: dance Commit: bf912c05c0dee8aa7fb20bd14d0b2bd365009f16 Author: Tapio Vierros <tap...@gm...> Date: Wed Dec 9 00:10:41 2009 +0200 Added ~/.performous/songs/ to search path. (As there already is ~/.performous/backgrounds) --- data/schema.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/data/schema.xml b/data/schema.xml index 60fcd55..ab7edca 100644 --- a/data/schema.xml +++ b/data/schema.xml @@ -216,6 +216,7 @@ to save the current settings to XML. <stringvalue>/usr/share/games/ultrastar/songs/</stringvalue> <stringvalue>/usr/share/games/fretsonfire/data/songs/</stringvalue> <stringvalue>../songs/</stringvalue><!-- For Windows where the program is started in bin/ --> + <stringvalue>~/.performous/songs/</stringvalue> <stringvalue>~/.ultrastar/songs/</stringvalue> <stringvalue>~/.fretsonfire/songs/</stringvalue> <locale name="C"> |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:39
|
Module: performous
Branch: dance
Commit: 7e5daaba06d413f015d7cf6c894e681e4705974b
Author: Lasse Karkkainen <tro...@tr...>
Date: Tue Dec 8 07:49:13 2009 +0200
Bugfix: vocal input now starts at the beginning of the song instead of where the preview was playing
---
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 8aa867d..d070d3d 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -54,7 +54,6 @@ void ScreenSing::enter() {
m_progress->dimensions.fixedWidth(0.4).left(-0.5).screenTop();
theme->timer.dimensions.screenTop(0.5 * m_progress->dimensions.h());
boost::ptr_vector<Analyzer>& analyzers = m_capture.analyzers();
- m_engine.reset(new Engine(m_audio, *m_song, analyzers.begin(), analyzers.end(), m_database));
m_layout_singer.reset(new LayoutSinger(*m_song, m_database, theme));
// I know some purists would hang me for this loop
if( !m_song->track_map.empty() ) {
@@ -92,6 +91,7 @@ void ScreenSing::enter() {
}
}
m_audio.playMusic(m_song->music, false, 0.0, m_instruments.empty() ? -1.0 : -8.0); // Startup delay for instruments is longer than for singing only
+ m_engine.reset(new Engine(m_audio, *m_song, analyzers.begin(), analyzers.end(), m_database));
}
void ScreenSing::instrumentLayout(double time) {
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:38
|
Module: performous
Branch: dance
Commit: a62d81d80e18c1d8526b5087fa722d134735ac72
Author: Tapio Vierros <tap...@gm...>
Date: Wed Dec 9 00:08:01 2009 +0200
Tweaks to Players screen.
---
game/screen_players.cc | 19 ++++++++++---------
game/screen_players.hh | 2 +-
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/game/screen_players.cc b/game/screen_players.cc
index ee0130e..b8e8951 100644
--- a/game/screen_players.cc
+++ b/game/screen_players.cc
@@ -84,11 +84,12 @@ void ScreenPlayers::manageEvent(SDL_Event event) {
// frustrating for second one that he cannot enter, so better go for next one...
}
}
- // The rest are only available when there are songs available
else if (m_players.empty()) return;
else if (key == SDLK_SPACE || (key == SDLK_PAUSE || (key == SDLK_p && mod & KMOD_CTRL))) m_audio.togglePause();
else if (key == SDLK_LEFT) m_players.advance(-1);
else if (key == SDLK_RIGHT) m_players.advance(1);
+ else if (key == SDLK_UP) m_players.advance(-1);
+ else if (key == SDLK_DOWN) m_players.advance(1);
else if (key == SDLK_PAGEUP) m_players.advance(-10);
else if (key == SDLK_PAGEDOWN) m_players.advance(10);
}
@@ -115,14 +116,14 @@ void ScreenPlayers::draw() {
}
} else {
// Format the player information text
- oss_song << m_database.scores.front().track << "\n";
+ oss_song << m_database.scores.front().track << '\n';
// TODO: use boost::format
- oss_song << "You reached " << m_database.scores.front().score << " points!";
- oss_order << "Please enter your Name!\n"
- << "Name: " << m_players.current().name << '\n';
- m_database.queryPerPlayerHiscore(oss_order);
- oss_order << "\nSearch Text: "
- << (m_search.text.empty() ? std::string("please enter") : m_search.text)
+ oss_song << _("You reached") << ' ' << m_database.scores.front().score << ' ' << _("points!");
+ oss_order << _("Change player with arrow keys.") << '\n'
+ << _("Name:") << ' ' << m_players.current().name << '\n';
+ //m_database.queryPerPlayerHiscore(oss_order);
+ oss_order << '\n'
+ << (m_search.text.empty() ? _("Type text to filter or create a new player.") : std::string(_("Search Text:")) + " " + m_search.text)
<< '\n';
double spos = m_players.currentPosition(); // This needs to be polled to run the animation
@@ -159,7 +160,7 @@ void ScreenPlayers::draw() {
theme->song.draw(oss_song.str());
theme->order.draw(oss_order.str());
- // Schedule playback change if the chosen song has changed
+ // Schedule playback change if the chosen song has changed
if (music != m_playReq) { m_playReq = music; m_playTimer.setValue(0.0); }
// Play/stop preview playback (if it is the time)
if (music != m_playing && m_playTimer.get() > 0.4) {
diff --git a/game/screen_players.hh b/game/screen_players.hh
index 5786d5b..c9d9941 100644
--- a/game/screen_players.hh
+++ b/game/screen_players.hh
@@ -16,7 +16,7 @@ class ThemeSongs;
class LayoutSinger;
-/** song chooser screen.
+/** Player hiscore addition screen.
Database is passed as argument, but only the players is stored
and used everywhere.
*/
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:34
|
Module: performous
Branch: dance
Commit: ed910310ae0c84496afc7d613032ed00db0edab3
Author: Lasse Karkkainen <tro...@tr...>
Date: Tue Dec 8 07:18:52 2009 +0200
Revert "Added shared data dir outside prefix (gentoo requirement)"
This reverts commit e9516b593b2573e392e0b4b6746b6de3901ded65.
---
game/configuration.cc | 6 +-----
game/fs.cc | 9 ++-------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/game/configuration.cc b/game/configuration.cc
index c40686e..26d41b6 100644
--- a/game/configuration.cc
+++ b/game/configuration.cc
@@ -316,11 +316,7 @@ void readConfig() {
typedef std::vector<std::string> ConfigList;
ConfigList config_list;
char const* root = getenv("PERFORMOUS_ROOT");
- 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);
- }
+ 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 3d3fc30..852529a 100644
--- a/game/fs.cc
+++ b/game/fs.cc
@@ -88,13 +88,8 @@ std::string getPath(fs::path const& filename) {
dirs.push_back(xdg_data_home ? xdg_data_home / shortDir : getHomeDir() / ".local" / shareDir);
}
#endif
- 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);
- }
+ // Adding relative path from executable
+ dirs.push_back(plugin::execname().parent_path().parent_path() / shareDir);
#ifndef _WIN32
// Adding XDG_DATA_DIRS
{
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:32
|
Module: performous Branch: dance Commit: 817b8d77c434c9f9ef031c13f15922f35936c307 Author: Vincent Le Ligeour <yo...@us...> Date: Mon Dec 7 07:10:46 2009 +0100 Added pragma once inside i18n.hh --- game/i18n.hh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/game/i18n.hh b/game/i18n.hh index 24b87b9..ed353e1 100644 --- a/game/i18n.hh +++ b/game/i18n.hh @@ -1,3 +1,5 @@ +#pragma once + /* Internationalization Dependances */ #include <libintl.h> #include <locale.h> |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:30
|
Module: performous Branch: dance Commit: 4908a0441bcf3092d565243070bfadf0d3a09b09 Author: Tapio Vierros <tap...@gm...> Date: Sun Dec 6 22:50:07 2009 +0200 Fixed cmake gettext finding on linux. --- cmake/Modules/FindGettext.cmake | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cmake/Modules/FindGettext.cmake b/cmake/Modules/FindGettext.cmake index 63c92f0..f1b0f5d 100644 --- a/cmake/Modules/FindGettext.cmake +++ b/cmake/Modules/FindGettext.cmake @@ -24,4 +24,4 @@ find_library(Gettext_LIBRARY set(Gettext_PROCESS_INCLUDES Gettext_INCLUDE_DIR) set(Gettext_PROCESS_LIBS Gettext_LIBRARY) -libfind_process(Gettext) \ No newline at end of file +libfind_process(gettext) |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:29
|
Module: performous Branch: dance Commit: 69e5e4e13bdd2ebd647cd57212c0ba321d60e477 Author: Xaldyz <xa...@us...> Date: Sun Dec 6 21:18:00 2009 +0100 Solved include problems of gettext under Windows --- cmake/Modules/FindGettext.cmake | 27 +++++++++++++++++++++++++++ game/CMakeLists.txt | 2 +- 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/cmake/Modules/FindGettext.cmake b/cmake/Modules/FindGettext.cmake new file mode 100644 index 0000000..63c92f0 --- /dev/null +++ b/cmake/Modules/FindGettext.cmake @@ -0,0 +1,27 @@ +# - Try to find Gettext +# Once done, this will define +# +# Gettext_FOUND - system has Gettext +# Gettext_INCLUDE_DIRS - the Gettext include directories +# Gettext_LIBRARIES - link these to use Gettext +# +# See documentation on how to write CMake scripts at +# http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries + +include(LibFindMacros) + +libfind_pkg_check_modules(Gettext_PKGCONF Gettext) + +find_path(Gettext_INCLUDE_DIR + NAMES libintl.h + PATHS ${Gettext_PKGCONF_INCLUDE_DIRS} +) + +find_library(Gettext_LIBRARY + NAMES libintl + PATHS ${Gettext_PKGCONF_LIBRARY_DIRS} +) + +set(Gettext_PROCESS_INCLUDES Gettext_INCLUDE_DIR) +set(Gettext_PROCESS_LIBS Gettext_LIBRARY) +libfind_process(Gettext) \ No newline at end of file diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt index 4e48a6c..816e4c5 100644 --- a/game/CMakeLists.txt +++ b/game/CMakeLists.txt @@ -20,7 +20,7 @@ else() endif() # Find all the libs that don't require extra parameters -foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ Magick++ GLEW AVFormat SWScale OpenGL Z Jpeg Tiff Png) +foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ Magick++ GLEW AVFormat SWScale OpenGL Z Jpeg Tiff Png Gettext) find_package(${lib} REQUIRED) include_directories(${${lib}_INCLUDE_DIRS}) list(APPEND LIBS ${${lib}_LIBRARIES}) |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:27
|
Module: performous Branch: dance Commit: 44fe74fa329c400214d08dc04506ab65053239ba Author: Xaldyz <xa...@us...> Date: Sun Dec 6 19:25:59 2009 +0100 added myself to Authors.txt --- docs/Authors.txt | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/docs/Authors.txt b/docs/Authors.txt index 2fa5682..51ec750 100644 --- a/docs/Authors.txt +++ b/docs/Authors.txt @@ -1,4 +1,4 @@ -ACTIVE DEVELOPERS +ACTIVE DEVELOPERS ----------------- Vincent Le Ligeour <yoda-jm at users.sourceforge.net> @@ -37,6 +37,9 @@ Miguel Sánchez de León Peque <msdeleonpeque at gmail.com> * Main menu * SVG design +Xaldyz <xaldyz at users.sourceforge.net> + * Windows build fixes and testing + INACTIVE DEVELOPERS ------------------- |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:25
|
Module: performous Branch: dance Commit: cab3951ea08fdd0483db06817bbf1f0f8ffbc74a Author: Miguel Sánchez de León Peque <peq...@ho...> Date: Sun Dec 6 16:41:15 2009 +0100 Authors.txt list updated. --- docs/Authors.txt | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/docs/Authors.txt b/docs/Authors.txt index 492e44a..2fa5682 100644 --- a/docs/Authors.txt +++ b/docs/Authors.txt @@ -33,6 +33,10 @@ Fabian Fingerle <fabian at datensalat.eu> Tapio Vierros <aave000 at users.sourceforge.net> * Various things and features +Miguel Sánchez de León Peque <msdeleonpeque at gmail.com> + * Main menu + * SVG design + INACTIVE DEVELOPERS ------------------- |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:23
|
Module: performous
Branch: dance
Commit: 3198bf3c843ee9c67205c8ca14e4cd9e98dafa45
Author: Vincent Le Ligeour <yo...@us...>
Date: Sun Dec 6 13:00:49 2009 +0100
Added some i18n stuffs (work in progress)
---
game/i18n.hh | 4 ++++
game/screen_hiscore.cc | 3 ++-
game/screen_intro.cc | 15 ++++++++-------
game/screen_players.cc | 9 +++++----
game/screen_sing.cc | 2 ++
game/screen_songs.cc | 8 ++++----
6 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/game/i18n.hh b/game/i18n.hh
new file mode 100644
index 0000000..24b87b9
--- /dev/null
+++ b/game/i18n.hh
@@ -0,0 +1,4 @@
+/* Internationalization Dependances */
+#include <libintl.h>
+#include <locale.h>
+#define _(x) gettext(x)
diff --git a/game/screen_hiscore.cc b/game/screen_hiscore.cc
index 9984c47..a369edf 100644
--- a/game/screen_hiscore.cc
+++ b/game/screen_hiscore.cc
@@ -5,6 +5,7 @@
#include "fs.hh"
#include "util.hh"
#include "database.hh"
+#include "i18n.hh"
#include <iostream>
#include <sstream>
@@ -100,7 +101,7 @@ void ScreenHiscore::draw() {
std::ostringstream oss_song, oss_order;
// Format the player information text
- oss_song << "Hiscore for " << m_song->title << "\n";
+ oss_song << _("Hiscore for ") << m_song->title << "\n";
m_database.queryPerSongHiscore(oss_order, m_song);
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index 27b70f5..2e5aec9 100755
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -3,21 +3,22 @@
#include "fs.hh"
#include "audio.hh"
#include "record.hh"
+#include "i18n.hh"
ScreenIntro::ScreenIntro(std::string const& name, Audio& audio, Capture& capture): Screen(name), m_audio(audio), m_capture(capture), selected() {
- m_menuOptions.push_back(new MenuOption("Perform", "Songs", "intro_sing.svg", "Start performing!"));
- m_menuOptions.push_back(new MenuOption("Practice", "Practice", "intro_practice.svg", "Check your skills or test the microphones"));
- m_menuOptions.push_back(new MenuOption("Configure", "Configuration", "intro_configure.svg", "Configure game options"));
- m_menuOptions.push_back(new MenuOption("Quit", "", "intro_quit.svg", "Leave the game"));
+ m_menuOptions.push_back(new MenuOption(_("Perform"), "Songs", "intro_sing.svg", _("Start performing!")));
+ m_menuOptions.push_back(new MenuOption(_("Practice"), "Practice", "intro_practice.svg", _("Check your skills or test the microphones")));
+ m_menuOptions.push_back(new MenuOption(_("Configure"), "Configuration", "intro_configure.svg", _("Configure game options")));
+ m_menuOptions.push_back(new MenuOption(_("Quit"), "", "intro_quit.svg", _("Leave the game")));
}
void ScreenIntro::enter() {
m_audio.playMusic(getThemePath("menu.ogg"), true);
theme.reset(new ThemeIntro());
std::string msg;
- if (!m_audio.isOpen()) msg = "No playback devices could be used.\n";
- if (m_capture.analyzers().empty()) msg += "No microphones found.\n";
- if (!msg.empty()) m_dialog.reset(new Dialog(msg + "\nPlease configure some before playing."));
+ if (!m_audio.isOpen()) msg = _("No playback devices could be used.\n");
+ if (m_capture.analyzers().empty()) msg += _("No microphones found.\n");
+ if (!msg.empty()) m_dialog.reset(new Dialog(msg + _("\nPlease configure some before playing.")));
}
void ScreenIntro::exit() {
diff --git a/game/screen_players.cc b/game/screen_players.cc
index ec4cd2c..ee0130e 100644
--- a/game/screen_players.cc
+++ b/game/screen_players.cc
@@ -8,6 +8,7 @@
#include "layout_singer.hh"
#include "theme.hh"
#include "video.hh"
+#include "i18n.hh"
#include <iostream>
#include <sstream>
@@ -106,16 +107,16 @@ void ScreenPlayers::draw() {
if (m_players.empty()) {
// Format the song information text
if (m_search.text.empty()) {
- oss_song << "No players found!";
- // oss_order << "Check " << m_players.file() << "\n" << "directory for players\n";
- oss_order << "Enter a name to create a new player.";
+ oss_song << _("No players found!");
+ oss_order << _("Enter a name to create a new player.");
} else {
- oss_song << "Press enter to create player!";
+ oss_song << _("Press enter to create player!");
oss_order << m_search.text << '\n';
}
} else {
// Format the player information text
oss_song << m_database.scores.front().track << "\n";
+ // TODO: use boost::format
oss_song << "You reached " << m_database.scores.front().score << " points!";
oss_order << "Please enter your Name!\n"
<< "Name: " << m_players.current().name << '\n';
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index b221df1..8aa867d 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -9,6 +9,7 @@
#include "video.hh"
#include "guitargraph.hh"
#include "glutil.hh"
+#include "i18n.hh"
#include <boost/format.hpp>
#include <boost/lexical_cast.hpp>
@@ -96,6 +97,7 @@ void ScreenSing::enter() {
void ScreenSing::instrumentLayout(double time) {
for (Instruments::iterator it = m_instruments.begin(); it != m_instruments.end();) {
if (it->dead(time)) {
+ // TODO: use boost::format
std::cout << it->getTrack() << " was thrown out after " << time << " inactive" << std::endl;
it = m_instruments.erase(it);
} else ++it;
diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 22bb819..e5a55a6 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -6,6 +6,7 @@
#include "util.hh"
#include "songs.hh"
#include "audio.hh"
+#include "i18n.hh"
#include <iostream>
#include <sstream>
@@ -205,11 +206,10 @@ void ScreenSongs::draw() {
if (m_songs.empty()) {
// Format the song information text
if (m_search.text.empty()) {
- oss_song << "No songs found!";
- oss_order << "Visit performous.org\n";
- oss_order << "for free songs";
+ oss_song << _("No songs found!");
+ oss_order << _("Visit performous.org\nfor free songs");
} else {
- oss_song << "no songs match search";
+ oss_song << _("no songs match search");
oss_order << m_search.text << '\n';
}
} else {
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:21
|
Module: performous Branch: dance Commit: 9077440832335a2b7cd03491520424112ac626f3 Author: Miguel Sánchez de León Peque <peq...@ho...> Date: Sat Dec 5 19:15:14 2009 +0100 Merge branch 'menu' --- |
