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...> - 2011-01-11 00:38:48
|
Module: web Branch: master Commit: d68e60e836e86f09331656555382eec388ed0504 Author: Lasse Karkkainen <tro...@tr...> Date: Tue Jan 11 01:38:28 2011 +0100 Disable display related Youtube videos because they are crap or even unrelated --- htdocs-source/about.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/htdocs-source/about.txt b/htdocs-source/about.txt index e57bbd2..9a1099e 100644 --- a/htdocs-source/about.txt +++ b/htdocs-source/about.txt @@ -1,7 +1,8 @@ What is it? :>div,~margin - <iframe title="YouTube video player" class="youtube-player" type="text/html" width="640" height="510" src="http://www.youtube.com/embed/soYIbsVmcyU" frameborder="0"></iframe> + <iframe title="YouTube video player" class="youtube-player" type="text/html" width="640" height="510" src="http://www.youtube.com/embed/soYIbsVmcyU?rel=0" frameborder="0"></iframe> + :h2:Vocals |
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-11 00:36:52
|
Module: web Branch: master Commit: 82fe443a19a55213414fc0b758e2196e69c6bfb1 Author: Lasse Karkkainen <tro...@tr...> Date: Tue Jan 11 01:36:33 2011 +0100 Remove video autoplay on about page and reorganize the page --- htdocs-source/about.txt | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/htdocs-source/about.txt b/htdocs-source/about.txt index b0f9097..e57bbd2 100644 --- a/htdocs-source/about.txt +++ b/htdocs-source/about.txt @@ -1,5 +1,8 @@ What is it? + :>div,~margin + <iframe title="YouTube video player" class="youtube-player" type="text/html" width="640" height="510" src="http://www.youtube.com/embed/soYIbsVmcyU" frameborder="0"></iframe> + :h2:Vocals Pick up your microphone and start singing. The game won't just score your performance but your pitch is constantly displayed so you can correct the mistakes and actually learn to sing... And then beat your friends in multiplayer mode :) @@ -16,11 +19,6 @@ Playing drums is like the real thing, especially if you happen to be lucky enoug Let the rhythm guide your feet when you show your dance moves on a dance pad, or just be a geek and use the keypad with your fingers instead. The graphics ain't hot yet but nonetheless you can dance all the same. -:h2:See it in action - - :>div,~margin - <iframe title="YouTube video player" class="youtube-player" type="text/html" width="640" height="510" src="http://www.youtube.com/embed/soYIbsVmcyU?rel=0&autoplay=1" frameborder="0"></iframe> - :h2:Features Vocals, guitars (lead/rhythm/bass), drums and dancing with multiplayer support |
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-11 00:36:49
|
Module: web
Branch: master
Commit: 0383e864f41bd4d87fb4af79048e199cf2f27cbe
Author: Lasse Karkkainen <tro...@tr...>
Date: Tue Jan 11 01:34:05 2011 +0100
Experiment with fade-to-black background
---
htdocs-binary/bgs/fantasy_16.jpg | Bin 211439 -> 110946 bytes
htdocs-binary/style.css | 2 +-
2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/htdocs-binary/bgs/fantasy_16.jpg b/htdocs-binary/bgs/fantasy_16.jpg
index b694eae..355c379 100644
Binary files a/htdocs-binary/bgs/fantasy_16.jpg and b/htdocs-binary/bgs/fantasy_16.jpg differ
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index 4f07ca4..eea7b1e 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -1,5 +1,5 @@
body {
- background: #000 url('bgs/fantasy_16.jpg') repeat;
+ background: #000 url('bgs/fantasy_16.jpg') no-repeat;
/* Sadly this is too slow: background-attachment: fixed; */
background-position: center top;
font-family: DejaVu Sans, Verdana, Sans-Serif, sans;
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:29:15
|
Module: web
Branch: master
Commit: f0f9677348c8b0d2635be24127ab81aa86ada473
Author: Lasse Karkkainen <tro...@tr...>
Date: Tue Jan 11 00:29:03 2011 +0100
More padding on main, rounded corners for h2 boxes
---
htdocs-binary/style.css | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index 2d1ab5e..4f07ca4 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -44,7 +44,7 @@ body {
margin: 20px;
margin-left: 145px;
margin-top: 70px;
- padding: 10px;
+ padding: 20px 10px;
}
#content {
width: 640px;
@@ -122,6 +122,8 @@ h1 {
/*text-shadow: 0px 0px 10px rgba(68, 68, 136, 1.0);*/
}
#content h2, .mceContentBody h2 {
+ border-radius: 10px 20px 20px 10px;
+ -moz-border-radius: 10px 20px 20px 10px;
display: block;
margin: 0;
margin-left: -10px;
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:54
|
Module: web
Branch: master
Commit: c78731992235d8f4d522f651bc8fcb2029606962
Author: Lasse Karkkainen <tro...@tr...>
Date: Fri Dec 10 01:06:55 2010 +0100
About page updates
---
htdocs-binary/imgs/pose.png | Bin 0 -> 18627 bytes
htdocs-binary/style.css | 11 ++++++-----
htdocs-source/about.txt | 17 +++++++++--------
htdocs-source/index.txt | 2 +-
4 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/htdocs-binary/imgs/pose.png b/htdocs-binary/imgs/pose.png
new file mode 100644
index 0000000..9ba87e0
Binary files /dev/null and b/htdocs-binary/imgs/pose.png differ
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index 99b40c4..2d1ab5e 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -95,11 +95,6 @@ body {
width: 150px;
}
-
-.picmargin {
- margin-left: 250px;
-}
-
.center {
text-align: center;
}
@@ -162,6 +157,12 @@ h3 {
white-space: pre;
}
+.thumb {
+ width: 128px;
+ margin-bottom: 30px;
+ -webkit-box-reflect:below 0 -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(0.6, transparent), to(rgba(255,255,255,0.3)));
+}
+
.margin {
margin: 2em 0;
}
diff --git a/htdocs-source/about.txt b/htdocs-source/about.txt
index 43c20e0..b0f9097 100644
--- a/htdocs-source/about.txt
+++ b/htdocs-source/about.txt
@@ -1,30 +1,33 @@
What is it?
-:h2:Performous in a nutshell
-
-:h3:Vocals
+:h2:Vocals
Pick up your microphone and start singing. The game won't just score your performance but your pitch is constantly displayed so you can correct the mistakes and actually learn to sing... And then beat your friends in multiplayer mode :)
For those who <em>sing rather than well</em>, a karaoke mode is provided. In this mode only lyrics are displayed and there are no notes or scoring.
-:h3:Guitar and drums
+:h2:Guitar and drums<img src="imgs/pose.png" alt="holding keyboard" style="float:right" class="margin">
Pick up your keyboard like this... Or if you prefer, connect one of those guitar controllers you can buy for almost nothing at your local gaming store. Playing a plastic guitar with five buttons sure isn't like the real thing but it just happens to be a good deal easier to learn and thus a hit at your party. Just make sure that the guys holding your guitar controllers allow others to play too.
Playing drums is like the real thing, especially if you happen to be lucky enough to have one of those professional MIDI drum sets. For the rest of us the el cheapo band game controllers will have to do.
-:h3:Dance
+:h2:Dance
Let the rhythm guide your feet when you show your dance moves on a dance pad, or just be a geek and use the keypad with your fingers instead. The graphics ain't hot yet but nonetheless you can dance all the same.
+:h2:See it in action
+
+ :>div,~margin
+ <iframe title="YouTube video player" class="youtube-player" type="text/html" width="640" height="510" src="http://www.youtube.com/embed/soYIbsVmcyU?rel=0&autoplay=1" frameborder="0"></iframe>
+
:h2:Features
Vocals, guitars (lead/rhythm/bass), drums and dancing with multiplayer support
Extremely good singing pitch detection (usable even with laptop or webcam microphones)
Intelligent gameplay determines what the player attempted to do
Avoid accidental hammer-ons / pull-offs, among other things
- No more "wtf, I didn't do any mistake there" feeling (hopefully)
+ No more "wtf, I didn't make any mistake there" feeling
Controllers are autodetected (no need to configure keys)
Song formats: <a href="http://google.com/search?q=FoF+songs" target="_new">FoF</a>, <a href="http://google.com/search?q=UltraStar+songs" target="_new">UltraStar</a>, SingStar PS2 DVD (with ss_extract), <a href="http://google.com/search?q=StepMania+songs" target="_new">StepMania</a>
C++ for high performance, rapid development and solid code
@@ -39,5 +42,3 @@ Let the rhythm guide your feet when you show your dance moves on a dance pad, or
USB guitars and drums (Guitar Hero, Rock Band)
USB dance pad for dancing (various brands)
-A regular PC keyboard can be used as a controller so don't worry if you don't have all of the plastic toys yet. Rock Band 3 real controllers are not currently supported (properly) but we will look into that as soon as we get our hands on those.
-
diff --git a/htdocs-source/index.txt b/htdocs-source/index.txt
index 3ed07a0..57d47cb 100644
--- a/htdocs-source/index.txt
+++ b/htdocs-source/index.txt
@@ -1,7 +1,7 @@
The All-in-One Music Game
:>div
- <div id="showcase" style="background: url('imgs/showcase.jpg') repeat-x; width: 640px; height: 96px; margin-bottom: 30px; -webkit-box-reflect:below 0 -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(0.6, transparent), to(rgba(255,255,255,0.3)));"></div>
+ <div id="showcase" class="thumb" style="background: url('imgs/showcase.jpg') repeat-x; width: 640px; height: 96px;"></div>
<script type="text/javascript" src="showcase.js"></script>
Everybody loves music and while one might be too shy to dance or sing, there is always some part for everyone. Performous is about improving your skills and having fun at the same time. No special hardware required, you may play guitar on your PC keyboard, sing on your laptop microphone and so on. If you do have SingStar microphones, Guitar Hero or Rock Band instruments, or dance pads, just plug them into your USB ports and start rocking!
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:51
|
Module: web
Branch: master
Commit: c7382a113b89da07571d726ec0a22393c03f447c
Author: Lasse Karkkainen <tro...@tr...>
Date: Thu Dec 9 10:35:51 2010 +0100
TinyMCE code archived for later use
---
htdocs-source/editpage.html | 53 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/htdocs-source/editpage.html b/htdocs-source/editpage.html
new file mode 100644
index 0000000..f9f49d9
--- /dev/null
+++ b/htdocs-source/editpage.html
@@ -0,0 +1,53 @@
+<!-- TinyMCE -->
+<script type="text/javascript" src="tiny_mce/tiny_mce.js"></script>
+<script type="text/javascript">
+ function edit(element) {
+ var code = element.innerHTML;
+ element.parentNode.innerHTML = '<h1>Edit page</h1><form method="post" action="http://tinymce.moxiecode.com/dump.php?example=true"><textarea id="elm1" name="elm1" rows="15" cols="80" style="width: 640px; height: 500px;"></textarea><input type="submit" name="save" value="Submit"><input type="reset" name="reset" value="Reset"></form>';
+ document.getElementById('elm1').value = code;
+ tinyMCE.init({
+ // General options
+ mode : "textareas",
+ theme : "advanced",
+ plugins : "pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",
+
+ // Theme options
+ theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",
+ theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
+ theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",
+ theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft",
+ theme_advanced_toolbar_location : "top",
+ theme_advanced_toolbar_align : "left",
+ theme_advanced_statusbar_location : "bottom",
+ theme_advanced_resizing : true,
+
+ // Example content CSS (should be your site CSS)
+ content_css : "style.css",
+
+ // Drop lists for link/image/media/template dialogs
+ template_external_list_url : "lists/template_list.js",
+ external_link_list_url : "lists/link_list.js",
+ external_image_list_url : "lists/image_list.js",
+ media_external_list_url : "lists/media_list.js",
+
+ // Style formats
+ style_formats : [
+ {title : 'Bold text', inline : 'b'},
+ {title : 'Red text', inline : 'span', styles : {color : '#ff0000'}},
+ {title : 'Red header', block : 'h1', styles : {color : '#ff0000'}},
+ {title : 'Example 1', inline : 'span', classes : 'example1'},
+ {title : 'Example 2', inline : 'span', classes : 'example2'},
+ {title : 'Table styles'},
+ {title : 'Table row 1', selector : 'tr', classes : 'tablerow1'}
+ ],
+
+ // Replace values for the template plugin
+ template_replace_values : {
+ username : "Some User",
+ staffid : "991234"
+ }
+ });
+ }
+</script>
+<!-- /TinyMCE -->
+
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:48
|
Module: web Branch: master Commit: d248b49f69f0eb3f35cd15f433651531d1dd6e14 Author: Lasse Karkkainen <tro...@tr...> Date: Thu Dec 9 10:35:33 2010 +0100 Updates to screenshots and showcase --- htdocs-binary/imgs/download.png | Bin 0 -> 6198 bytes htdocs-binary/imgs/showcase.jpg | Bin 106976 -> 61688 bytes htdocs-binary/imgs/windows7.png | Bin 0 -> 66839 bytes htdocs-binary/photos/pgwp1.jpg | Bin 0 -> 26618 bytes htdocs-binary/photos/pgwp2.jpg | Bin 0 -> 34443 bytes htdocs-binary/photos/pgwp3.jpg | Bin 0 -> 27634 bytes htdocs-binary/showcase.txt | 13 +++++++++++++ 7 files changed, 13 insertions(+), 0 deletions(-) diff --git a/htdocs-binary/imgs/download.png b/htdocs-binary/imgs/download.png new file mode 100644 index 0000000..7e59fa6 Binary files /dev/null and b/htdocs-binary/imgs/download.png differ diff --git a/htdocs-binary/imgs/showcase.jpg b/htdocs-binary/imgs/showcase.jpg index 95373cb..7e68f91 100644 Binary files a/htdocs-binary/imgs/showcase.jpg and b/htdocs-binary/imgs/showcase.jpg differ diff --git a/htdocs-binary/imgs/windows7.png b/htdocs-binary/imgs/windows7.png new file mode 100644 index 0000000..0a73397 Binary files /dev/null and b/htdocs-binary/imgs/windows7.png differ diff --git a/htdocs-binary/photos/pgwp1.jpg b/htdocs-binary/photos/pgwp1.jpg new file mode 100644 index 0000000..ad0f1c2 Binary files /dev/null and b/htdocs-binary/photos/pgwp1.jpg differ diff --git a/htdocs-binary/photos/pgwp2.jpg b/htdocs-binary/photos/pgwp2.jpg new file mode 100644 index 0000000..11a4fe4 Binary files /dev/null and b/htdocs-binary/photos/pgwp2.jpg differ diff --git a/htdocs-binary/photos/pgwp3.jpg b/htdocs-binary/photos/pgwp3.jpg new file mode 100644 index 0000000..607565d Binary files /dev/null and b/htdocs-binary/photos/pgwp3.jpg differ diff --git a/htdocs-binary/showcase.txt b/htdocs-binary/showcase.txt new file mode 100644 index 0000000..0e87a38 --- /dev/null +++ b/htdocs-binary/showcase.txt @@ -0,0 +1,13 @@ +photos/pgwp1.jpg +screenshots/0.6.0/full_band.jpg +photos/pgwp2.jpg +screenshots/Performous-0.4.0-guitar_sing.jpg +photos/pgwp3.jpg +screenshots/0.5.0/menu_fi.jpg +photos/img2.jpg +screenshots/Performous-0.4.0-guitar.jpg +photos/youtube-joanna.jpg +screenshots/0.6.0/sing.jpg +photos/img1.jpg +screenshots/0.6.0/song_browser.jpg + |
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:45
|
Module: web Branch: master Commit: bab2576131a2269f97af583a00a06b0471574e8c Author: Lasse Karkkainen <tro...@tr...> Date: Thu Dec 9 02:44:32 2010 +0100 Minor site tuning --- htdocs-source/AWC-cfg.txt | 1 - htdocs-source/about.txt | 2 -- htdocs-source/download.txt | 10 ++++------ htdocs-source/index.txt | 8 ++++---- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/htdocs-source/AWC-cfg.txt b/htdocs-source/AWC-cfg.txt index 3d878e7..9fbadc2 100644 --- a/htdocs-source/AWC-cfg.txt +++ b/htdocs-source/AWC-cfg.txt @@ -2,7 +2,6 @@ +index Home +blog Blog +about What is it -+screenshots Screenshots +download Download +songs Free songs +others Other games diff --git a/htdocs-source/about.txt b/htdocs-source/about.txt index e184836..43c20e0 100644 --- a/htdocs-source/about.txt +++ b/htdocs-source/about.txt @@ -2,8 +2,6 @@ What is it? :h2:Performous in a nutshell -Everybody loves music and while some might be too shy to dance or sing, there is always some part for everyone. Performous is about improving your skills and having fun at the same time. - :h3:Vocals Pick up your microphone and start singing. The game won't just score your performance but your pitch is constantly displayed so you can correct the mistakes and actually learn to sing... And then beat your friends in multiplayer mode :) diff --git a/htdocs-source/download.txt b/htdocs-source/download.txt index 9ff7b02..9e4ff97 100644 --- a/htdocs-source/download.txt +++ b/htdocs-source/download.txt @@ -24,11 +24,9 @@ Download Performous Fedora 14: <a href="http://sourceforge.net/projects/performous/files/performous/0.6.1/Performous-0.6.1-Fedora14-i386.rpm/download" target="_new">i386</a> <a href="http://sourceforge.net/projects/performous/files/performous/0.6.1/Performous-0.6.1-Fedora14-amd64.rpm/download" target="_new">amd64</a> Mandriva 2010.0: <a href="http://ftp.blogdrake.net/mandriva/2010.0/update/i586/Performous-0.5.1-01bdk2010.0.i586.rpm">i586</a> <a href="http://ftp.blogdrake.net/mandriva/2010.0/update/x86_64/Performous-0.5.1-01bdk2010.0.x86_64.rpm">x86_64</a> +:h2:Build from source code - -:h2:Other systems and development version - - Source code (v0.6.1): <a href="http://sourceforge.net/projects/performous/files/performous/0.6.1/Performous-0.6.1-Source.tar.bz2/download" target="_new">universal</a> - -If you are building Performous yourself or wish to do any development on it, you should always use the Git repository rather than source code packages. See the <a href="http://wiki.performous.org/index.php/Developing" target="_new">development wiki pages</a> for more information. + Git repository: <a href="git://git.performous.org/gitroot/performous/performous">performous</a> (see <a href="http://wiki.performous.org/index.php/Developing" target="_new">instructions</a>) + +If you are building Performous yourself or wish to do any development on it, you should always use the git master branch rather than releases. The master branch is relatively stable as all development is done in separate branches but it often contains bugfixes and improvements that haven't been released yet. diff --git a/htdocs-source/index.txt b/htdocs-source/index.txt index 4ab2bb4..3ed07a0 100644 --- a/htdocs-source/index.txt +++ b/htdocs-source/index.txt @@ -4,15 +4,15 @@ The All-in-One Music Game <div id="showcase" style="background: url('imgs/showcase.jpg') repeat-x; width: 640px; height: 96px; margin-bottom: 30px; -webkit-box-reflect:below 0 -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(0.6, transparent), to(rgba(255,255,255,0.3)));"></div> <script type="text/javascript" src="showcase.js"></script> -Rock your friends or learn to sing better. If you are looking for a fun music game, this is it. No special hardware required, you may play guitar on your PC keyboard, sing on any microphone or webcam you happen to have and so on. If you do have SingStar microphones, Guitar Hero or RockBand instruments, or dance pads, just plug them into your USB ports and they will be autodetected by Performous. +Everybody loves music and while one might be too shy to dance or sing, there is always some part for everyone. Performous is about improving your skills and having fun at the same time. No special hardware required, you may play guitar on your PC keyboard, sing on your laptop microphone and so on. If you do have SingStar microphones, Guitar Hero or Rock Band instruments, or dance pads, just plug them into your USB ports and start rocking! -While Performous is still in development and you will find some crappy graphics and rough edges, many users think that it already beats even those commercial games. Oh, and Performous is <b>free software</b>. That means open source, no ads or spyware included now or ever. Click that download button and give it a test run now! +Performous is <b>free software</b> and once you click that download button, you will find out that open source doesn't need to suck. In fact, many users keep praising us about how we beat even those commercial games. -We constantly strive to improve the gameplay and the algorithms the game is built on. Performous does not attempt to clone and catch other games but instead we listen to user feedback and try to find the best solutions. The game is developed by a relatively large team of skilled people but we are always looking for new recruits. If you think you can improve something or if you just wish to build from source, click the C++ button. +We constantly strive to improve the gameplay and the algorithms the game is built on. Performous does not attempt to catch up on other games and clone them but instead we listen to user feedback and try to find the best solutions. The game is developed by a relatively large team of skilled people but we are always looking for new recruits. If you think you can improve something or if you just wish to build from source, click the C++ button. :>div <div style="width: 128px; margin-left: auto"> - <a id="download" href="download.html" title="Downloads"><img style="width: 64px; height: 64px;" src="imgs/icon_down.png" style="display: inline" alt="Download"></a><a href="http://wiki.performous.org/index.php/Building_and_installing_from_source" title="Build from source" target="_new"><img style="width: 64px; height: 64px;" src="imgs/icon_cpp.png" style="display: inline" alt="Source code"></a> + <a id="download" href="download" title="Downloads"><img style="width: 64px; height: 64px;" src="imgs/icon_down.png" style="display: inline" alt="Download"></a><a href="http://wiki.performous.org/index.php/Developing" title="Build from source" target="_new"><img style="width: 64px; height: 64px;" src="imgs/icon_cpp.png" style="display: inline" alt="C++"></a> </div> <script type="text/javascript" src="download.js"></script> |
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:42
|
Module: web Branch: master Commit: 197d41d39659525642473d8e7ef8bf3dd9914c61 Author: Lasse Karkkainen <tro...@tr...> Date: Thu Dec 9 02:23:11 2010 +0100 Site updates such as external links opening in new tabs --- htdocs-binary/style.css | 4 ++ htdocs-source/about.txt | 4 +- htdocs-source/blog.txt | 42 +++++++++------- htdocs-source/download.txt | 22 ++++---- htdocs-source/index.txt | 11 ++++- htdocs-source/songs.txt | 112 +++++++++++++++++++++++-------------------- 6 files changed, 110 insertions(+), 85 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:40
|
Module: web
Branch: master
Commit: 453d82cfe88ad093ce56d61cd08012dc0965e95f
Author: Lasse Karkkainen <tro...@tr...>
Date: Thu Dec 9 02:22:37 2010 +0100
Numerous webconv fixes and improvements + a few ugly hacks
---
webconv/webconv-x86-linux.bin | Bin 1377511 -> 86080 bytes
webconv/webconv.cpp | 69 +++++++++++++++++++++++++---------------
2 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/webconv/webconv-x86-linux.bin b/webconv/webconv-x86-linux.bin
index 896cc62..9eed31b 100755
Binary files a/webconv/webconv-x86-linux.bin and b/webconv/webconv-x86-linux.bin differ
diff --git a/webconv/webconv.cpp b/webconv/webconv.cpp
index fb3f8c4..527f05e 100644
--- a/webconv/webconv.cpp
+++ b/webconv/webconv.cpp
@@ -30,7 +30,16 @@ struct Page {
bool generate;
enum { UNINITIALIZED, UNSELECTED, SELECTED, PATH } selection;
Page(string title = "", string name = "", bool generate = false): title(title), name(name), link(name), generate(generate), selection(UNINITIALIZED) {
+#if 0
+ // Links for offline use
if (generate) link += ".html";
+#else
+ // Apache can guess file extension so we won't use any
+ // index page is unnamed
+ if (link == "index") link = ".";
+#endif
+ // Hack of the year (for adding target="_new" on external links)
+ if (!generate) link += "\" target=\"_new";
}
};
@@ -92,6 +101,7 @@ class HTML {
m_file << menu_title(page);
menu_submenu(page);
m_file << "</li>";
+ m_need_newline = true;
}
/** Print a submenu inside the <li> of an outer menu. **/
@@ -112,13 +122,9 @@ class HTML {
} else if (page.name.empty()) {
// No link => just print the title with no link
return "<h2>" + page.title + "</h2>";
- } else if (page.selection == Page::SELECTED) {
- // Selected page => dummy link or no link (comment out the one you don't need)
- if (useless_links) {
- return "<a href=\"#\">" + page.title + "</a>";
- } else {
- return page.title;
- }
+ } else if (!useless_links && page.selection == Page::SELECTED) {
+ // No link for current page
+ return page.title;
} else {
// Normal link
return "<a href=\"" + page.link + "\">" + page.title + "</a>";
@@ -163,6 +169,17 @@ struct Block {
Block(string t, string i): tag(t), inner_tag(i) {}
};
+namespace {
+ string startTag(string const& tag, string const& cl) {
+ return "<" + tag + (cl.empty() ? "" : " class=\"" + cl + "\"") + ">";
+ }
+ void tagWrap(string& content, string const& tag, string const& cl) {
+ if (tag.empty()) return;
+ content = startTag(tag, cl) + content + "</" + tag + ">";
+ }
+
+}
+
class Constructor {
string m_dir_source, m_dir_dest;
Pagelist m_pages;
@@ -177,7 +194,7 @@ public:
void body_process(std::istream& in, HTML& document) {
string line;
std::stack<Block> blocks;
- while (in.good()) {
+ while (true) {
// Eat tabs & count indent level
int level = 0;
{
@@ -185,9 +202,14 @@ public:
while ((ch = in.get()) == '\t') ++level;
in.putback(ch);
}
- if (!in.good()) break;
+ // Close any blocks no longer needed
+ while (level < blocks.size()) {
+ document.unindent();
+ document.println("</" + blocks.top().tag + ">");
+ blocks.pop();
+ }
// Read the rest of the line
- getline(in, line);
+ if (!getline(in, line)) break;
// Skip empty/comment lines
if (line.empty() || (line[0] == '#')) continue;
// Find content separator
@@ -208,7 +230,7 @@ public:
content = line;
}
enum { UNORDERED, ORDERED, BLOCK } list_type = UNORDERED;
- string tag = ((level == 0) ? "p" : blocks.top().inner_tag);
+ string tag = (level == 0 ? "p" : "");
string cl; // Class
string blocktag; // Used when starting blocks
while (ctrl.size()) {
@@ -227,33 +249,30 @@ public:
case 'h':
if (cmd.size() != 2) throw string("Invalid syntax for command 'h'");
if (!hasContent) throw string("Header without text");
- if (level == 0) tag = string("h") + cmd[1];
- else content = string("<h") + cmd[1] + ">" + content + "</h" + cmd[1] + ">";
+ tag = string("h") + cmd[1];
break;
case '>':
if ((cmd.size() == 2) && (cmd[1] == '#')) list_type = ORDERED;
else if ((cmd.size() == 2) && (cmd[1] == '*')) list_type = UNORDERED;
- else { list_type = BLOCK; blocktag = cmd.substr(1);Â }
+ else { list_type = BLOCK; blocktag = cmd.substr(1); }
break;
default:
throw string("Unknown formatting command: \"") + cmd + "\"";
}
}
- while (level < blocks.size()) {
- document.unindent();
- document.println("</" + blocks.top().tag + ">");
- blocks.pop();
- }
+ // Start any new blocks required
while (level > blocks.size()) {
switch (list_type) {
- case UNORDERED: document.println("<ul>"); blocks.push(Block("ul", "li")); break;
- case ORDERED: document.println("<ol>"); blocks.push(Block("ol", "li")); break;
- case BLOCK: document.println("<" + blocktag + ">"); blocks.push(Block(blocktag, "")); break;
+ case UNORDERED: document.println(startTag("ul", cl)); blocks.push(Block("ul", "li")); break;
+ case ORDERED: document.println(startTag("ol", cl)); blocks.push(Block("ol", "li")); break;
+ case BLOCK: document.println(startTag(blocktag, cl)); blocks.push(Block(blocktag, "")); break;
}
document.indent();
}
if (hasContent) {
- document.println('<' + tag + (cl.empty() ? "" : " class=\"" + cl + '"') + ">" + content + "</" + tag + '>');
+ if (!blocks.empty()) tagWrap(content, blocks.top().inner_tag, cl);
+ tagWrap(content, tag, cl);
+ document.println(content);
}
}
// Close any remaining blocks
@@ -294,9 +313,7 @@ public:
HTML document(m_dir_dest, name);
document.menu_selections(m_pages);
// TODO: rewrite the parser
- while (model.good()) {
- string line;
- getline(model, line);
+ for (string line; getline(model, line);) {
size_t pos = line.find("<+MENU+>");
if (pos != string::npos) {
document.set_indent(line.substr(0, pos));
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:37
|
Module: web
Branch: master
Commit: 2c4187394aafe76f8b911b95ede68e30e22aa11c
Author: Tapio Vierros <tap...@gm...>
Date: Tue Dec 7 10:51:50 2010 +0200
Experiment with seamless background + repeat.
---
htdocs-binary/bgs/fantasy_16.jpg | Bin 161190 -> 211439 bytes
htdocs-binary/style.css | 2 +-
2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/htdocs-binary/bgs/fantasy_16.jpg b/htdocs-binary/bgs/fantasy_16.jpg
index 2b66e87..b694eae 100644
Binary files a/htdocs-binary/bgs/fantasy_16.jpg and b/htdocs-binary/bgs/fantasy_16.jpg differ
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index 623b917..3e72f2c 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -1,5 +1,5 @@
body {
- background: #000 url('bgs/fantasy_16.jpg') no-repeat;
+ background: #000 url('bgs/fantasy_16.jpg') repeat;
/* Sadly this is too slow: background-attachment: fixed; */
background-position: center top;
font-family: DejaVu Sans, Verdana, Sans-Serif, sans;
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:34
|
Module: web
Branch: master
Commit: b4f57645f21f816854cfc6975fac00bc5a37838a
Author: Tapio Vierros <tap...@gm...>
Date: Tue Dec 7 02:46:03 2010 +0200
Remove unused variable.
---
htdocs-binary/download.js | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/htdocs-binary/download.js b/htdocs-binary/download.js
index 089af4c..fa3c530 100644
--- a/htdocs-binary/download.js
+++ b/htdocs-binary/download.js
@@ -1,6 +1,5 @@
function smartDownload() {
var e = document.getElementById('download');
- var agent = navigator.appVersion;
if (navigator.platform.indexOf("Win32") != -1 || navigator.platform.indexOf("Win64") != -1) {
// Windows
e.href = 'http://sourceforge.net/projects/performous/files/performous/0.6.1/Performous-0.6.1.exe/download';
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:31
|
Module: web
Branch: master
Commit: 4b681508e6cb599efd039feb3af29ea510aa17b6
Author: Vincent Le Ligeour <yo...@us...>
Date: Tue Dec 7 01:33:40 2010 +0100
Fixed OS detection
---
htdocs-binary/download.js | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/htdocs-binary/download.js b/htdocs-binary/download.js
index aa30eb2..089af4c 100644
--- a/htdocs-binary/download.js
+++ b/htdocs-binary/download.js
@@ -1,15 +1,21 @@
function smartDownload() {
var e = document.getElementById('download');
var agent = navigator.appVersion;
- if (agent.indexOf('Linux') != -1) return;
- if (agent.indexOf('Macintosh') != -1) {
+ if (navigator.platform.indexOf("Win32") != -1 || navigator.platform.indexOf("Win64") != -1) {
+ // Windows
+ e.href = 'http://sourceforge.net/projects/performous/files/performous/0.6.1/Performous-0.6.1.exe/download';
+ e.title = 'Performous 0.6.1 (Windows)';
+ return;
+ } else if (navigator.platform.indexOf("Linux") != -1) {
+ // Linux
+ return;
+ } else if (navigator.userAgent.indexOf("Mac OS X") != -1 || navigator.userAgent.indexOf("MSIE 5.2") != -1 || navigator.platform.indexOf("Mac") != -1) {
+ // Mac/Mac OS X
e.href = 'http://sourceforge.net/projects/performous/files/performous/0.5.0/Performous-0.5.0.dmg/download';
e.title = 'Performous 0.5.0 (OS X 10.5)';
return;
- }
- if (agent.indexOf('Windows') != -1) {
- e.href = 'http://sourceforge.net/projects/performous/files/performous/0.6.1/Performous-0.6.1.exe/download';
- e.title = 'Performous 0.6.1 (Windows)';
+ } else {
+ // Other
return;
}
}
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:29
|
Module: web
Branch: master
Commit: 0d1f0316e8cec272082e5563fa5571f42d963f58
Author: Lasse Karkkainen <tro...@tr...>
Date: Tue Dec 7 01:28:31 2010 +0100
Download button platform detection (b0rked)
---
htdocs-binary/download.js | 17 +++++++++++++++++
htdocs-source/index.txt | 3 +--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/htdocs-binary/download.js b/htdocs-binary/download.js
new file mode 100644
index 0000000..aa30eb2
--- /dev/null
+++ b/htdocs-binary/download.js
@@ -0,0 +1,17 @@
+function smartDownload() {
+ var e = document.getElementById('download');
+ var agent = navigator.appVersion;
+ if (agent.indexOf('Linux') != -1) return;
+ if (agent.indexOf('Macintosh') != -1) {
+ e.href = 'http://sourceforge.net/projects/performous/files/performous/0.5.0/Performous-0.5.0.dmg/download';
+ e.title = 'Performous 0.5.0 (OS X 10.5)';
+ return;
+ }
+ if (agent.indexOf('Windows') != -1) {
+ e.href = 'http://sourceforge.net/projects/performous/files/performous/0.6.1/Performous-0.6.1.exe/download';
+ e.title = 'Performous 0.6.1 (Windows)';
+ return;
+ }
+}
+smartDownload();
+
diff --git a/htdocs-source/index.txt b/htdocs-source/index.txt
index 63a4b48..3c072f5 100644
--- a/htdocs-source/index.txt
+++ b/htdocs-source/index.txt
@@ -8,5 +8,4 @@ While Performous is still in development and you will find some crappy graphics
We constantly strive to improve the gameplay and the algorithms the game is built on. Performous does not attempt to clone and catch other games but instead we listen to user feedback and try to find the best solutions. The game is developed by a relatively large team of skilled people but we are always looking for new recruits. If you think you can improve something or if you just wish to build from source, click the C++ button.
-<div style="width: 128px; margin-left: auto" id="download"><a href="https://sourceforge.net/projects/performous/files/performous/0.6.1/Performous-0.6.1.exe/download" title="Performous 0.6.1 (Windows, 22 MB)" target="_new"><img style="width: 64px; height: 64px;" src="imgs/icon_down.png" style="display: inline" alt="Download"></a><a href="http://wiki.performous.org/index.php/Building_and_installing_from_source" title="Build from source" target="_new"><img style="width: 64px; height: 64px;" src="imgs/icon_cpp.png" style="display: inline" alt="Source code"></a></div>
-
+<div style="width: 128px; margin-left: auto"><a id="download" href="download.html" title="Downloads"><img style="width: 64px; height: 64px;" src="imgs/icon_down.png" style="display: inline" alt="Download"></a><a href="http://wiki.performous.org/index.php/Building_and_installing_from_source" title="Build from source" target="_new"><img style="width: 64px; height: 64px;" src="imgs/icon_cpp.png" style="display: inline" alt="Source code"></a></div><script type="text/javascript" src="download.js"></script>
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:25
|
Module: web
Branch: master
Commit: 8df4034cd8962280f95b8572617fc3936326aa48
Author: Lasse Karkkainen <tro...@tr...>
Date: Tue Dec 7 01:27:56 2010 +0100
Remove TinyMCE
---
htdocs-source/Model.htm | 53 -----------------------------------------------
1 files changed, 0 insertions(+), 53 deletions(-)
diff --git a/htdocs-source/Model.htm b/htdocs-source/Model.htm
index f5c34bb..cbe92ab 100644
--- a/htdocs-source/Model.htm
+++ b/htdocs-source/Model.htm
@@ -6,58 +6,6 @@
<title>Performous - <+TITLE+></title>
<link rel="stylesheet" href="style.css" type="text/css"/>
<link rel="icon" type="image/png" href="icon.png"/>
-<!-- TinyMCE -->
-<script type="text/javascript" src="tiny_mce/tiny_mce.js"></script>
-<script type="text/javascript">
- function edit(element) {
- var code = element.innerHTML;
- element.parentNode.innerHTML = '<h1>Edit page</h1><form method="post" action="http://tinymce.moxiecode.com/dump.php?example=true"><textarea id="elm1" name="elm1" rows="15" cols="80" style="width: 640px; height: 500px;"></textarea><input type="submit" name="save" value="Submit"><input type="reset" name="reset" value="Reset"></form>';
- document.getElementById('elm1').value = code;
- tinyMCE.init({
- // General options
- mode : "textareas",
- theme : "advanced",
- plugins : "pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",
-
- // Theme options
- theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",
- theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
- theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",
- theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,pagebreak,restoredraft",
- theme_advanced_toolbar_location : "top",
- theme_advanced_toolbar_align : "left",
- theme_advanced_statusbar_location : "bottom",
- theme_advanced_resizing : true,
-
- // Example content CSS (should be your site CSS)
- content_css : "style.css",
-
- // Drop lists for link/image/media/template dialogs
- template_external_list_url : "lists/template_list.js",
- external_link_list_url : "lists/link_list.js",
- external_image_list_url : "lists/image_list.js",
- media_external_list_url : "lists/media_list.js",
-
- // Style formats
- style_formats : [
- {title : 'Bold text', inline : 'b'},
- {title : 'Red text', inline : 'span', styles : {color : '#ff0000'}},
- {title : 'Red header', block : 'h1', styles : {color : '#ff0000'}},
- {title : 'Example 1', inline : 'span', classes : 'example1'},
- {title : 'Example 2', inline : 'span', classes : 'example2'},
- {title : 'Table styles'},
- {title : 'Table row 1', selector : 'tr', classes : 'tablerow1'}
- ],
-
- // Replace values for the template plugin
- template_replace_values : {
- username : "Some User",
- staffid : "991234"
- }
- });
- }
-</script>
-<!-- /TinyMCE -->
</head>
<body>
@@ -71,7 +19,6 @@
</ul>
</div>
<div id="main">
- <a href="javascript:edit(document.getElementById('content'));">[edit]</a>
<div id="content">
<h1><+TITLE+></h1>
<+BODY+>
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:22
|
Module: web
Branch: master
Commit: ae033e6bb91ca1eb36137d9f3960c57bba351ee2
Author: Lasse Karkkainen <tro...@tr...>
Date: Tue Dec 7 00:31:32 2010 +0100
Use DejaVu Sans on website (now that the game itself uses that)
---
htdocs-binary/style.css | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index 5ea64e4..623b917 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -2,7 +2,7 @@ body {
background: #000 url('bgs/fantasy_16.jpg') no-repeat;
/* Sadly this is too slow: background-attachment: fixed; */
background-position: center top;
- font-family: Verdana, Sans-Serif, sans;
+ font-family: DejaVu Sans, Verdana, Sans-Serif, sans;
font-size: 13px;
line-height: 140%;
overflow: scroll;
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:19
|
Module: web
Branch: master
Commit: 3048cd32250ed9d823c262c6e02c54595d5c3589
Author: Lasse Karkkainen <tro...@tr...>
Date: Tue Dec 7 00:24:21 2010 +0100
Smoother showcase scroll
---
htdocs-binary/showcase.js | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/htdocs-binary/showcase.js b/htdocs-binary/showcase.js
index b128f38..de0abf7 100644
--- a/htdocs-binary/showcase.js
+++ b/htdocs-binary/showcase.js
@@ -1,14 +1,14 @@
var img = Math.floor(Math.random() * 20);
var anim = 0;
function showcaseScroll() {
- var e = document.getElementById('showcase');
- var pos = 128 * (img + 0.5 * (1 - Math.cos(Math.PI * anim / 30)));
- e.style.backgroundPosition = Math.round(-pos) + "px 0";
var timeout = 3500;
if (anim > 0) timeout = 16;
if (anim == 30) { anim = -1; ++img; }
- ++anim;
setTimeout('showcaseScroll()', timeout);
+ ++anim;
+ var e = document.getElementById('showcase');
+ var pos = 128 * (img + 0.5 * (1 - Math.cos(Math.PI * anim / 30)));
+ e.style.backgroundPosition = Math.round(-pos) + "px 0";
}
showcaseScroll();
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:16
|
Module: web
Branch: master
Commit: ac07e5d9264cde36f37fceb4b41e57ad3a781d62
Author: Lasse Karkkainen <tro...@tr...>
Date: Mon Dec 6 23:39:50 2010 +0100
Made #page scale with #main
---
htdocs-binary/style.css | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index 45e00e1..5ea64e4 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -23,7 +23,7 @@ body {
}
/* page */
#page {
- height: 600px;
+ min-height: 600px;
background-color: rgba(0,0,0,0.6);
box-shadow: 0px 0px 50px rgba(0, 0, 0, 0.5);
-webkit-box-shadow: 0px 0px 50px rgba(0, 0, 0, 0.5);
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:13
|
Module: web Branch: master Commit: 5b7e14210237be49c3ca9c5b48a2de0147f8feac Author: Lasse Karkkainen <tro...@tr...> Date: Mon Dec 6 23:30:33 2010 +0100 Missing files --- htdocs-binary/imgs/icon_cpp.png | Bin 0 -> 15931 bytes htdocs-binary/imgs/icon_down.png | Bin 0 -> 22467 bytes htdocs-binary/imgs/icon_mac.png | Bin 0 -> 17464 bytes htdocs-source/others.txt | 14 ++++++++++++++ 4 files changed, 14 insertions(+), 0 deletions(-) diff --git a/htdocs-binary/imgs/icon_cpp.png b/htdocs-binary/imgs/icon_cpp.png new file mode 100644 index 0000000..89e1ab0 Binary files /dev/null and b/htdocs-binary/imgs/icon_cpp.png differ diff --git a/htdocs-binary/imgs/icon_down.png b/htdocs-binary/imgs/icon_down.png new file mode 100644 index 0000000..d70a0b2 Binary files /dev/null and b/htdocs-binary/imgs/icon_down.png differ diff --git a/htdocs-binary/imgs/icon_mac.png b/htdocs-binary/imgs/icon_mac.png new file mode 100644 index 0000000..90830b6 Binary files /dev/null and b/htdocs-binary/imgs/icon_mac.png differ diff --git a/htdocs-source/others.txt b/htdocs-source/others.txt new file mode 100644 index 0000000..0b8419d --- /dev/null +++ b/htdocs-source/others.txt @@ -0,0 +1,14 @@ +Check out our competitors + +Nothing quite like Performous but there are interesting projects here. Let us know if anything worth a mention is missing. + +:h3:Singing games: + <a href="http://sourceforge.net/projects/ultrastardx/" target="_new">UltraStar Deluxe</a> - A cross-platform clone of SingStar + <a href="http://www.canta-game.org/" target="_new">Canta</a> - A simple cross-platform karaoke game + <a href="http://www.karaokeparty.com/" target="_new">KaraokeParty</a> - Runs on your browser with Flash +:h3:Guitar games: + <a href="http://code.google.com/p/fofix/" target="_new">FoFiX</a> - <a href="http://fretsonfire.sourceforge.net/">Frets on Fire</a> on steroids, now including band mode too + <a href="http://www.jamlegend.com/" target="_new">JamLegend</a> - A simple Flash game +:h3:Dance games: + <a href="http://www.stepmania.com/" target="_new">StepMania</a> - The original open-source dance game + |
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:11
|
Module: web Branch: master Commit: 0763a24d53904cddc23d632c572b54bdf3b4bcea Author: Lasse Karkkainen <tro...@tr...> Date: Mon Dec 6 22:38:06 2010 +0100 Cleaning up bloated/outdated pages. --- htdocs-binary/style.css | 2 +- htdocs-source/about.txt | 105 ++++++++++--------------------------------- htdocs-source/download.txt | 16 +------ 3 files changed, 28 insertions(+), 95 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:08
|
Module: web
Branch: master
Commit: d6c89bec5564215d49d7fafbac6a3087b59b2415
Author: Lasse Karkkainen <tro...@tr...>
Date: Mon Dec 6 22:37:31 2010 +0100
Rename install to download
---
htdocs-source/AWC-cfg.txt | 7 ++++---
htdocs-source/{install.txt => download.txt} | 0
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/htdocs-source/AWC-cfg.txt b/htdocs-source/AWC-cfg.txt
index dd0b517..3d878e7 100644
--- a/htdocs-source/AWC-cfg.txt
+++ b/htdocs-source/AWC-cfg.txt
@@ -1,10 +1,11 @@
% Performous
+index Home
+blog Blog
-+about About
++about What is it
+screenshots Screenshots
-+install Download
-+songs Songs
++download Download
++songs Free songs
++others Other games
% Project links
.http://wiki.performous.org/ Documentation
.http://webchat.freenode.net/?channels=#performous Webchat
diff --git a/htdocs-source/install.txt b/htdocs-source/download.txt
similarity index 100%
rename from htdocs-source/install.txt
rename to htdocs-source/download.txt
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:05
|
Module: web Branch: master Commit: 67b83b4f8b2805be06c5934f411c627cfa5bd8be Author: Lasse Karkkainen <tro...@tr...> Date: Mon Dec 6 18:58:08 2010 +0100 Front page tuning --- htdocs-source/index.txt | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs-source/index.txt b/htdocs-source/index.txt index e78ceda..63a4b48 100644 --- a/htdocs-source/index.txt +++ b/htdocs-source/index.txt @@ -4,6 +4,9 @@ The All-in-One Music Game Rock your friends or learn to sing better. If you are looking for a fun music game, this is it. No special hardware required, you may play guitar on your PC keyboard, sing on any microphone or webcam you happen to have and so on. If you do have SingStar microphones, Guitar Hero or RockBand instruments, or dance pads, just plug them into your USB ports and they will be autodetected by Performous. -While Performous is still in development and you will find some crappy graphics and rough edges, many users think that it already beats even those commercial games. Oh, and Performous is <b>free software</b>. That means open source, no ads or spyware included now or ever. Click that download button and give it a test run now! (Windows, Linux, OSX) +While Performous is still in development and you will find some crappy graphics and rough edges, many users think that it already beats even those commercial games. Oh, and Performous is <b>free software</b>. That means open source, no ads or spyware included now or ever. Click that download button and give it a test run now! + +We constantly strive to improve the gameplay and the algorithms the game is built on. Performous does not attempt to clone and catch other games but instead we listen to user feedback and try to find the best solutions. The game is developed by a relatively large team of skilled people but we are always looking for new recruits. If you think you can improve something or if you just wish to build from source, click the C++ button. + +<div style="width: 128px; margin-left: auto" id="download"><a href="https://sourceforge.net/projects/performous/files/performous/0.6.1/Performous-0.6.1.exe/download" title="Performous 0.6.1 (Windows, 22 MB)" target="_new"><img style="width: 64px; height: 64px;" src="imgs/icon_down.png" style="display: inline" alt="Download"></a><a href="http://wiki.performous.org/index.php/Building_and_installing_from_source" title="Build from source" target="_new"><img style="width: 64px; height: 64px;" src="imgs/icon_cpp.png" style="display: inline" alt="Source code"></a></div> -We constantly strive to improve the gameplay and the algorithms the game is built on. Performous does not attempt to clone and catch other games but instead we listen to user feedback and try to find the best solutions. The game is developed by a relatively large team of skilled people but we are always looking for new recruits. If you think you can improve something, head over to the development page for instructions. |
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:16:01
|
Module: web
Branch: master
Commit: d8aa79824f3c02b5535070e8465dec12c800094a
Author: Lasse Karkkainen <tro...@tr...>
Date: Mon Dec 6 18:57:50 2010 +0100
Fix image borders (on download icons) on Firefox
---
htdocs-binary/style.css | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index e082228..b20b581 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -137,7 +137,9 @@ h1 {
text-align: left;
/*text-decoration: underline;*/
}
-
+img {
+ border: 0;
+}
h3 {
font-size: 13px;
text-align: left;
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:15:58
|
Module: web
Branch: master
Commit: 8b4b50f65c088ee5d5f37949e4e34d3affa6457e
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Dec 5 20:17:05 2010 +0100
Cleanup and fix showcase scroll on Firefox
---
htdocs-binary/showcase.js | 14 ++++++++++++++
htdocs-binary/style.css | 8 --------
htdocs-source/Model.htm | 14 +-------------
htdocs-source/index.txt | 2 +-
4 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/htdocs-binary/showcase.js b/htdocs-binary/showcase.js
new file mode 100644
index 0000000..b128f38
--- /dev/null
+++ b/htdocs-binary/showcase.js
@@ -0,0 +1,14 @@
+var img = Math.floor(Math.random() * 20);
+var anim = 0;
+function showcaseScroll() {
+ var e = document.getElementById('showcase');
+ var pos = 128 * (img + 0.5 * (1 - Math.cos(Math.PI * anim / 30)));
+ e.style.backgroundPosition = Math.round(-pos) + "px 0";
+ var timeout = 3500;
+ if (anim > 0) timeout = 16;
+ if (anim == 30) { anim = -1; ++img; }
+ ++anim;
+ setTimeout('showcaseScroll()', timeout);
+}
+showcaseScroll();
+
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index f0e4feb..e082228 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -138,14 +138,6 @@ h1 {
/*text-decoration: underline;*/
}
-#showcase {
- background: url('imgs/showcase.jpg') repeat-x;
- width: 640px;
- height: 96px;
- margin-bottom: 30px;
- -webkit-box-reflect:below 0 -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(0.6, transparent), to(rgba(255,255,255,0.3)));
-}
-
h3 {
font-size: 13px;
text-align: left;
diff --git a/htdocs-source/Model.htm b/htdocs-source/Model.htm
index b70bdec..f5c34bb 100644
--- a/htdocs-source/Model.htm
+++ b/htdocs-source/Model.htm
@@ -56,23 +56,11 @@
}
});
}
- var img = 0;
- var anim = 0;
- function showcaseScroll() {
- var e = document.getElementById('showcase');
- var pos = 128 * (img + 0.5 * (1 - Math.cos(Math.PI * anim / 30)));
- e.style.backgroundPositionX = Math.round(-pos) + "px";
- var timeout = 3500;
- if (anim > 0) timeout = 16;
- if (anim == 30) { anim = -1; ++img; }
- ++anim;
- setTimeout('showcaseScroll()', timeout);
- }
</script>
<!-- /TinyMCE -->
</head>
- <body onload="showcaseScroll();">
+ <body>
<div id="sitebox">
<div id="title"><img src="imgs/title.png" alt="Performous"/></div>
diff --git a/htdocs-source/index.txt b/htdocs-source/index.txt
index 29f8e97..e78ceda 100644
--- a/htdocs-source/index.txt
+++ b/htdocs-source/index.txt
@@ -1,6 +1,6 @@
The All-in-One Music Game
-<div id="showcase"></div>
+<div id="showcase" style="background: url('imgs/showcase.jpg') repeat-x; width: 640px; height: 96px; margin-bottom: 30px; -webkit-box-reflect:below 0 -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(0.6, transparent), to(rgba(255,255,255,0.3)));"></div><script type="text/javascript" src="showcase.js"></script>
Rock your friends or learn to sing better. If you are looking for a fun music game, this is it. No special hardware required, you may play guitar on your PC keyboard, sing on any microphone or webcam you happen to have and so on. If you do have SingStar microphones, Guitar Hero or RockBand instruments, or dance pads, just plug them into your USB ports and they will be autodetected by Performous.
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-10 23:15:55
|
Module: web
Branch: master
Commit: 015756b029cb050972ccf0e223f3ec182047aa59
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Dec 5 19:59:14 2010 +0100
Fix border radius for Firefox
---
htdocs-binary/style.css | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index a42e24d..f0e4feb 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -1,5 +1,6 @@
body {
background: #000 url('bgs/fantasy_16.jpg') no-repeat;
+ /* Sadly this is too slow: background-attachment: fixed; */
background-size: 100%;
font-family: Verdana, Sans-Serif, sans;
font-size: 13px;
@@ -29,11 +30,13 @@ body {
-moz-box-shadow: 0px 0px 50px rgba(0, 0, 0, 0.5);
padding: 10px;
border-radius: 10px;
+ -moz-border-radius: 10px;
}
/* main column */
#main {
position: relative;
border-radius: 10px;
+ -moz-border-radius: 10px;
box-shadow: 0px 0px 50px #448;
-webkit-box-shadow: 0px 0px 50px #448;
-moz-box-shadow: 0px 0px 50px #448;
@@ -85,6 +88,7 @@ body {
#menu li.selected {
background-color: #448;
border-radius: 10px;
+ -moz-border-radius: 10px;
box-shadow: 0px 0px 50px #448;
-webkit-box-shadow: 0px 0px 50px #448;
-moz-box-shadow: 0px 0px 50px #448;
|
