From: Wolfgang Becker Date: Mon, 11 Jun 2007 18:36:15 +0000 (+0000) Subject: *Fixed duplicated tile 628 on worldmap tile definition X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=1461bf61d2d93b6daea89a94c7b10708b0d40df9;hp=82a7fa5517cd6a5be53156776b556631927baf4e;p=supertux.git *Fixed duplicated tile 628 on worldmap tile definition *Adjust editor to changed executable name *Made treeboss level a bit brighter SVN-Revision: 5076 --- diff --git a/data/images/worldmap.strf b/data/images/worldmap.strf index 6ad73e6be..87619c124 100644 --- a/data/images/worldmap.strf +++ b/data/images/worldmap.strf @@ -994,7 +994,7 @@ 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 - 621 622 623 624 625 626 628 628 629 + 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 diff --git a/data/levels/test/treeboss.stl b/data/levels/test/treeboss.stl index b632d906d..c86e04aec 100644 --- a/data/levels/test/treeboss.stl +++ b/data/levels/test/treeboss.stl @@ -6,7 +6,7 @@ (sector (name "main") (music "music/treeboss.music") - (ambient-light 0.3180896 0.3931334 0.3490654) + (ambient-light 0.5333334 0.5333334 0.5333334) (background (speed 0.5) (image "images/background/arctis_dark.jpg") diff --git a/man/man6/supertux.6 b/man/man6/supertux.6 deleted file mode 100644 index d42e335e6..000000000 --- a/man/man6/supertux.6 +++ /dev/null @@ -1,108 +0,0 @@ -.TH SUPERTUX 6 "December 17, 2006" "0.3.0" "SuperTux" -.SH NAME -supertux \- a classic style 2D platform game -.SH SYNOPSIS -.B supertux -.RI [ options ] " level.stl" -.br -.B supertux -.RI [ options ] " worldmap.stwm" -.br -.SH DESCRIPTION -SuperTux is a classic style 2D platform game. -Run and jump through multiple worlds, fighting off enemies by jumping -on them, bumping them from below or tossing objects at them, grabbing -power-ups and other stuff on the way. -.SH OPTIONS -These programs follow the usual GNU command line syntax, with long -options starting with two dashes (`-'). -A summary of options is included below. -.TP -.B \-f, \-\-fullscreen -Run in fullscreen mode -.TP -.B \-w, \-\-window -Run in window mode -.TP -.B \-g, \-\-geometry WIDTHxHEIGHT -Run SuperTux in given resolution (eg. \-g 800x600) -.TP -.B \-a, \-\-aspect WIDTH:HEIGHT -Run SuperTux with given aspect ratio (eg. \-a 4:3) -.TP -.B \-\-disable\-sfx -Disable sound effects -.TP -.B \-\-disable\-music -Disable music -.TP -.B \-\-help -Show this help message -.TP -.B \-\-version -Display SuperTux version and quit -.TP -.B \-\-console -Enable ingame scripting console -.TP -.B \-\-noconsole -Disable ingame scripting console -.TP -.B \-\-show\-fps -Display framerate in levels -.TP -.B \-\-no\-show\-fps -Do not display framerate in levels -.TP -.B \-\-record\-demo FILE LEVEL -Record a demo to FILE -.TP -.B \-\-play\-demo FILE LEVEL -Play a recorded demo -.SH ENVIRONMENT -.TP -.B SUPERTUX_LANG -overrides locale detection and forces locale to given value, e.g. "de_DE" -.SH FILES -.TP -.B ~/.supertux2 -Contains configuration and savegames. -Also acts as an overlay of the SuperTux game data path: -Files placed here will override or supplement game data files. -.SH EXAMPLES -.TP -supertux --window --geometry 800x600 -"/usr/share/supertux/levels/world1/26 - The Castle of Nolok.stl" -.TP -supertux --play-demo -"~/Desktop/level26.demo" -.br -"/usr/share/supertux/levels/world1/26 - The Castle of Nolok.stl" -.PP -Custom-made levels can be conveniently stored in the overlay data folder. -Make sure to also create an "info" file, so the collection will be -recognized by SuperTux. -.PP -.B ~/.supertux2/levels/sample_collection/info -.nf -;SuperTux-Level-Subset -(supertux-level-subset - (title "Sample Collection") - (description "") -) -.fi -.PP -.B ~/.supertux2/levels/sample_collection/level01.stl -.nf -(supertux-level - (version 2) - (name (_ "Sample Level")) - (author "Myself") - ... -.fi - -.SH BUGS -This is a development version, so expect plenty of bugs. -.SH AUTHOR -This manual page was written by the SuperTux Devel Team -and is placed in the public domain. diff --git a/man/man6/supertux2.6 b/man/man6/supertux2.6 new file mode 100644 index 000000000..d42e335e6 --- /dev/null +++ b/man/man6/supertux2.6 @@ -0,0 +1,108 @@ +.TH SUPERTUX 6 "December 17, 2006" "0.3.0" "SuperTux" +.SH NAME +supertux \- a classic style 2D platform game +.SH SYNOPSIS +.B supertux +.RI [ options ] " level.stl" +.br +.B supertux +.RI [ options ] " worldmap.stwm" +.br +.SH DESCRIPTION +SuperTux is a classic style 2D platform game. +Run and jump through multiple worlds, fighting off enemies by jumping +on them, bumping them from below or tossing objects at them, grabbing +power-ups and other stuff on the way. +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +.TP +.B \-f, \-\-fullscreen +Run in fullscreen mode +.TP +.B \-w, \-\-window +Run in window mode +.TP +.B \-g, \-\-geometry WIDTHxHEIGHT +Run SuperTux in given resolution (eg. \-g 800x600) +.TP +.B \-a, \-\-aspect WIDTH:HEIGHT +Run SuperTux with given aspect ratio (eg. \-a 4:3) +.TP +.B \-\-disable\-sfx +Disable sound effects +.TP +.B \-\-disable\-music +Disable music +.TP +.B \-\-help +Show this help message +.TP +.B \-\-version +Display SuperTux version and quit +.TP +.B \-\-console +Enable ingame scripting console +.TP +.B \-\-noconsole +Disable ingame scripting console +.TP +.B \-\-show\-fps +Display framerate in levels +.TP +.B \-\-no\-show\-fps +Do not display framerate in levels +.TP +.B \-\-record\-demo FILE LEVEL +Record a demo to FILE +.TP +.B \-\-play\-demo FILE LEVEL +Play a recorded demo +.SH ENVIRONMENT +.TP +.B SUPERTUX_LANG +overrides locale detection and forces locale to given value, e.g. "de_DE" +.SH FILES +.TP +.B ~/.supertux2 +Contains configuration and savegames. +Also acts as an overlay of the SuperTux game data path: +Files placed here will override or supplement game data files. +.SH EXAMPLES +.TP +supertux --window --geometry 800x600 +"/usr/share/supertux/levels/world1/26 - The Castle of Nolok.stl" +.TP +supertux --play-demo +"~/Desktop/level26.demo" +.br +"/usr/share/supertux/levels/world1/26 - The Castle of Nolok.stl" +.PP +Custom-made levels can be conveniently stored in the overlay data folder. +Make sure to also create an "info" file, so the collection will be +recognized by SuperTux. +.PP +.B ~/.supertux2/levels/sample_collection/info +.nf +;SuperTux-Level-Subset +(supertux-level-subset + (title "Sample Collection") + (description "") +) +.fi +.PP +.B ~/.supertux2/levels/sample_collection/level01.stl +.nf +(supertux-level + (version 2) + (name (_ "Sample Level")) + (author "Myself") + ... +.fi + +.SH BUGS +This is a development version, so expect plenty of bugs. +.SH AUTHOR +This manual page was written by the SuperTux Devel Team +and is placed in the public domain.