super-tux-commit Mailing List for Super Tux (Page 20)
Brought to you by:
wkendrick
Menu
▾
▴
super-tux-commit — Messages about commits to the sourcecode.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(94) |
Apr
(500) |
May
(531) |
Jun
(196) |
Jul
(224) |
Aug
(193) |
Sep
(117) |
Oct
(115) |
Nov
(319) |
Dec
(97) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(19) |
Feb
|
Mar
(105) |
Apr
(41) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(4) |
Jul
|
Aug
|
Sep
(7) |
Oct
(12) |
Nov
(26) |
Dec
(39) |
| 2009 |
Jan
(6) |
Feb
(15) |
Mar
(10) |
Apr
(25) |
May
(29) |
Jun
(21) |
Jul
(26) |
Aug
(8) |
Sep
(3) |
Oct
|
Nov
|
Dec
(10) |
| 2010 |
Jan
(5) |
Feb
(5) |
Mar
(2) |
Apr
|
May
(5) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(2) |
Oct
(2) |
Nov
|
Dec
|
|
From: Matze B. <mat...@us...> - 2004-11-23 16:47:33
|
Update of /cvsroot/super-tux/supertux/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29597/lib Added Files: Jamfile Log Message: added jam build system, please try it out - the advantage would be that it already supports all the stuff we need --- NEW FILE: Jamfile --- SubDir TOP lib ; Library supertuxlib : [ Wildcard app : *.cpp *.h ] [ Wildcard audio : *.cpp *.h ] [ Wildcard gui : *.cpp *.h ] [ Wildcard math : *.cpp *.h ] [ Wildcard special : *.cpp *.h ] [ Wildcard utils : *.cpp *.h ] [ Wildcard video : *.cpp *.h ] ; ExternalLibs supertuxlib : SDL SDLMIXER SDLIMAGE GL ; C++Flags supertuxlib : -DDATA_PREFIX='\"$(appdatadir)\"' -DLOCALEDIR='\"$(datadir)/locale\"' : export ; Help supertuxlib : "Build supertux library" ; |
|
From: Matze B. <mat...@us...> - 2004-11-23 16:43:33
|
Update of /cvsroot/super-tux/supertux/mk/jam In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28981/jam Log Message: Directory /cvsroot/super-tux/supertux/mk/jam added to the repository |
|
From: Matze B. <mat...@us...> - 2004-11-23 16:28:12
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25398/src Modified Files: level.cpp Log Message: make function more robust Index: level.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v retrieving revision 1.107 retrieving revision 1.108 diff -u -d -r1.107 -r1.108 --- level.cpp 20 Nov 2004 22:14:38 -0000 1.107 +++ level.cpp 23 Nov 2004 16:28:03 -0000 1.108 @@ -252,10 +252,22 @@ Level::get_total_coins() { int total_coins = 0; - for(Sectors::iterator it = sectors.begin(); it != sectors.end(); ++it) - for(int x = 0; static_cast<unsigned int>(x) < it->second->solids->get_width(); x++) - for(int y = 0; static_cast<unsigned int>(y) < it->second->solids->get_height(); y++) - if(it->second->solids->get_tile(x,y)->attributes & Tile::COIN) + for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) { + TileMap* solids = i->second->solids; + if(!solids) { + std::cerr << "Sector '" << i->first << "' contains no solids!?!\n"; + continue; + } + for(size_t x = 0; x < solids->get_width(); ++x) + for(size_t y = 0; y < solids->get_height(); ++y) { + const Tile* tile = solids->get_tile(x, y); + if(tile == 0) { + std::cerr << "Invalid tile in sector '" << i->first << "'.\n"; + continue; + } + if(tile->attributes & Tile::COIN) total_coins++; + } + } return total_coins; } |
|
From: Matze B. <mat...@us...> - 2004-11-23 15:36:59
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14420 Modified Files: TODO Log Message: TODO update Index: TODO =================================================================== RCS file: /cvsroot/super-tux/supertux/TODO,v retrieving revision 1.86 retrieving revision 1.87 diff -u -d -r1.86 -r1.87 --- TODO 23 Nov 2004 02:34:16 -0000 1.86 +++ TODO 23 Nov 2004 15:36:49 -0000 1.87 @@ -150,6 +150,7 @@ - New forest tileset - Badguy sprites - Tux's buttjump animation +[H] Tiles constructed with image-region are not drawn coordinates < 0 [M] Save score on per-level basis to make high-score [M] Save time on per-level basis to make low-time-score |
|
From: Matze B. <mat...@us...> - 2004-11-23 15:34:56
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14133/src Modified Files: supertux.cpp Log Message: we only want localisation for mesages (otherwise parsing of floats in german expectes , instead of . for example) Index: supertux.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/supertux.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- supertux.cpp 20 Nov 2004 22:14:39 -0000 1.30 +++ supertux.cpp 23 Nov 2004 15:34:45 -0000 1.31 @@ -23,6 +23,7 @@ #include <cctype> #include <iostream> #include <exception> +#include <locale.h> #include "utils/exceptions.h" #include "defines.h" @@ -48,7 +49,11 @@ try { #endif config = new MyConfig; - setlocale(LC_ALL, ""); + + // we want translations only on messages + setlocale(LC_ALL, "C"); + setlocale(LC_MESSAGES, ""); + (void) bindtextdomain(PACKAGE, LOCALEDIR); (void) textdomain(PACKAGE); (void) bind_textdomain_codeset(PACKAGE, "ISO-8859-1"); |
|
From: Matze B. <mat...@us...> - 2004-11-23 15:34:54
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14133/data/levels/test Modified Files: forest1-grumbel.stl Log Message: we only want localisation for mesages (otherwise parsing of floats in german expectes , instead of . for example) Index: forest1-grumbel.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/forest1-grumbel.stl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- forest1-grumbel.stl 23 Nov 2004 15:13:32 -0000 1.2 +++ forest1-grumbel.stl 23 Nov 2004 15:34:44 -0000 1.3 @@ -13,7 +13,7 @@ (background (image "forest1.jpg") (speed 0.5)) (background (image "leaves.png") - (speed 0.8) + (speed 1.2) (layer 400)) (tilemap |
|
From: Marek M. <wa...@us...> - 2004-11-23 15:13:42
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9598/data/levels/test Modified Files: forest1-grumbel.stl Log Message: changed level name Index: forest1-grumbel.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/forest1-grumbel.stl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- forest1-grumbel.stl 23 Nov 2004 15:01:24 -0000 1.1 +++ forest1-grumbel.stl 23 Nov 2004 15:13:32 -0000 1.2 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 2) - (name "Forest Level 1") + (name "Forest - Foreground Layer Test") (author "SuperTux Team") (time 999) (sector |
|
From: Marek M. <wa...@us...> - 2004-11-23 15:01:43
|
Update of /cvsroot/super-tux/supertux/data/images/background In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6492/data/images/background Added Files: leaves.png Log Message: copied grumbel's forest level to the test section added translucent layer of leaves to the level --- NEW FILE: leaves.png --- (This appears to be a binary file; contents omitted.) |
|
From: Matze B. <mat...@us...> - 2004-11-23 14:36:48
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31544/src Modified Files: background.cpp Log Message: fix for last commit Index: background.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/background.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- background.cpp 23 Nov 2004 14:32:18 -0000 1.15 +++ background.cpp 23 Nov 2004 14:36:39 -0000 1.16 @@ -33,6 +33,7 @@ Background::Background(LispReader& reader) : type(INVALID), layer(LAYER_BACKGROUND0), image(0) { + reader.read_int("layer", layer); if(reader.read_string("image", imagefile) && reader.read_float("speed", speed)) { set_image(imagefile, speed); |
|
From: Matze B. <mat...@us...> - 2004-11-23 14:32:31
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30322/src Modified Files: background.cpp background.h Log Message: make it possible to put background images in each layer Index: background.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/background.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- background.h 20 Jul 2004 18:04:47 -0000 1.10 +++ background.h 23 Nov 2004 14:32:19 -0000 1.11 @@ -60,6 +60,7 @@ }; Type type; + int layer; std::string imagefile; float speed; Surface* image; Index: background.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/background.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- background.cpp 20 Nov 2004 22:14:37 -0000 1.14 +++ background.cpp 23 Nov 2004 14:32:18 -0000 1.15 @@ -26,12 +26,12 @@ #include "utils/lispwriter.h" Background::Background() - : type(INVALID), image(0) + : type(INVALID), layer(LAYER_BACKGROUND0), image(0) { } Background::Background(LispReader& reader) - : type(INVALID), image(0) + : type(INVALID), layer(LAYER_BACKGROUND0), image(0) { if(reader.read_string("image", imagefile) && reader.read_float("speed", speed)) { @@ -71,6 +71,7 @@ writer.write_int_vector("top_color", bkgd_top_color); writer.write_int_vector("bottom_color", bkgd_bottom_color); } + writer.write_int("layer", layer); writer.end_list("background"); } @@ -109,12 +110,12 @@ /* In case we are using OpenGL just draw the gradient, else (software mode) use the cache. */ if(use_gl) - context.draw_gradient(gradient_top, gradient_bottom, LAYER_BACKGROUND0); + context.draw_gradient(gradient_top, gradient_bottom, layer); else { context.push_transform(); context.set_translation(Vector(0, 0)); - context.draw_surface(image, Vector(0, 0), LAYER_BACKGROUND0); + context.draw_surface(image, Vector(0, 0), layer); context.pop_transform(); } } else if(type == IMAGE) { @@ -127,7 +128,7 @@ context.set_translation(Vector(0, 0)); for(int x = sx; x < screen->w; x += image->w) for(int y = sy; y < screen->h; y += image->h) - context.draw_surface(image, Vector(x, y), LAYER_BACKGROUND0); + context.draw_surface(image, Vector(x, y), layer); context.pop_transform(); } } |
|
From: Matze B. <mat...@us...> - 2004-11-23 14:32:31
|
Update of /cvsroot/super-tux/supertux/src/object In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30322/src/object Modified Files: block.cpp Log Message: make it possible to put background images in each layer Index: block.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/object/block.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- block.cpp 22 Nov 2004 23:47:51 -0000 1.2 +++ block.cpp 23 Nov 2004 14:32:19 -0000 1.3 @@ -47,7 +47,6 @@ // collided from below? if(hitdata.normal.x == 0 && hitdata.normal.y < 0 && player->get_movement().y < 0) { - printf("hit.\n"); hit(*player); } |
|
From: Marek M. <wa...@us...> - 2004-11-23 13:41:58
|
Update of /cvsroot/super-tux/supertux/data/levels/bonus1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14326/data/levels/bonus1 Modified Files: bonus-level1.stl bonus-level2.stl bonus-level3.stl bonus-level4.stl bonus-level5.stl wansti-level1.stl wansti-level2.stl wansti-level3.stl wansti-level4.stl wansti-level5.stl Log Message: changed author field on official levels to "SuperTux Team" author info on official levels is not shown anymore (i felt level designers were getting too much credit that way) Index: bonus-level3.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/bonus-level3.stl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bonus-level3.stl 26 Aug 2004 22:59:22 -0000 1.3 +++ bonus-level3.stl 23 Nov 2004 13:41:13 -0000 1.4 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "A Long Way Home") (width 500) (height 15) Index: wansti-level3.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/wansti-level3.stl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- wansti-level3.stl 16 Aug 2004 23:52:19 -0000 1.4 +++ wansti-level3.stl 23 Nov 2004 13:41:15 -0000 1.5 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "A Maze In The Sky") (width 515) (height 15) Index: wansti-level1.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/wansti-level1.stl,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- wansti-level1.stl 26 Aug 2004 22:59:22 -0000 1.4 +++ wansti-level1.stl 23 Nov 2004 13:41:14 -0000 1.5 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "Semi-Frozen") (width 500) (height 15) Index: wansti-level4.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/wansti-level4.stl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- wansti-level4.stl 16 Aug 2004 23:52:20 -0000 1.2 +++ wansti-level4.stl 23 Nov 2004 13:41:15 -0000 1.3 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "Collapse Imminent!") (width 500) (height 15) Index: bonus-level1.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/bonus-level1.stl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bonus-level1.stl 26 Aug 2004 22:59:22 -0000 1.3 +++ bonus-level1.stl 23 Nov 2004 13:41:12 -0000 1.4 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "Bonus Dias!") (width 300) (height 15) Index: wansti-level2.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/wansti-level2.stl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- wansti-level2.stl 16 Aug 2004 23:52:19 -0000 1.2 +++ wansti-level2.stl 23 Nov 2004 13:41:14 -0000 1.3 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "Cave Of Mirrors") (width 500) (height 15) Index: wansti-level5.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/wansti-level5.stl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- wansti-level5.stl 16 Aug 2004 23:52:20 -0000 1.2 +++ wansti-level5.stl 23 Nov 2004 13:41:15 -0000 1.3 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "Tip Of The Iceberg") (width 550) (height 15) Index: bonus-level2.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/bonus-level2.stl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bonus-level2.stl 26 Aug 2004 22:59:22 -0000 1.3 +++ bonus-level2.stl 23 Nov 2004 13:41:12 -0000 1.4 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "Castle Gate") (width 500) (height 15) Index: bonus-level5.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/bonus-level5.stl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- bonus-level5.stl 16 Aug 2004 23:52:18 -0000 1.2 +++ bonus-level5.stl 23 Nov 2004 13:41:14 -0000 1.3 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "Area 42") (width 1042) (height 15) Index: bonus-level4.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/bonus1/bonus-level4.stl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- bonus-level4.stl 16 Aug 2004 23:52:18 -0000 1.2 +++ bonus-level4.stl 23 Nov 2004 13:41:14 -0000 1.3 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "Bonus Island Castle") (width 500) (height 15) |
Update of /cvsroot/super-tux/supertux/data/levels/world1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14326/data/levels/world1 Modified Files: level1.stl level10.stl level11.stl level12.stl level13.stl level14.stl level15.stl level16.stl level17.stl level18.stl level19.stl level2.stl level20.stl level21.stl level22.stl level23.stl level24.stl level25.stl level26.stl level3.stl level4.stl level6.stl level8.stl level9.stl Log Message: changed author field on official levels to "SuperTux Team" author info on official levels is not shown anymore (i felt level designers were getting too much credit that way) Index: level1.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level1.stl,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- level1.stl 16 Sep 2004 18:59:04 -0000 1.20 +++ level1.stl 23 Nov 2004 13:41:16 -0000 1.21 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "Welcome to Antarctica") (name-pt_PT "Bem-vindo à Antártida") (name-de "Willkommen in Antarctica") Index: level21.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level21.stl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- level21.stl 15 Jul 2004 16:30:47 -0000 1.14 +++ level21.stl 23 Nov 2004 13:41:19 -0000 1.15 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "A Path in the Clouds") (width 525) (height 19) Index: level16.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level16.stl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- level16.stl 15 Jul 2004 19:47:33 -0000 1.15 +++ level16.stl 23 Nov 2004 13:41:18 -0000 1.16 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Ingo Ruhnke") + (author "SuperTux Team") (name "Living in a Fridge") (name-pt_PT "Vivendo numa Frigideira") (name-de "Leben im Kühlschrank") Index: level17.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level17.stl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- level17.stl 15 Jul 2004 19:47:33 -0000 1.15 +++ level17.stl 23 Nov 2004 13:41:18 -0000 1.16 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Ingo Ruhnke") + (author "SuperTux Team") (name "'...or is it just me?'") (name-pt_PT "'... ou é apenas de mim?'") (name-de "'...oder bin ich das?'") Index: level6.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level6.stl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- level6.stl 16 Sep 2004 18:59:05 -0000 1.17 +++ level6.stl 23 Nov 2004 13:41:21 -0000 1.18 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Ingo Ruhnke") + (author "SuperTux Team") (name "The Frosted Fields") (name-pt_PT "Os Campos Congelados") (name-de "Vereiste Felder") Index: level8.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level8.stl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- level8.stl 16 Sep 2004 18:59:06 -0000 1.19 +++ level8.stl 23 Nov 2004 13:41:21 -0000 1.20 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Ingo Ruhnke") + (author "SuperTux Team") (name "Stone Cold") (name-pt_PT "Pedra Gelada") (name-de "Kalt wie Stein") Index: level14.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level14.stl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- level14.stl 15 Jul 2004 19:47:32 -0000 1.19 +++ level14.stl 23 Nov 2004 13:41:17 -0000 1.20 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "Entrance to the Cave") (name-pt_PT "Entrada para a Gruta") (name-de "Eingang der Höhle") Index: level2.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level2.stl,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- level2.stl 16 Sep 2004 18:59:04 -0000 1.18 +++ level2.stl 23 Nov 2004 13:41:19 -0000 1.19 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "The Journey Begins") (name-pt_PT "A Aventura Começa") (name-de "Das Abenteuer beginnt") Index: level10.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level10.stl,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- level10.stl 16 Sep 2004 18:59:03 -0000 1.21 +++ level10.stl 23 Nov 2004 13:41:16 -0000 1.22 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Ingo Ruhnke") + (author "SuperTux Team") (name "23rd Airborne") (name-de "23 Mann Luftverteidigung") (name-es "23º aerotransportado") Index: level12.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level12.stl,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- level12.stl 16 Sep 2004 18:59:03 -0000 1.18 +++ level12.stl 23 Nov 2004 13:41:17 -0000 1.19 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Ingo Ruhnke") + (author "SuperTux Team") (name "Into the Stars") (name-pt_PT "Até às Estrelas") (name-de "Griff nach den Sternen") Index: level23.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level23.stl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- level23.stl 16 Sep 2004 18:59:04 -0000 1.14 +++ level23.stl 23 Nov 2004 13:41:20 -0000 1.15 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "The Escape") (width 515) (height 19) Index: level15.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level15.stl,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- level15.stl 15 Jul 2004 19:47:33 -0000 1.15 +++ level15.stl 23 Nov 2004 13:41:17 -0000 1.16 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Ingo Ruhnke") + (author "SuperTux Team") (name "Under the Ice") (name-pt_PT "Debaixo do Gelo") (name-de "Unter dem Eis") Index: level19.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level19.stl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- level19.stl 15 Jul 2004 16:30:46 -0000 1.16 +++ level19.stl 23 Nov 2004 13:41:19 -0000 1.17 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Ingo Ruhnke") + (author "SuperTux Team") (name "Miyamoto Monument") (width 505) (height 19) Index: level25.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level25.stl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- level25.stl 16 Sep 2004 18:59:04 -0000 1.10 +++ level25.stl 23 Nov 2004 13:41:20 -0000 1.11 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "Arctic Ruins") (width 500) (height 19) Index: level26.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level26.stl,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- level26.stl 14 Sep 2004 19:07:31 -0000 1.14 +++ level26.stl 23 Nov 2004 13:41:20 -0000 1.15 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Ingo Ruhnke") + (author "SuperTux Team") (name "The Castle of Nolok") (width 525) (height 19) Index: level24.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level24.stl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- level24.stl 16 Sep 2004 18:59:04 -0000 1.17 +++ level24.stl 23 Nov 2004 13:41:20 -0000 1.18 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "The Shattered Bridge") (width 525) (height 19) Index: level18.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level18.stl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- level18.stl 15 Jul 2004 19:47:33 -0000 1.16 +++ level18.stl 23 Nov 2004 13:41:18 -0000 1.17 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Ingo Ruhnke") + (author "SuperTux Team") (name "Ice in the Hole") (name-pt_PT "Gelo no Buraco") (name-de "Eisiges Loch") Index: level13.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level13.stl,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- level13.stl 16 Sep 2004 18:59:03 -0000 1.20 +++ level13.stl 23 Nov 2004 13:41:17 -0000 1.21 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Ricardo Cruz") + (author "SuperTux Team") (name "Above the Arctic Skies") (width 290) (height 19) Index: level11.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level11.stl,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- level11.stl 16 Sep 2004 18:59:03 -0000 1.20 +++ level11.stl 23 Nov 2004 13:41:16 -0000 1.21 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Ingo Ruhnke") + (author "SuperTux Team") (name "Night Chill") (name-pt_PT "Noite Fria") (name-de "Eine kalte Nacht") Index: level4.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level4.stl,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- level4.stl 20 Nov 2004 22:14:19 -0000 1.23 +++ level4.stl 23 Nov 2004 13:41:21 -0000 1.24 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Tobias Glaesser") + (author "SuperTux Team") (name "Tobgle Road") (name-pt_PT "A Estrada Tobgle") (name-de "Tobgle Passage") Index: level9.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level9.stl,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- level9.stl 16 Sep 2004 18:59:06 -0000 1.18 +++ level9.stl 23 Nov 2004 13:41:22 -0000 1.19 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Ingo Ruhnke") + (author "SuperTux Team") (name "Grumbel's Sense of Snow") (name-pt_PT "Sensação de Neve do Grumbel") (name-de "Grumbels Gespür für Schnee") Index: level3.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level3.stl,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- level3.stl 16 Sep 2004 18:59:05 -0000 1.19 +++ level3.stl 23 Nov 2004 13:41:20 -0000 1.20 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Bill Kendrick") + (author "SuperTux Team") (name "Via Nostalgica") (width 390) (height 19) Index: level22.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level22.stl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- level22.stl 15 Jul 2004 16:30:47 -0000 1.13 +++ level22.stl 23 Nov 2004 13:41:20 -0000 1.14 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "No more Mr Ice Guy") (width 260) (height 19) Index: level20.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world1/level20.stl,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- level20.stl 15 Jul 2004 16:30:47 -0000 1.13 +++ level20.stl 23 Nov 2004 13:41:19 -0000 1.14 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Ingo Ruhnke") + (author "SuperTux Team") (name "End of the Tunnel") (width 510) (height 19) |
|
From: Marek M. <wa...@us...> - 2004-11-23 13:41:39
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14326/src Modified Files: gameloop.cpp Log Message: changed author field on official levels to "SuperTux Team" author info on official levels is not shown anymore (i felt level designers were getting too much credit that way) Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.196 retrieving revision 1.197 diff -u -d -r1.196 -r1.197 --- gameloop.cpp 23 Nov 2004 02:00:33 -0000 1.196 +++ gameloop.cpp 23 Nov 2004 13:41:23 -0000 1.197 @@ -198,9 +198,10 @@ context.draw_text(white_text, str, Vector(screen->w/2, 210), CENTER_ALLIGN, LAYER_FOREGROUND1); - if(level->get_author().size()) + if((level->get_author().size()) && (level->get_author() != "SuperTux Team")) + //TODO make author check case/blank-insensitive context.draw_text(white_small_text, - std::string(_("by ")) + level->get_author(), + std::string(_("contributed by ")) + level->get_author(), Vector(screen->w/2, 350), CENTER_ALLIGN, LAYER_FOREGROUND1); |
|
From: Marek M. <wa...@us...> - 2004-11-23 13:41:39
|
Update of /cvsroot/super-tux/supertux/data/levels/world2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14326/data/levels/world2 Modified Files: castle.stl forest1-grumbel.stl Log Message: changed author field on official levels to "SuperTux Team" author info on official levels is not shown anymore (i felt level designers were getting too much credit that way) Index: castle.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world2/castle.stl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- castle.stl 31 Jul 2004 22:20:42 -0000 1.1 +++ castle.stl 23 Nov 2004 13:41:22 -0000 1.2 @@ -1,7 +1,7 @@ ;; Generated by Flexlay Editor (supertux-level (version 1) - (author "Marek Moeckel") + (author "SuperTux Team") (name "Iceberg Fortress") (width 550) (height 105) Index: forest1-grumbel.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world2/forest1-grumbel.stl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- forest1-grumbel.stl 23 Nov 2004 10:23:01 -0000 1.2 +++ forest1-grumbel.stl 23 Nov 2004 13:41:23 -0000 1.3 @@ -2,7 +2,7 @@ (supertux-level (version 2) (name "Forest Level 1") - (author "Ingo Ruhnke") + (author "SuperTux Team") (time 999) (sector (name "main") |
|
From: Ingo R. <gr...@us...> - 2004-11-23 11:29:27
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13286 Modified Files: supertux.stgt Added Files: foresttiles-12.png Log Message: - added some more tiles --- NEW FILE: foresttiles-12.png --- (This appears to be a binary file; contents omitted.) Index: supertux.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- supertux.stgt 23 Nov 2004 02:00:30 -0000 1.58 +++ supertux.stgt 23 Nov 2004 11:29:15 -0000 1.59 @@ -72,9 +72,148 @@ (name "Waterfall-edgecloud") (tiles 195 196 197 198 199) ) + (tilegroup (name "forest") - (tiles 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309) + (tiles + 1000 1001 1002 1003 + 1004 1005 1006 1007 + 1008 1009 1010 1011 + 1012 1013 1014 1015 + 1016 1017 1018 1019 + 0 1060 1061 1062 + 1063 1064 1065 1066 + 1067 1068 1069 1070 + 1045 1046 1051 1052 + 1047 1048 1053 1054 + 1049 1050 1055 1056 + 1042 1043 1057 1058 + 1034 1035 1029 1030 + 1041 1040 1031 1032 + 1036 1037 0 1038 + 1020 1021 1022 1044 + 1023 1024 1025 1033 + 1026 1027 1028 1039 + 0 0 1073 1074 + 0 0 1081 1082 + 0 1088 1089 1090 + 1095 1096 1097 1098 + 1103 1104 1105 1106 + 1119 1120 1121 1122 + 1127 1128 1129 1130 + 0 0 1137 1138 + 0 0 1145 1146 + 0 0 1153 1154 + 0 0 1161 1162 + 1075 0 0 0 + 1083 1084 0 0 + 1091 1092 0 0 + 1099 1100 1101 0 + 1107 1108 1109 1110 + 1123 1124 1125 1126 + 1131 1132 1133 1134 + 1139 1140 1141 0 + 1147 1148 0 0 + 1155 1156 0 0 + 1163 1164 0 0 + 0 1168 1169 1170 + 0 1174 1175 1176 + 1179 1180 1181 1182 + 1185 1186 1187 1188 + 1191 1192 1193 1194 + 1197 1198 1199 1200 + 1191 1192 1193 1194 + 1197 1198 1199 1200 + 1203 1204 1205 1206 + 1209 1210 1211 1212 + 1177 0 1219 1220 + 1183 0 1225 1226 + 1189 1190 1217 1218 + 1195 0 1223 1224 + 1201 1190 1229 1230 + 1195 0 1235 1236 + 1201 1202 0 0 + 1207 0 0 0 + 1213 1214 0 0 + 0 1240 1241 1242 + 1243 1244 1245 1246 + 1247 1248 1249 1250 + 1251 1252 1253 1254 + 1255 1256 1257 1258 + 1259 1260 1261 1262 + 1263 1264 1265 1266 + 1267 1268 1269 1270 + 1271 1272 1273 1274 + 1275 1276 1277 1278 + 1279 1280 1281 1282 + 1283 1284 1285 1286 + 1287 1288 1303 1304 + 1289 1290 1305 1306 + 1291 1292 1307 1308 + 1293 1294 1309 1310 + 1295 1296 0 0 + 1297 1298 0 0 + 1299 1300 0 0 + 1301 1302 0 0 +402 +403 +404 +405 +406 +407 +408 +409 +410 +411 +412 +413 +414 +415 +416 +417 +418 +419 +420 +421 +422 +423 +424 +425 +426 +427 +428 +429 +430 +431 +432 +433 +434 +435 +436 +437 +438 +439 +440 +441 +442 +443 +444 +445 +446 +447 +448 +449 +450 +451 +452 +453 +454 +455 +456 +457 + + +) ) (tile (id 0) @@ -2106,6 +2245,233 @@ ) (slope-type 0) ) + +(tile + (id 402) + (images + (region "foresttiles-12.png" 0 0 32 32))) +(tile + (id 403) + (images + (region "foresttiles-12.png" 32 0 32 32))) +(tile + (id 404) + (images + (region "foresttiles-12.png" 64 0 32 32))) +(tile + (id 405) + (images + (region "foresttiles-12.png" 96 0 32 32))) +(tile + (id 406) + (images + (region "foresttiles-12.png" 0 32 32 32))) +(tile + (id 407) + (images + (region "foresttiles-12.png" 32 32 32 32))) +(tile + (id 408) + (images + (region "foresttiles-12.png" 64 32 32 32))) +(tile + (id 409) + (images + (region "foresttiles-12.png" 96 32 32 32))) +(tile + (id 410) + (images + (region "foresttiles-12.png" 0 64 32 32))) +(tile + (id 411) + (images + (region "foresttiles-12.png" 32 64 32 32))) +(tile + (id 412) + (images + (region "foresttiles-12.png" 64 64 32 32))) +(tile + (id 413) + (images + (region "foresttiles-12.png" 96 64 32 32))) +(tile + (id 414) + (images + (region "foresttiles-12.png" 0 96 32 32))) +(tile + (id 415) + (images + (region "foresttiles-12.png" 32 96 32 32))) +(tile + (id 416) + (images + (region "foresttiles-12.png" 64 96 32 32))) +(tile + (id 417) + (images + (region "foresttiles-12.png" 96 96 32 32))) +(tile + (id 418) + (images + (region "foresttiles-12.png" 0 128 32 32))) +(tile + (id 419) + (images + (region "foresttiles-12.png" 32 128 32 32))) +(tile + (id 420) + (images + (region "foresttiles-12.png" 64 128 32 32))) +(tile + (id 421) + (images + (region "foresttiles-12.png" 96 128 32 32))) +(tile + (id 422) + (images + (region "foresttiles-12.png" 0 160 32 32))) +(tile + (id 423) + (images + (region "foresttiles-12.png" 32 160 32 32))) +(tile + (id 424) + (images + (region "foresttiles-12.png" 64 160 32 32))) +(tile + (id 425) + (images + (region "foresttiles-12.png" 96 160 32 32))) + +(tile + (id 426) + (images + (region "foresttiles-12.png" 128 0 32 32))) +(tile + (id 427) + (images + (region "foresttiles-12.png" 160 0 32 32))) +(tile + (id 428) + (images + (region "foresttiles-12.png" 192 0 32 32))) +(tile + (id 429) + (images + (region "foresttiles-12.png" 224 0 32 32))) +(tile + (id 430) + (images + (region "foresttiles-12.png" 128 32 32 32))) +(tile + (id 431) + (images + (region "foresttiles-12.png" 160 32 32 32))) +(tile + (id 432) + (images + (region "foresttiles-12.png" 192 32 32 32))) +(tile + (id 433) + (images + (region "foresttiles-12.png" 224 32 32 32))) +(tile + (id 434) + (images + (region "foresttiles-12.png" 128 64 32 32))) +(tile + (id 435) + (images + (region "foresttiles-12.png" 160 64 32 32))) +(tile + (id 436) + (images + (region "foresttiles-12.png" 192 64 32 32))) +(tile + (id 437) + (images + (region "foresttiles-12.png" 224 64 32 32))) +(tile + (id 438) + (images + (region "foresttiles-12.png" 128 96 32 32))) +(tile + (id 439) + (images + (region "foresttiles-12.png" 160 96 32 32))) +(tile + (id 440) + (images + (region "foresttiles-12.png" 192 96 32 32))) +(tile + (id 441) + (images + (region "foresttiles-12.png" 224 96 32 32))) +(tile + (id 442) + (images + (region "foresttiles-12.png" 128 128 32 32))) +(tile + (id 443) + (images + (region "foresttiles-12.png" 160 128 32 32))) +(tile + (id 444) + (images + (region "foresttiles-12.png" 192 128 32 32))) +(tile + (id 445) + (images + (region "foresttiles-12.png" 224 128 32 32))) +(tile + (id 446) + (images + (region "foresttiles-12.png" 128 160 32 32))) +(tile + (id 447) + (images + (region "foresttiles-12.png" 160 160 32 32))) +(tile + (id 448) + (images + (region "foresttiles-12.png" 192 160 32 32))) +(tile + (id 449) + (images + (region "foresttiles-12.png" 224 160 32 32))) +(tile + (id 450) + (images + (region "foresttiles-12.png" 128 192 32 32))) +(tile + (id 451) + (images + (region "foresttiles-12.png" 160 192 32 32))) +(tile + (id 452) + (images + (region "foresttiles-12.png" 192 192 32 32))) +(tile + (id 453) + (images + (region "foresttiles-12.png" 224 192 32 32))) +(tile + (id 454) + (images + (region "foresttiles-12.png" 128 224 32 32))) +(tile + (id 455) + (images + (region "foresttiles-12.png" 160 224 32 32))) +(tile + (id 456) + (images + (region "foresttiles-12.png" 192 224 32 32))) +(tile + (id 457) + (images + (region "foresttiles-12.png" 224 224 32 32))) + (tile (id 1000) (images |
|
From: Marek M. <wa...@us...> - 2004-11-23 10:23:11
|
Update of /cvsroot/super-tux/supertux/data/levels/world2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27646/data/levels/world2 Modified Files: forest1-grumbel.stl Log Message: added title and music to grumbel's forest level Index: forest1-grumbel.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/world2/forest1-grumbel.stl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- forest1-grumbel.stl 23 Nov 2004 05:50:07 -0000 1.1 +++ forest1-grumbel.stl 23 Nov 2004 10:23:01 -0000 1.2 @@ -1,13 +1,14 @@ ;; Generated by Flexlay Editor (supertux-level (version 2) - (name "No Name") - (author "No Author") + (name "Forest Level 1") + (author "Ingo Ruhnke") (time 999) (sector (name "main") (width 100) (height 50) + (music "forest.mod") (gravity 10.000000) (background (image "arctis.jpg") (speed 0.5)) |
|
From: Matze B. <mat...@us...> - 2004-11-23 02:34:33
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32624/src Modified Files: particlesystem.cpp Log Message: fix particle system speeds Index: particlesystem.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/particlesystem.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- particlesystem.cpp 23 Nov 2004 02:00:51 -0000 1.15 +++ particlesystem.cpp 23 Nov 2004 02:34:16 -0000 1.16 @@ -88,8 +88,9 @@ int snowsize = rand() % 3; particle->texture = snowimages[snowsize]; do { - particle->speed = snowsize/60.0 + (float(rand()%10)/300.0); - } while(particle->speed < 0.01); + particle->speed = snowsize*.2 + (float(rand()%10)*.4); + } while(particle->speed < 1); + particle->speed *= 10; // gravity particles.push_back(particle); } |
|
From: Matze B. <mat...@us...> - 2004-11-23 02:34:32
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32624 Modified Files: TODO Log Message: fix particle system speeds Index: TODO =================================================================== RCS file: /cvsroot/super-tux/supertux/TODO,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- TODO 23 Nov 2004 02:00:28 -0000 1.85 +++ TODO 23 Nov 2004 02:34:16 -0000 1.86 @@ -90,7 +90,7 @@ * what to do when stuck under tiles (after using duck-sliding) * do we want multi hit scores again? * tux doesn't stop at igloo anymore - * background particle systems are too slow + * background particle systems are too slow - ok --Code Refactoring/Cleanup/Optimisation-- [H] make the title using GameSession instead of reimplementing all the stuff |
|
From: Matze B. <mat...@us...> - 2004-11-23 02:01:12
|
Update of /cvsroot/super-tux/supertux/lib/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25154/lib/video Modified Files: drawing_context.cpp drawing_context.h surface.cpp Log Message: fix some more timings and the long standing gradient software bug (which was function argument overriding class field) Index: drawing_context.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/video/drawing_context.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- drawing_context.cpp 20 Nov 2004 22:14:36 -0000 1.10 +++ drawing_context.cpp 23 Nov 2004 02:00:32 -0000 1.11 @@ -31,9 +31,6 @@ DrawingContext::DrawingContext() { - transform.draw_effect = NONE_EFFECT; - transform.zoom = 1; - transform.alpha = 255; } DrawingContext::~DrawingContext() @@ -49,18 +46,17 @@ DrawingRequest request; request.type = SURFACE; - request.layer = layer; - request.request_data = const_cast<Surface*> (surface); request.pos = transform.apply(position); if(request.pos.x >= screen->w || request.pos.y >= screen->h || request.pos.x + surface->w < 0 || request.pos.y + surface->h < 0) return; - - request.drawing_effect = drawing_effect; - request.drawing_effect = transform.draw_effect | drawing_effect; + + request.layer = layer; + request.drawing_effect = transform.drawing_effect | drawing_effect; request.zoom = transform.zoom; request.alpha = transform.alpha; + request.request_data = const_cast<Surface*> (surface); drawingrequests.push_back(request); } @@ -74,9 +70,9 @@ DrawingRequest request; request.type = SURFACE_PART; - request.layer = layer; request.pos = transform.apply(dest); - request.drawing_effect = drawing_effect; + request.layer = layer; + request.drawing_effect = transform.drawing_effect | drawing_effect; request.alpha = transform.alpha; SurfacePartRequest* surfacepartrequest = new SurfacePartRequest(); @@ -96,9 +92,10 @@ DrawingRequest request; request.type = TEXT; - request.layer = layer; request.pos = transform.apply(position); - request.drawing_effect = drawing_effect; + request.layer = layer; + request.drawing_effect = transform.drawing_effect | drawing_effect; + request.zoom = transform.zoom; request.alpha = transform.alpha; TextRequest* textrequest = new TextRequest; @@ -124,8 +121,12 @@ DrawingRequest request; request.type = GRADIENT; - request.layer = layer; request.pos = Vector(0,0); + request.layer = layer; + + request.drawing_effect = transform.drawing_effect; + request.zoom = transform.zoom; + request.alpha = transform.alpha; GradientRequest* gradientrequest = new GradientRequest; gradientrequest->top = top; @@ -142,8 +143,12 @@ DrawingRequest request; request.type = FILLRECT; - request.layer = layer; request.pos = transform.apply(topleft); + request.layer = layer; + + request.drawing_effect = transform.drawing_effect; + request.zoom = transform.zoom; + request.alpha = transform.alpha; FillRectRequest* fillrectrequest = new FillRectRequest; fillrectrequest->size = size; @@ -360,7 +365,7 @@ void DrawingContext::set_drawing_effect(int effect) { - transform.draw_effect = effect; + transform.drawing_effect = effect; } void Index: drawing_context.h =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/video/drawing_context.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- drawing_context.h 24 Sep 2004 18:13:27 -0000 1.10 +++ drawing_context.h 23 Nov 2004 02:00:32 -0000 1.11 @@ -86,9 +86,9 @@ void do_drawing(); const Vector& get_translation() const - { return transform.translation; } + { return transform.translation; } Uint32 get_drawing_effect() const - { return transform.draw_effect; } + { return transform.drawing_effect; } void set_translation(const Vector& newtranslation) { transform.translation = newtranslation; } @@ -105,19 +105,22 @@ private: class Transform - { - public: - Vector translation; // only translation for now... + { + public: + Vector translation; + Uint32 drawing_effect; + float zoom; + int alpha; - Vector apply(const Vector& v) const - { - return v - translation; - } + Transform() + : drawing_effect(NONE_EFFECT), zoom(1), alpha(255) + { } - Uint32 draw_effect; - float zoom; - int alpha; - }; + Vector apply(const Vector& v) const + { + return v - translation; + } + }; /// the transform stack std::vector<Transform> transformstack; @@ -156,14 +159,14 @@ struct DrawingRequest { + RequestType type; + Vector pos; + int layer; Uint32 drawing_effect; float zoom; int alpha; - RequestType type; - Vector pos; - void* request_data; bool operator<(const DrawingRequest& other) const Index: surface.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/video/surface.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- surface.cpp 22 Nov 2004 23:47:49 -0000 1.15 +++ surface.cpp 23 Nov 2004 02:00:32 -0000 1.16 @@ -58,12 +58,14 @@ : type(LOAD), surface(0), file(file_), use_alpha(use_alpha_) {} -SurfaceData::SurfaceData(const std::string& file_, int x_, int y_, int w_, int h_, bool use_alpha_) +SurfaceData::SurfaceData(const std::string& file_, int x_, int y_, + int w_, int h_, bool use_alpha_) : type(LOAD_PART), surface(0), file(file_), use_alpha(use_alpha_), x(x_), y(y_), w(w_), h(h_) {} -SurfaceData::SurfaceData(Color top_gradient_, Color bottom_gradient_, int w_, int h_) +SurfaceData::SurfaceData(Color top_gradient_, Color bottom_gradient_, + int w_, int h_) : type(GRADIENT), surface(0), use_alpha(false), w(w_), h(h_) { top_gradient = top_gradient_; @@ -205,12 +207,12 @@ void Surface::apply_filter(int filter, Color color) { -impl->apply_filter(filter, color); + impl->apply_filter(filter, color); -SurfaceData::Filter apply_filter; -apply_filter.type = filter; -apply_filter.color = color; -data.applied_filters.push_back(apply_filter); + SurfaceData::Filter apply_filter; + apply_filter.type = filter; + apply_filter.color = color; + data.applied_filters.push_back(apply_filter); } Surface::~Surface() @@ -431,22 +433,18 @@ SDL_Surface* sdl_surface_from_gradient(Color top, Color bottom, int w, int h) { - SDL_Surface* sdl_surface; - - sdl_surface = SDL_CreateRGBSurface(screen->flags, w, h, + SDL_Surface* sdl_surface + = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h, screen->format->BitsPerPixel, screen->format->Rmask, screen->format->Gmask, screen->format->Bmask, 0); - if(sdl_surface == NULL) + if(sdl_surface == 0) Termination::abort("Cannot create surface for the gradient", "SURFACE"); - if(top == bottom) - { + if(top == bottom) { SDL_FillRect(sdl_surface, NULL, SDL_MapRGB(sdl_surface->format, top.red, top.green, top.blue)); - } - else - { + } else { float redstep = (float(bottom.red)-float(top.red)) / float(h); float greenstep = (float(bottom.green)-float(top.green)) / float(h); float bluestep = (float(bottom.blue) - float(top.blue)) / float(h); @@ -455,15 +453,14 @@ rect.x = 0; rect.w = w; rect.h = 1; - for(float y = 0; y < h; y++) - { + for(float y = 0; y < h; y++) { rect.y = (int)y; SDL_FillRect(sdl_surface, &rect, SDL_MapRGB(sdl_surface->format, - int(float(top.red) + redstep * y), - int(float(top.green) + greenstep * y), - int(float(top.blue) + bluestep * y))); - } + int(float(top.red) + redstep * y), + int(float(top.green) + greenstep * y), + int(float(top.blue) + bluestep * y))); } + } return sdl_surface; } @@ -516,23 +513,23 @@ h = sdl_surface->h; } -SurfaceOpenGL::SurfaceOpenGL(const std::string& file_, int x_, int y_, int w_, int h_, bool use_alpha_) +SurfaceOpenGL::SurfaceOpenGL(const std::string& file_, int x_, int y_, + int w_, int h_, bool use_alpha_) { sdl_surface = sdl_surface_part_from_file(file_,x_,y_,w_,h_,use_alpha_); create_gl(sdl_surface, &gl_texture); - w = sdl_surface->w; - h = sdl_surface->h; + h = sdl_surface->h; } -SurfaceOpenGL::SurfaceOpenGL(Color top_gradient, Color bottom_gradient, int w, int h) +SurfaceOpenGL::SurfaceOpenGL(Color top_gradient, Color bottom_gradient, + int _w, int _h) { - sdl_surface = sdl_surface_from_gradient(top_gradient, bottom_gradient, w, h); + sdl_surface = sdl_surface_from_gradient(top_gradient, bottom_gradient,_w,_h); create_gl(sdl_surface, &gl_texture); - w = sdl_surface->w; - h = sdl_surface->h; + h = sdl_surface->h; } SurfaceOpenGL::~SurfaceOpenGL() @@ -892,18 +889,20 @@ h = sdl_surface->h; } -SurfaceSDL::SurfaceSDL(const std::string& file, int x, int y, int w, int h, bool use_alpha) +SurfaceSDL::SurfaceSDL(const std::string& file, int x, int y, int _w, int _h, + bool use_alpha) { - sdl_surface = sdl_surface_part_from_file(file, x, y, w, h, use_alpha); + sdl_surface = sdl_surface_part_from_file(file, x, y, _w, _h, use_alpha); w = sdl_surface->w; - h = sdl_surface->h; + h = sdl_surface->h; } -SurfaceSDL::SurfaceSDL(Color top_gradient, Color bottom_gradient, int w, int h) +SurfaceSDL::SurfaceSDL(Color top_gradient, Color bottom_gradient, + int _w, int _h) { - sdl_surface = sdl_surface_from_gradient(top_gradient, bottom_gradient, w, h); + sdl_surface = sdl_surface_from_gradient(top_gradient, bottom_gradient,_w,_h); w = sdl_surface->w; - h = sdl_surface->h; + h = sdl_surface->h; } int |
|
From: Matze B. <mat...@us...> - 2004-11-23 02:01:12
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25154/data/images/tilesets Modified Files: supertux.stgt Log Message: fix some more timings and the long standing gradient software bug (which was function argument overriding class field) Index: supertux.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- supertux.stgt 22 Nov 2004 23:47:38 -0000 1.57 +++ supertux.stgt 23 Nov 2004 02:00:30 -0000 1.58 @@ -232,7 +232,7 @@ (fullbox #t) (next-tile 84) (data 1) - (anim-speed 50) + (anim-fps 2) ) (tile (id 27) @@ -363,6 +363,7 @@ "coin-8.png" ) (distro #t) + (anim-fps 10) ) (tile (id 47) @@ -575,6 +576,7 @@ "waves-2.png" ) (water #t) + (anim-fps 10) ) (tile (id 77) @@ -610,6 +612,7 @@ "flag-0.png" "flag-1.png" ) + (anim-fps 10) ) (tile (id 82) @@ -620,6 +623,7 @@ "coin2.png" ) (distro #t) + (anim-fps 10) ) (tile (id 83) @@ -640,7 +644,7 @@ (fullbox #t) (next-tile 84) (data 1) - (anim-speed 50) + (anim-fps 2) ) (tile (id 84) @@ -771,7 +775,7 @@ (next-tile 84) (editor-images "bonus-fireflower.png") (data 2) - (anim-speed 50) + (anim-fps 2) ) (tile (id 103) @@ -793,7 +797,7 @@ (next-tile 84) (editor-images "bonus-herring.png") (data 3) - (anim-speed 50) + (anim-fps 2) ) (tile (id 104) @@ -979,7 +983,7 @@ (next-tile 84) (editor-images "bonus-1up.png") (data 4) - (anim-speed 50) + (anim-fps 2) ) (tile (id 129) @@ -997,6 +1001,7 @@ "goal1-1.png" "goal1-1.png" ) + (anim-fps 10) ) (tile (id 130) @@ -1014,6 +1019,7 @@ "goal2-1.png" "goal2-1.png" ) + (anim-fps 10) ) (tile (id 131) @@ -1088,7 +1094,7 @@ (next-tile 84) (editor-images "bonus-iceflower.png") (data 5) - (anim-speed 50) + (anim-fps 2) ) (tile (id 141) @@ -1151,6 +1157,7 @@ "lava1-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 174) @@ -1161,6 +1168,7 @@ "lava2-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 175) @@ -1171,6 +1179,7 @@ "waterfall-trans1-1-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 176) @@ -1181,6 +1190,7 @@ "waterfall-trans1-2-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 177) @@ -1191,6 +1201,7 @@ "waterfall-trans1-3-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 178) @@ -1201,6 +1212,7 @@ "waterfall-trans1-4-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 179) @@ -1211,6 +1223,7 @@ "waterfall-trans2-1-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 180) @@ -1221,6 +1234,7 @@ "waterfall-trans2-2-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 181) @@ -1231,6 +1245,7 @@ "waterfall-trans2-3-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 182) @@ -1241,6 +1256,7 @@ "waterfall-trans2-4-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 183) @@ -1251,6 +1267,7 @@ "waterfall-trans3-1-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 184) @@ -1261,6 +1278,7 @@ "waterfall-trans3-2-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 185) @@ -1271,6 +1289,7 @@ "waterfall-trans3-3-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 186) @@ -1281,6 +1300,7 @@ "waterfall-trans3-4-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 187) @@ -1291,6 +1311,7 @@ "waterfall-trans4-1-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 188) @@ -1301,6 +1322,7 @@ "waterfall-trans4-2-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 189) @@ -1311,6 +1333,7 @@ "waterfall-trans4-3-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 190) @@ -1321,6 +1344,7 @@ "waterfall-trans4-4-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 191) @@ -1331,6 +1355,7 @@ "waterfall-trans5-1-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 192) @@ -1341,6 +1366,7 @@ "waterfall-trans5-2-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 193) @@ -1351,6 +1377,7 @@ "waterfall-trans5-3-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 194) @@ -1361,6 +1388,7 @@ "waterfall-trans5-4-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 195) @@ -1371,6 +1399,7 @@ "waterfall1-0-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 196) @@ -1381,6 +1410,7 @@ "waterfall1-5-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 197) @@ -1391,6 +1421,7 @@ "waterfall0-0-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 198) @@ -1401,6 +1432,7 @@ "waterfall0-1-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 199) @@ -1411,6 +1443,7 @@ "waterfall0-2-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 200) @@ -1427,6 +1460,7 @@ "waves-trans-2.png" ) (water #t) + (anim-fps 10) ) (tile (id 202) @@ -1520,6 +1554,7 @@ "waterfall1-1-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 276) @@ -1530,6 +1565,7 @@ "waterfall1-2-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 277) @@ -1540,6 +1576,7 @@ "waterfall1-3-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 278) @@ -1550,6 +1587,7 @@ "waterfall1-4-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 279) @@ -1560,6 +1598,7 @@ "waterfall2-1-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 280) @@ -1570,6 +1609,7 @@ "waterfall2-2-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 281) @@ -1580,6 +1620,7 @@ "waterfall2-3-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 282) @@ -1590,6 +1631,7 @@ "waterfall2-4-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 283) @@ -1600,6 +1642,7 @@ "waterfall3-1-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 284) @@ -1610,6 +1653,7 @@ "waterfall3-2-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 285) @@ -1620,6 +1664,7 @@ "waterfall3-3-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 286) @@ -1630,6 +1675,7 @@ "waterfall3-4-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 287) @@ -1640,6 +1686,7 @@ "waterfall4-1-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 288) @@ -1650,6 +1697,7 @@ "waterfall4-2-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 289) @@ -1660,6 +1708,7 @@ "waterfall4-3-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 290) @@ -1670,6 +1719,7 @@ "waterfall4-4-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 291) @@ -1680,6 +1730,7 @@ "waterfall5-1-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 292) @@ -1690,6 +1741,7 @@ "waterfall5-2-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 293) @@ -1700,6 +1752,7 @@ "waterfall5-3-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 294) @@ -1710,6 +1763,7 @@ "waterfall5-4-4.png" ) (water #t) + (anim-fps 10) ) (tile (id 295) @@ -1830,6 +1884,7 @@ "jungle12-2.png" ) (solid #t) + (anim-fps 10) ) (tile (id 313) @@ -2380,6 +2435,7 @@ ) (solid #t) (slope-type 2) + (data 2) ) (tile (id 1048) |
|
From: Matze B. <mat...@us...> - 2004-11-23 02:01:12
|
Update of /cvsroot/super-tux/supertux/contrib/tilemanager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25154/contrib/tilemanager Modified Files: Application.cs Parser.cs Tile.cs tiler.glade Log Message: fix some more timings and the long standing gradient software bug (which was function argument overriding class field) Index: Application.cs =================================================================== RCS file: /cvsroot/super-tux/supertux/contrib/tilemanager/Application.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Application.cs 22 Nov 2004 17:51:50 -0000 1.4 +++ Application.cs 23 Nov 2004 02:00:29 -0000 1.5 @@ -26,7 +26,7 @@ [Glade.Widget] private Gtk.Entry DataEntry; [Glade.Widget] - private Gtk.Entry AnimSpeedEntry; + private Gtk.Entry AnimFpsEntry; [Glade.Widget] private Gtk.Entry IDEntry; [Glade.Widget] @@ -342,8 +342,8 @@ tile.ID = Int32.Parse(IDEntry.Text); if(sender == DataEntry) tile.Data = Int32.Parse(DataEntry.Text); - if(sender == AnimSpeedEntry) - tile.AnimSpeed = Int32.Parse(AnimSpeedEntry.Text); + if(sender == AnimFpsEntry) + tile.AnimFps = Single.Parse(AnimFpsEntry.Text); } catch(Exception exception) { // ignore parse errors for now... } @@ -380,7 +380,7 @@ SlopeCheckButton.Active = tile.Slope; DontUseCheckButton.Active = tile.ID == -1; DataEntry.Text = tile.Data.ToString(); - AnimSpeedEntry.Text = tile.AnimSpeed.ToString(); + AnimFpsEntry.Text = tile.AnimFps.ToString(); IDEntry.Text = tile.ID.ToString(); IDEntry.Editable = true; first = false; Index: Parser.cs =================================================================== RCS file: /cvsroot/super-tux/supertux/contrib/tilemanager/Parser.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Parser.cs 22 Nov 2004 01:49:43 -0000 1.1 +++ Parser.cs 23 Nov 2004 02:00:29 -0000 1.2 @@ -85,6 +85,9 @@ public bool BoolValue { get { return StringValue == "t" ? true : false; } } + public float FloatValue { + get { return Single.Parse(lexer.TokenString); } + } } } Index: Tile.cs =================================================================== RCS file: /cvsroot/super-tux/supertux/contrib/tilemanager/Tile.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Tile.cs 22 Nov 2004 02:09:52 -0000 1.3 +++ Tile.cs 23 Nov 2004 02:00:29 -0000 1.4 @@ -23,14 +23,14 @@ public bool Goal; public int NextTile; public int Data; - public int AnimSpeed; + public float AnimFps; public string EditorImage; public ArrayList Images = new ArrayList(); public Tile() { ID = -1; NextTile = -1; - AnimSpeed = 25; + AnimFps = 1; } public void Write(LispWriter writer) { @@ -82,8 +82,11 @@ writer.Write("editor-images", EditorImage); if(Data != 0) writer.Write("data", Data); - if(AnimSpeed != 25) - writer.Write("anim-speed", AnimSpeed); + if(Images.Count > 1) { + if(AnimFps == 1.0) + AnimFps = 40; + writer.Write("anim-fps", AnimFps); + } writer.EndList("tile"); } @@ -121,8 +124,8 @@ Slope = true; Data = parser.IntegerValue; break; - case "anim-speed": - AnimSpeed = parser.IntegerValue; + case "anim-fps": + AnimFps = parser.FloatValue; break; case "spike": Spike = parser.BoolValue; Index: tiler.glade =================================================================== RCS file: /cvsroot/super-tux/supertux/contrib/tilemanager/tiler.glade,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- tiler.glade 22 Nov 2004 01:49:43 -0000 1.1 +++ tiler.glade 23 Nov 2004 02:00:29 -0000 1.2 @@ -471,7 +471,7 @@ <child> <widget class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="label" translatable="yes">AnimSpeed:</property> + <property name="label" translatable="yes">AnimFPS:</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -493,7 +493,7 @@ </child> <child> - <widget class="GtkEntry" id="AnimSpeedEntry"> + <widget class="GtkEntry" id="AnimFpsEntry"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="editable">True</property> |
|
From: Matze B. <mat...@us...> - 2004-11-23 02:01:11
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25154/data/images Modified Files: supertux.strf Log Message: fix some more timings and the long standing gradient software bug (which was function argument overriding class field) Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- supertux.strf 22 Nov 2004 23:47:37 -0000 1.23 +++ supertux.strf 23 Nov 2004 02:00:29 -0000 1.24 @@ -1206,12 +1206,19 @@ (sprite (name "bonusblock") (action + (fps 15) (name "default") (images "tilesets/bonus2-1.png" "tilesets/bonus2-2.png" "tilesets/bonus2-3.png" "tilesets/bonus2-4.png" - "tilesets/bonus2-5.png")) + "tilesets/bonus2-5.png" + "tilesets/bonus2-3.png" + "tilesets/bonus2-2.png" + "tilesets/bonus2-1.png" + "tilesets/bonus2-1.png" + "tilesets/bonus2-1.png" + )) (action (name "empty") (images "tilesets/bonus2-d.png")) |
|
From: Matze B. <mat...@us...> - 2004-11-23 02:01:10
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25154 Modified Files: TODO Log Message: fix some more timings and the long standing gradient software bug (which was function argument overriding class field) Index: TODO =================================================================== RCS file: /cvsroot/super-tux/supertux/TODO,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- TODO 22 Nov 2004 23:47:37 -0000 1.84 +++ TODO 23 Nov 2004 02:00:28 -0000 1.85 @@ -90,6 +90,7 @@ * what to do when stuck under tiles (after using duck-sliding) * do we want multi hit scores again? * tux doesn't stop at igloo anymore + * background particle systems are too slow --Code Refactoring/Cleanup/Optimisation-- [H] make the title using GameSession instead of reimplementing all the stuff @@ -149,9 +150,6 @@ - New forest tileset - Badguy sprites - Tux's buttjump animation -[H] Background code have the following bugs: - - Gradient in software rendering doesn't currently work (at least here). - Matze: can you give more details? The code looks perfectly fine to me [M] Save score on per-level basis to make high-score [M] Save time on per-level basis to make low-time-score |
|
From: Matze B. <mat...@us...> - 2004-11-23 02:01:06
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25154/src Modified Files: Makefile.am gameloop.cpp gameloop.h leveleditor.cpp leveleditor.h particlesystem.cpp player.cpp scene.h tile.cpp tile.h title.cpp worldmap.cpp worldmap.h Log Message: fix some more timings and the long standing gradient software bug (which was function argument overriding class field) Index: tile.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- tile.h 20 Nov 2004 22:14:39 -0000 1.33 +++ tile.h 23 Nov 2004 02:00:51 -0000 1.34 @@ -85,7 +85,7 @@ been collected or jumped at */ int next_tile; - int anim_speed; + float anim_fps; /** Draw a tile on the screen */ void draw(DrawingContext& context, const Vector& pos, int layer) const; Index: particlesystem.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/particlesystem.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- particlesystem.cpp 20 Nov 2004 22:14:38 -0000 1.14 +++ particlesystem.cpp 23 Nov 2004 02:00:51 -0000 1.15 @@ -140,7 +140,7 @@ particle->pos.x = rand() % int(virtual_width); particle->pos.y = rand() % int(virtual_height); particle->texture = cloudimage; - particle->speed = -float(250 + rand() % 200) / 1000.0; + particle->speed = -float(25 + rand() % 30); particles.push_back(particle); } Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.132 retrieving revision 1.133 diff -u -d -r1.132 -r1.133 --- worldmap.cpp 21 Nov 2004 03:21:25 -0000 1.132 +++ worldmap.cpp 23 Nov 2004 02:00:51 -0000 1.133 @@ -179,8 +179,8 @@ tile->images.push_back(image); } - tile->anim_speed = 25; - reader.read_int("anim-speed", tile->anim_speed); + tile->anim_fps = 1; + reader.read_float("anim-fps", tile->anim_fps); if (id >= int(tiles.size())) @@ -454,8 +454,7 @@ if(images.size() > 1) { - size_t frame - = ((global_frame_counter*25) / anim_speed) % images.size(); + size_t frame = size_t(global_time * anim_fps) % images.size(); context.draw_surface(images[frame], pos, LAYER_TILES); } @@ -490,8 +489,6 @@ name = "<no title>"; music = "salcon.mod"; - global_frame_counter = 0; - total_stats.reset(); } @@ -831,10 +828,6 @@ void WorldMap::update(float delta) { - if(!frame_timer.check()) { - global_frame_counter++; - } - if (enter_level && !tux->is_moving()) { /* Check special tile action */ @@ -1184,7 +1177,6 @@ frame_rate.set_frame_limit(false); frame_rate.start(); - frame_timer.start(.25, true); DrawingContext context; while(!quit) Index: scene.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/scene.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- scene.h 20 Nov 2004 22:14:39 -0000 1.36 +++ scene.h 23 Nov 2004 02:00:51 -0000 1.37 @@ -47,6 +47,4 @@ extern PlayerStatus player_status; -extern unsigned int global_frame_counter; - #endif /*SUPERTUX_SCENE_H*/ Index: worldmap.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- worldmap.h 20 Nov 2004 22:14:39 -0000 1.49 +++ worldmap.h 23 Nov 2004 02:00:52 -0000 1.50 @@ -60,7 +60,7 @@ void draw(DrawingContext& context, Vector pos); std::vector<Surface*> images; - int anim_speed; + float anim_fps; // Directions in which Tux is allowed to walk from this tile bool north; @@ -248,8 +248,6 @@ Statistics total_stats; void calculate_total_stats(); - Timer2 frame_timer; - public: WorldMap(); ~WorldMap(); Index: gameloop.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v retrieving revision 1.195 retrieving revision 1.196 diff -u -d -r1.195 -r1.196 --- gameloop.cpp 20 Nov 2004 22:38:35 -0000 1.195 +++ gameloop.cpp 23 Nov 2004 02:00:33 -0000 1.196 @@ -88,7 +88,6 @@ { current_ = this; - global_frame_counter = 0; game_pause = false; fps_fps = 0; @@ -718,7 +717,6 @@ Uint32 lastticks = SDL_GetTicks(); fps_ticks = SDL_GetTicks(); - frame_timer.start(.025, true); while (exit_status == ES_NONE) { Uint32 ticks = SDL_GetTicks(); float elapsed_time = float(ticks - lastticks) / 1000.; @@ -728,10 +726,6 @@ if(elapsed_time > .05) elapsed_time = .05; - if(frame_timer.check()) { - ++global_frame_counter; - } - /* Handle events: */ currentsector->player->input.old_fire = currentsector->player->input.fire; currentsector->player->input.old_up = currentsector->player->input.old_up; @@ -857,7 +851,7 @@ context.draw_text(white_text, _("TIME's UP"), Vector(screen->w/2, 0), CENTER_ALLIGN, LAYER_FOREGROUND1); } else if (time_left.get_timeleft() > TIME_WARNING - || (global_frame_counter % 10) < 5) { + || int(global_time * 2.5) % 2) { sprintf(str, " %d", int(time_left.get_timeleft())); context.draw_text(white_text, _("TIME"), Vector(screen->w/2, 0), CENTER_ALLIGN, LAYER_FOREGROUND1); Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.199 retrieving revision 1.200 diff -u -d -r1.199 -r1.200 --- player.cpp 22 Nov 2004 21:35:04 -0000 1.199 +++ player.cpp 23 Nov 2004 02:00:51 -0000 1.200 @@ -846,7 +846,7 @@ get_pos(), layer); } } - else if (safe_timer.started() && global_frame_counter%2) + else if (safe_timer.started() && size_t(global_time*40)%2) ; // don't draw Tux else tux_body->draw(context, get_pos(), layer); @@ -854,7 +854,7 @@ // Draw blinking star overlay if (invincible_timer.started() && (invincible_timer.get_timeleft() > TUX_INVINCIBLE_TIME_WARNING - || global_frame_counter % 3) + || size_t(global_time*20)%2) && !dying) { if (size == SMALL || duck) Index: Makefile.am =================================================================== RCS file: /cvsroot/super-tux/supertux/src/Makefile.am,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- Makefile.am 20 Nov 2004 22:38:35 -0000 1.45 +++ Makefile.am 23 Nov 2004 02:00:32 -0000 1.46 @@ -27,6 +27,7 @@ object/oneup.h object/oneup.cpp \ object/flower.h object/flower.cpp \ object/growup.h object/growup.cpp \ + object/invisible_block.h object/invisible_block.cpp \ badguy/badguy.h badguy/badguy.cpp \ badguy/bomb.h badguy/bomb.cpp \ badguy/bouncing_snowball.h badguy/bouncing_snowball.cpp\ Index: leveleditor.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v retrieving revision 1.167 retrieving revision 1.168 diff -u -d -r1.167 -r1.168 --- leveleditor.cpp 20 Nov 2004 22:38:35 -0000 1.167 +++ leveleditor.cpp 23 Nov 2004 02:00:33 -0000 1.168 @@ -44,7 +44,6 @@ show_grid = true; selection.clear(); - global_frame_counter = 0; selection_end = selection_ini = Vector(0,0); left_button = middle_button = mouse_moved = false; level = 0; @@ -232,7 +231,6 @@ mouse_cursor->set_state(MC_NORMAL); -frame_timer.start(.25, true); done = false; while(!done) { @@ -534,10 +532,6 @@ if(sector) { - if(frame_timer.check()) { - ++global_frame_counter; - } - // don't scroll before the start or after the level's end float width = sector->solids->get_width() * 32; float height = sector->solids->get_height() * 32; Index: gameloop.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/gameloop.h,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- gameloop.h 20 Nov 2004 22:14:38 -0000 1.63 +++ gameloop.h 23 Nov 2004 02:00:33 -0000 1.64 @@ -57,7 +57,6 @@ { private: Uint32 fps_ticks; - Timer2 frame_timer; Timer2 endsequence_timer; Level* level; Sector* currentsector; Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.131 retrieving revision 1.132 diff -u -d -r1.131 -r1.132 --- title.cpp 21 Nov 2004 00:49:30 -0000 1.131 +++ title.cpp 23 Nov 2004 02:00:51 -0000 1.132 @@ -279,7 +279,6 @@ world->play_music(LEVEL_MUSIC); - global_frame_counter++; tux->key_event((SDLKey) keymap.right,DOWN); if(random_timer.check()) { Index: tile.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/tile.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- tile.cpp 22 Nov 2004 17:51:50 -0000 1.39 +++ tile.cpp 23 Nov 2004 02:00:51 -0000 1.40 @@ -100,7 +100,7 @@ } Tile::Tile() - : id(0), attributes(0), data(0), next_tile(0), anim_speed(25) + : id(0), attributes(0), data(0), next_tile(0), anim_fps(1) { } @@ -146,7 +146,7 @@ attributes |= GOAL; reader.read_int("data", data); - reader.read_int("anim-speed", anim_speed); + reader.read_float("anim-fps", anim_fps); reader.read_int("next-tile", next_tile); if(reader.read_int("slope-type", data)) { @@ -161,7 +161,7 @@ Tile::draw(DrawingContext& context, const Vector& pos, int layer) const { if(images.size() > 1) { - size_t frame = ((global_frame_counter*25) / anim_speed) % images.size(); + size_t frame = size_t(global_time * anim_fps) % images.size(); context.draw_surface(images[frame], pos, layer); } else if (images.size() == 1) { context.draw_surface(images[0], pos, layer); Index: leveleditor.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/leveleditor.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- leveleditor.h 20 Nov 2004 22:14:38 -0000 1.22 +++ leveleditor.h 23 Nov 2004 02:00:51 -0000 1.23 @@ -129,7 +129,6 @@ float zoom; SDL_Event event; - Timer2 frame_timer; Timer2 level_name_timer; Surface *img_background_bt, *img_foreground_bt, *img_interactive_bt; |
248 messages has been excluded from this view by a project administrator.
