super-tux-commit Mailing List for Super Tux (Page 40)
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: Marek M. <wa...@us...> - 2004-08-11 00:53:39
|
Update of /cvsroot/super-tux/supertux/data/images/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7955/data/images/worldmap Modified Files: Tag: supertux_0_1_1_branch antarctica.stwt road_e.png Added Files: Tag: supertux_0_1_1_branch road_end.png road_n.png road_s.png road_w.png Log Message: completely redesigned Bonus Island world map using teleporters (levels are still missing) --- NEW FILE: road_n.png --- (This appears to be a binary file; contents omitted.) Index: road_e.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/worldmap/road_e.png,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -d -r1.1 -r1.1.2.1 Binary files /tmp/cvsgtiOn7 and /tmp/cvsuzeSC3 differ --- NEW FILE: road_w.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: road_end.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: road_s.png --- (This appears to be a binary file; contents omitted.) Index: antarctica.stwt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/worldmap/antarctica.stwt,v retrieving revision 1.7.2.5 retrieving revision 1.7.2.6 diff -u -d -r1.7.2.5 -r1.7.2.6 --- antarctica.stwt 31 Jul 2004 10:30:29 -0000 1.7.2.5 +++ antarctica.stwt 11 Aug 2004 00:53:22 -0000 1.7.2.6 @@ -33,7 +33,7 @@ (east #t) (stop #t)) (tile (id 5) - (image "road_e.png") + (image "road_end.png") (north #f) (south #f) (west #f) @@ -283,37 +283,37 @@ (west #f) (east #f)) - ;; SECRET PATHS, derived from tiles 44,18,9,16,19 + ;; Secret paths (tile (id 61) - (image "road_new.png") + (image "road_nws.png") (north #t) (south #t) (west #t) (east #t)) (tile (id 62) - (image "snow8.png") + (image "snow5.png") (stop #f) - (north #t) - (south #t) - (west #f) - (east #f)) + (north #f) + (south #f) + (west #t) + (east #t)) (tile (id 63) (image "water.png") (stop #f) - (north #t) - (south #t) - (west #f) - (east #f)) + (north #f) + (south #f) + (west #t) + (east #t)) (tile (id 64) - (image "snow6.png") + (image "snow7.png") (stop #f) - (north #t) - (south #t) - (west #f) - (east #f)) + (north #f) + (south #f) + (west #t) + (east #t)) ;;one-way vertical road (tile (id 65) @@ -335,15 +335,47 @@ (stop #f) (one-way "west-east")) + ;; Another invisible road (tile (id 67) (image "snow9.png") - (stop #f) + (stop #t) + (north #f) + (south #f) + (west #t) + (east #f)) + + ;; End of the line + (tile (id 68) + (image "road_n.png") + (stop #t) (north #t) (south #f) (west #f) (east #f)) - - + + (tile (id 69) + (image "road_e.png") + (stop #t) + (north #f) + (south #f) + (west #f) + (east #t)) + + (tile (id 70) + (image "road_s.png") + (stop #t) + (north #f) + (south #t) + (west #f) + (east #f)) + + (tile (id 71) + (image "road_w.png") + (stop #t) + (north #f) + (south #f) + (west #t) + (east #f)) ) |
|
From: Ricardo C. <rm...@us...> - 2004-08-10 22:56:43
|
Update of /cvsroot/super-tux/supertux/data/levels/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20471/data/levels/default Modified Files: Tag: supertux_0_1_1_branch bonusisland.stwm Log Message: Removed (teleporter #t). Not needed, Index: bonusisland.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/default/Attic/bonusisland.stwm,v retrieving revision 1.1.2.19 retrieving revision 1.1.2.20 diff -u -d -r1.1.2.19 -r1.1.2.20 --- bonusisland.stwm 10 Aug 2004 21:31:56 -0000 1.1.2.19 +++ bonusisland.stwm 10 Aug 2004 22:56:34 -0000 1.1.2.20 @@ -155,13 +155,13 @@ (level (map-message "- Something is blocking the way.") (x 34) (y 4) (apply-action-left #f) (passive-message #f)) - (level (teleporter #t) + (level (x 35) (y 3) (teleport-message "Warp to Castle") (dest_x 35) (dest_y 36)) - (level (teleporter #t) + (level (x 18) (y 31) (teleport-message "Warp home") |
|
From: Ricardo C. <rm...@us...> - 2004-08-10 22:50:50
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19700/src Modified Files: Tag: supertux_0_1_1_branch sound.cpp sound.h worldmap.cpp worldmap.h Log Message: Added warp sound and removed necessity of the boolean. Marek, should the teleport messages be shown for a period of time, like the passive ones, or what? Index: sound.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/Attic/sound.cpp,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -u -d -r1.15 -r1.15.2.1 --- sound.cpp 26 Apr 2004 12:21:22 -0000 1.15 +++ sound.cpp 10 Aug 2004 22:50:39 -0000 1.15.2.1 @@ -47,7 +47,8 @@ "/sounds/lifeup.wav", "/sounds/stomp.wav", "/sounds/kick.wav", - "/sounds/explode.wav" + "/sounds/explode.wav", + "/sounds/warp.wav" }; Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.68.2.13 retrieving revision 1.68.2.14 diff -u -d -r1.68.2.13 -r1.68.2.14 --- worldmap.cpp 10 Aug 2004 21:18:11 -0000 1.68.2.13 +++ worldmap.cpp 10 Aug 2004 22:50:39 -0000 1.68.2.14 @@ -312,7 +312,7 @@ } Tile* cur_tile = worldmap->at(tile_pos); - if (cur_tile->stop || (level && !level->name.empty()) || (level && level->is_teleporter)) + if (cur_tile->stop || (level && (!level->name.empty() || level->teleport_dest_x != -1))) { stop(); } @@ -474,10 +474,9 @@ level.passive_message = true; reader.read_bool("passive-message", &level.passive_message); - level.is_teleporter = false; - reader.read_bool("teleporter", &level.is_teleporter); - reader.read_int("dest_x", &level.destination_x); - reader.read_int("dest_y", &level.destination_y); + level.teleport_dest_x = level.teleport_dest_y = -1; + reader.read_int("dest_x", &level.teleport_dest_x); + reader.read_int("dest_y", &level.teleport_dest_y); reader.read_string("teleport-message", &level.teleport_message); level.apply_action_north = level.apply_action_south = @@ -793,14 +792,13 @@ return; } } - else if (level && level->is_teleporter) { + else if (level && level->teleport_dest_x != -1 && level->teleport_dest_y != -1) { if (level->x == tux->get_tile_pos().x && level->y == tux->get_tile_pos().y) - { - Point p; - p.x = level->destination_x; - p.y = level->destination_y; - tux->set_tile_pos(p); + { + play_sound(sounds[SND_TELEPORT], SOUND_CENTER_SPEAKER); + tux->back_direction = D_NONE; + tux->set_tile_pos(Point(level->teleport_dest_x, level->teleport_dest_y)); } } else @@ -877,7 +875,7 @@ for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) { if(i->name.empty()) { - if (i->is_teleporter) { + if (i->teleport_dest_x != -1) { leveldot_teleporter->draw(i->x*32 + offset.x, i->y*32 + offset.y); } @@ -932,7 +930,7 @@ { white_text->draw_align(i->title.c_str(), screen->w/2, screen->h, A_HMIDDLE, A_BOTTOM); } - else if (i->is_teleporter) { + else if (i->teleport_dest_x != -1) { if(!i->teleport_message.empty()) gold_text->draw_align(i->teleport_message.c_str(), screen->w/2, screen->h, A_HMIDDLE, A_BOTTOM); } Index: sound.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/Attic/sound.h,v retrieving revision 1.28 retrieving revision 1.28.2.1 diff -u -d -r1.28 -r1.28.2.1 --- sound.h 26 Apr 2004 12:21:22 -0000 1.28 +++ sound.h 10 Aug 2004 22:50:39 -0000 1.28.2.1 @@ -65,6 +65,7 @@ SND_STOMP, SND_KICK, SND_EXPLODE, + SND_TELEPORT, NUM_SOUNDS }; Index: worldmap.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v retrieving revision 1.28.2.11 retrieving revision 1.28.2.12 diff -u -d -r1.28.2.11 -r1.28.2.12 --- worldmap.h 10 Aug 2004 21:18:11 -0000 1.28.2.11 +++ worldmap.h 10 Aug 2004 22:50:39 -0000 1.28.2.12 @@ -178,9 +178,8 @@ bool passive_message; /** Teleporters */ - bool is_teleporter; - int destination_x; - int destination_y; + int teleport_dest_x; + int teleport_dest_y; std::string teleport_message; /** If false, disables the auto walking after finishing a level */ |
|
From: Ricardo C. <rm...@us...> - 2004-08-10 22:49:05
|
Update of /cvsroot/super-tux/supertux/data/images/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19409/data/images/worldmap Removed Files: Tag: supertux_0_1_1_branch warpdot.png Log Message: I was gonna implement warping. Looks like Marek was faster. ;) Removed my warpdot image. --- warpdot.png DELETED --- |
|
From: Ricardo C. <rm...@us...> - 2004-08-10 22:27:30
|
Update of /cvsroot/super-tux/supertux/data/sounds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15231/data/sounds Added Files: Tag: supertux_0_1_1_branch warp.wav Log Message: Added a warp world map dot image and sound effect. --- NEW FILE: warp.wav --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-08-10 22:27:28
|
Update of /cvsroot/super-tux/supertux/data/images/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15231/data/images/worldmap Added Files: Tag: supertux_0_1_1_branch warpdot.png Log Message: Added a warp world map dot image and sound effect. --- NEW FILE: warpdot.png --- (This appears to be a binary file; contents omitted.) |
|
From: Marek M. <wa...@us...> - 2004-08-10 21:32:09
|
Update of /cvsroot/super-tux/supertux/data/levels/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4806/data/levels/default Modified Files: Tag: supertux_0_1_1_branch bonusisland.stwm Log Message: just added a second teleporter to the world map Index: bonusisland.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/default/Attic/bonusisland.stwm,v retrieving revision 1.1.2.18 retrieving revision 1.1.2.19 diff -u -d -r1.1.2.18 -r1.1.2.19 --- bonusisland.stwm 10 Aug 2004 21:18:11 -0000 1.1.2.18 +++ bonusisland.stwm 10 Aug 2004 21:31:56 -0000 1.1.2.19 @@ -160,7 +160,13 @@ (y 3) (teleport-message "Warp to Castle") (dest_x 35) - (dest_y 30)) + (dest_y 36)) + (level (teleporter #t) + (x 18) + (y 31) + (teleport-message "Warp home") + (dest_x 35) + (dest_y 2)) ) ) |
|
From: Marek M. <wa...@us...> - 2004-08-10 21:18:28
|
Update of /cvsroot/super-tux/supertux/data/levels/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2204/data/levels/default Modified Files: Tag: supertux_0_1_1_branch bonusisland.stwm Log Message: hacked in a very simple but working teleporter, "That's-really-all-I'm-asking-for-edition" :-) anyone who is more into the code than i am, please revise! Index: bonusisland.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/default/Attic/bonusisland.stwm,v retrieving revision 1.1.2.17 retrieving revision 1.1.2.18 diff -u -d -r1.1.2.17 -r1.1.2.18 --- bonusisland.stwm 10 Aug 2004 16:18:08 -0000 1.1.2.17 +++ bonusisland.stwm 10 Aug 2004 21:18:11 -0000 1.1.2.18 @@ -155,7 +155,12 @@ (level (map-message "- Something is blocking the way.") (x 34) (y 4) (apply-action-left #f) (passive-message #f)) - + (level (teleporter #t) + (x 35) + (y 3) + (teleport-message "Warp to Castle") + (dest_x 35) + (dest_y 30)) ) ) |
|
From: Marek M. <wa...@us...> - 2004-08-10 21:18:28
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2204/src Modified Files: Tag: supertux_0_1_1_branch worldmap.cpp worldmap.h Log Message: hacked in a very simple but working teleporter, "That's-really-all-I'm-asking-for-edition" :-) anyone who is more into the code than i am, please revise! Index: worldmap.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v retrieving revision 1.68.2.12 retrieving revision 1.68.2.13 diff -u -d -r1.68.2.12 -r1.68.2.13 --- worldmap.cpp 31 Jul 2004 10:39:50 -0000 1.68.2.12 +++ worldmap.cpp 10 Aug 2004 21:18:11 -0000 1.68.2.13 @@ -312,7 +312,7 @@ } Tile* cur_tile = worldmap->at(tile_pos); - if (cur_tile->stop || (level && !level->name.empty())) + if (cur_tile->stop || (level && !level->name.empty()) || (level && level->is_teleporter)) { stop(); } @@ -387,6 +387,7 @@ level_sprite = new Surface(datadir + "/images/worldmap/levelmarker.png", USE_ALPHA); leveldot_green = new Surface(datadir + "/images/worldmap/leveldot_green.png", USE_ALPHA); leveldot_red = new Surface(datadir + "/images/worldmap/leveldot_red.png", USE_ALPHA); + leveldot_teleporter = new Surface(datadir + "/images/worldmap/teleporter.png", USE_ALPHA); map_file = datadir + "/levels/default/worldmap.stwm"; @@ -405,6 +406,7 @@ delete level_sprite; delete leveldot_green; delete leveldot_red; + delete leveldot_teleporter; } void @@ -471,8 +473,14 @@ reader.read_bool("auto-path", &level.auto_path); level.passive_message = true; reader.read_bool("passive-message", &level.passive_message); - - level.apply_action_north = level.apply_action_south = + + level.is_teleporter = false; + reader.read_bool("teleporter", &level.is_teleporter); + reader.read_int("dest_x", &level.destination_x); + reader.read_int("dest_y", &level.destination_y); + reader.read_string("teleport-message", &level.teleport_message); + + level.apply_action_north = level.apply_action_south = level.apply_action_east = level.apply_action_west = true; reader.read_bool("apply-action-up", &level.apply_action_north); reader.read_bool("apply-action-down", &level.apply_action_south); @@ -785,7 +793,17 @@ return; } } - else + else if (level && level->is_teleporter) { + if (level->x == tux->get_tile_pos().x && + level->y == tux->get_tile_pos().y) + { + Point p; + p.x = level->destination_x; + p.y = level->destination_y; + tux->set_tile_pos(p); + } + } + else { std::cout << "Nothing to enter at: " << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl; @@ -858,10 +876,15 @@ for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) { - if(i->name.empty()) - continue; + if(i->name.empty()) { + if (i->is_teleporter) { + leveldot_teleporter->draw(i->x*32 + offset.x, + i->y*32 + offset.y); + } + else continue; + } - if (i->solved) + else if (i->solved) leveldot_green->draw(i->x*32 + offset.x, i->y*32 + offset.y); else @@ -909,6 +932,10 @@ { white_text->draw_align(i->title.c_str(), screen->w/2, screen->h, A_HMIDDLE, A_BOTTOM); } + else if (i->is_teleporter) { + if(!i->teleport_message.empty()) + gold_text->draw_align(i->teleport_message.c_str(), screen->w/2, screen->h, A_HMIDDLE, A_BOTTOM); + } /* Display a message in the map, if any as been selected */ if(!i->display_map_message.empty() && !i->passive_message) Index: worldmap.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v retrieving revision 1.28.2.10 retrieving revision 1.28.2.11 diff -u -d -r1.28.2.10 -r1.28.2.11 --- worldmap.h 31 Jul 2004 10:39:50 -0000 1.28.2.10 +++ worldmap.h 10 Aug 2004 21:18:11 -0000 1.28.2.11 @@ -146,6 +146,7 @@ Surface* level_sprite; Surface* leveldot_green; Surface* leveldot_red; + Surface* leveldot_teleporter; std::string name; std::string music; @@ -175,6 +176,12 @@ /** Message to show in the Map during a certain time */ std::string display_map_message; bool passive_message; + + /** Teleporters */ + bool is_teleporter; + int destination_x; + int destination_y; + std::string teleport_message; /** If false, disables the auto walking after finishing a level */ bool auto_path; |
|
From: Ryan F. <sik...@us...> - 2004-08-10 17:28:50
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22257 Modified Files: Tag: supertux_0_1_1_branch player.cpp Log Message: - don't draw arm when Tux is ducking and holding something Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.88.2.4 retrieving revision 1.88.2.5 diff -u -d -r1.88.2.4 -r1.88.2.5 --- player.cpp 5 Aug 2004 10:04:17 -0000 1.88.2.4 +++ player.cpp 10 Aug 2004 17:28:34 -0000 1.88.2.5 @@ -594,7 +594,7 @@ } // Draw arm overlay graphics when Tux is holding something - if (holding_something && physic.get_velocity_y() == 0) + if (holding_something && physic.get_velocity_y() == 0 && !duck) { if (dir == RIGHT) sprite->grab_right->draw(base.x - scroll_x, base.y); |
|
From: Marek M. <wa...@us...> - 2004-08-10 16:22:22
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7892/data Modified Files: Tag: supertux_0_1_1_branch CREDITS Log Message: updated waterfall and transparent water tiles from unDEFER added unDEFER to "Graphics" credits changed bonus levels to use transparent water Index: CREDITS =================================================================== RCS file: /cvsroot/super-tux/supertux/data/CREDITS,v retrieving revision 1.22 retrieving revision 1.22.2.1 diff -u -d -r1.22 -r1.22.2.1 --- CREDITS 10 May 2004 20:24:22 -0000 1.22 +++ CREDITS 10 Aug 2004 16:21:39 -0000 1.22.2.1 @@ -38,6 +38,8 @@ Benjamin P. (litespeed) Jung + Nikolaj (unDEFER) Krivchenkov + -Level Design |
|
From: Marek M. <wa...@us...> - 2004-08-10 16:22:22
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7892 Modified Files: Tag: supertux_0_1_1_branch AUTHORS NEWS Log Message: updated waterfall and transparent water tiles from unDEFER added unDEFER to "Graphics" credits changed bonus levels to use transparent water Index: NEWS =================================================================== RCS file: /cvsroot/super-tux/supertux/NEWS,v retrieving revision 1.9.2.4 retrieving revision 1.9.2.5 diff -u -d -r1.9.2.4 -r1.9.2.5 --- NEWS 1 Aug 2004 12:07:06 -0000 1.9.2.4 +++ NEWS 10 Aug 2004 16:21:39 -0000 1.9.2.5 @@ -1,26 +1,14 @@ Super Tux 0.1.2 (upcoming release) ===================== - * one new island containing contributed and "official" new levels + * a brand new island containing 22 contributed and "official" levels! * a "new" enemy: The Fish - * some new music - * support for auto-scrolling levels - * extended world map format, support for contributed world maps - * thrown ice blocks destroy wooden crates now + * some new music and graphics + * additions to level-/worldmap format and gameplay: + -support for autoscrolling levels + -display of messages on the worldmap, one-way roads + -kicked ice blocks destroy wooden crates and open "?"-boxes * minor bug fixes -This is a nice list of the new additions, but I think it gives the impression -that a lot of stuff has been added and the fact is that basically, it is just -a release that has a new world. -What about making it smaller and highlighting the new world (that is the purpose -of the release), something like this: - - * a brand new island containing 20 contributed and "official" levels! Have fun! - * a "new" enemy: The Fish - * support for auto-scrolling levels - * some gameplay aditions: improved world map and support for Mr. Ice Blocks to -destroy wooden crates when flat - * minor bug fixes - Super Tux 0.1.1 (11 May 04) ===================== Index: AUTHORS =================================================================== RCS file: /cvsroot/super-tux/supertux/AUTHORS,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -d -r1.6 -r1.6.2.1 --- AUTHORS 10 May 2004 22:21:10 -0000 1.6 +++ AUTHORS 10 Aug 2004 16:21:39 -0000 1.6.2.1 @@ -59,6 +59,9 @@ Benjamin P. Jung bp...@gm... + Nikolaj Krivchenkov + un...@ry... + Level Design ------------ |
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7892/data/images/tilesets Modified Files: Tag: supertux_0_1_1_branch supertux.stgt waterfall0-0-1.png waterfall0-0-2.png waterfall0-1-1.png waterfall0-1-2.png waterfall0-2-1.png waterfall0-2-2.png waterfall1-0-1.png waterfall1-0-2.png waterfall1-1-1.png waterfall1-1-2.png waterfall1-1-3.png waterfall1-1-4.png waterfall1-2-1.png waterfall1-2-2.png waterfall1-2-3.png waterfall1-2-4.png waterfall1-3-1.png waterfall1-3-2.png waterfall1-3-3.png waterfall1-3-4.png waterfall1-4-1.png waterfall1-4-2.png waterfall1-4-3.png waterfall1-4-4.png waterfall1-5-1.png waterfall1-5-2.png Added Files: Tag: supertux_0_1_1_branch water-trans.png waterfall-trans1-1-1.png waterfall-trans1-1-2.png waterfall-trans1-1-3.png waterfall-trans1-1-4.png waterfall-trans1-2-1.png waterfall-trans1-2-2.png waterfall-trans1-2-3.png waterfall-trans1-2-4.png waterfall-trans1-3-1.png waterfall-trans1-3-2.png waterfall-trans1-3-3.png waterfall-trans1-3-4.png waterfall-trans1-4-1.png waterfall-trans1-4-2.png waterfall-trans1-4-3.png waterfall-trans1-4-4.png waterfall-trans2-1-1.png waterfall-trans2-1-2.png waterfall-trans2-1-3.png waterfall-trans2-1-4.png waterfall-trans2-2-1.png waterfall-trans2-2-2.png waterfall-trans2-2-3.png waterfall-trans2-2-4.png waterfall-trans2-3-1.png waterfall-trans2-3-2.png waterfall-trans2-3-3.png waterfall-trans2-3-4.png waterfall-trans2-4-1.png waterfall-trans2-4-2.png waterfall-trans2-4-3.png waterfall-trans2-4-4.png waterfall-trans3-1-1.png waterfall-trans3-1-2.png waterfall-trans3-1-3.png waterfall-trans3-1-4.png waterfall-trans3-2-1.png waterfall-trans3-2-2.png waterfall-trans3-2-3.png waterfall-trans3-2-4.png waterfall-trans3-3-1.png waterfall-trans3-3-2.png waterfall-trans3-3-3.png waterfall-trans3-3-4.png waterfall-trans3-4-1.png waterfall-trans3-4-2.png waterfall-trans3-4-3.png waterfall-trans3-4-4.png waterfall-trans4-1-1.png waterfall-trans4-1-2.png waterfall-trans4-1-3.png waterfall-trans4-1-4.png waterfall-trans4-2-1.png waterfall-trans4-2-2.png waterfall-trans4-2-3.png waterfall-trans4-2-4.png waterfall-trans4-3-1.png waterfall-trans4-3-2.png waterfall-trans4-3-3.png waterfall-trans4-3-4.png waterfall-trans4-4-1.png waterfall-trans4-4-2.png waterfall-trans4-4-3.png waterfall-trans4-4-4.png waterfall-trans5-1-1.png waterfall-trans5-1-2.png waterfall-trans5-1-3.png waterfall-trans5-1-4.png waterfall-trans5-2-1.png waterfall-trans5-2-2.png waterfall-trans5-2-3.png waterfall-trans5-2-4.png waterfall-trans5-3-1.png waterfall-trans5-3-2.png waterfall-trans5-3-3.png waterfall-trans5-3-4.png waterfall-trans5-4-1.png waterfall-trans5-4-2.png waterfall-trans5-4-3.png waterfall-trans5-4-4.png waterfall0-0-3.png waterfall0-0-4.png waterfall0-1-3.png waterfall0-1-4.png waterfall0-2-3.png waterfall0-2-4.png waterfall1-0-3.png waterfall1-0-4.png waterfall1-5-3.png waterfall1-5-4.png waves-trans-0.png waves-trans-1.png waves-trans-2.png Removed Files: Tag: supertux_0_1_1_branch waterfall0-0-0.png waterfall0-1-0.png waterfall0-2-0.png waterfall1-0-0.png waterfall1-5-0.png Log Message: updated waterfall and transparent water tiles from unDEFER added unDEFER to "Graphics" credits changed bonus levels to use transparent water Index: waterfall1-5-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-5-2.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsAfp4Nd and /tmp/cvsNB5Ud6 differ Index: waterfall1-4-3.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-4-3.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsHZlkvi and /tmp/cvssGPhYa differ --- NEW FILE: waterfall-trans3-4-4.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-3-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-3-1.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsUEROhm and /tmp/cvshzzJOe differ --- NEW FILE: waterfall-trans3-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-4-4.png --- (This appears to be a binary file; contents omitted.) --- waterfall0-2-0.png DELETED --- --- NEW FILE: waterfall-trans5-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-3-4.png --- (This appears to be a binary file; contents omitted.) --- waterfall1-0-0.png DELETED --- --- NEW FILE: waterfall-trans5-4-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-1-4.png --- (This appears to be a binary file; contents omitted.) Index: waterfall0-0-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall0-0-2.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsqdwqlq and /tmp/cvsrRAZUi differ --- NEW FILE: water-trans.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-3-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-4-2.png --- (This appears to be a binary file; contents omitted.) --- waterfall0-1-0.png DELETED --- --- NEW FILE: waterfall-trans2-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-4-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-2-4.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.28.2.3 retrieving revision 1.28.2.4 diff -u -d -r1.28.2.3 -r1.28.2.4 --- supertux.stgt 8 Aug 2004 10:37:02 -0000 1.28.2.3 +++ supertux.stgt 10 Aug 2004 16:21:40 -0000 1.28.2.4 @@ -12,11 +12,13 @@ (tilegroup (name "Classic-Bg") (tiles 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101)) (tilegroup (name "Points") (tiles 132 133)) (tilegroup (name "Bonus") (tiles 44 83 84 102 103 104 105 112 128)) - (tilegroup (name "Misc") (tiles 75 76 79 80 126 127 129 130 134 135 136 137 138 139 81 173 174)) + (tilegroup (name "Misc") (tiles 75 76 200 201 79 80 126 127 129 130 134 135 136 137 138 139 81 173 174)) (tilegroup (name "Pipe") (tiles 53 54 55 56 57 58 59 60)) (tilegroup (name "Grey") (tiles 64 65 66 67 68 69)) - (tilegroup (name "Waterfall") (tiles 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199)) - (tile (id 0) + (tilegroup (name "Waterfall-trans") (tiles 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194)) + (tilegroup (name "Waterfall") (tiles 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294)) + (tilegroup (name "Waterfall-edgecloud") (tile 195 196 197 198 199)) + (tile (id 0) (images "notile.png")) (tile (id 1) @@ -509,110 +511,203 @@ ;; WaterFall (tile (id 175) - (images "waterfall1-1-1.png" "waterfall1-1-2.png" "waterfall1-1-3.png" "waterfall1-1-4.png") + (images "waterfall-trans1-1-1.png" "waterfall-trans1-1-2.png" "waterfall-trans1-1-3.png" "waterfall-trans1-1-4.png") (water #t) (anim-speed 45)) (tile (id 176) - (images "waterfall1-2-1.png" "waterfall1-2-2.png" "waterfall1-2-3.png" "waterfall1-2-4.png") + (images "waterfall-trans1-2-1.png" "waterfall-trans1-2-2.png" "waterfall-trans1-2-3.png" "waterfall-trans1-2-4.png") (water #t) (anim-speed 45)) (tile (id 177) - (images "waterfall1-3-1.png" "waterfall1-3-2.png" "waterfall1-3-3.png" "waterfall1-3-4.png") + (images "waterfall-trans1-3-1.png" "waterfall-trans1-3-2.png" "waterfall-trans1-3-3.png" "waterfall-trans1-3-4.png") (water #t) (anim-speed 45)) (tile (id 178) - (images "waterfall1-4-1.png" "waterfall1-4-2.png" "waterfall1-4-3.png" "waterfall1-4-4.png") + (images "waterfall-trans1-4-1.png" "waterfall-trans1-4-2.png" "waterfall-trans1-4-3.png" "waterfall-trans1-4-4.png") (water #t) (anim-speed 45)) (tile (id 179) - (images "waterfall2-1-1.png" "waterfall2-1-2.png" "waterfall2-1-3.png" "waterfall2-1-4.png") + (images "waterfall-trans2-1-1.png" "waterfall-trans2-1-2.png" "waterfall-trans2-1-3.png" "waterfall-trans2-1-4.png") (water #t) (anim-speed 45)) (tile (id 180) - (images "waterfall2-2-1.png" "waterfall2-2-2.png" "waterfall2-2-3.png" "waterfall2-2-4.png") + (images "waterfall-trans2-2-1.png" "waterfall-trans2-2-2.png" "waterfall-trans2-2-3.png" "waterfall-trans2-2-4.png") (water #t) (anim-speed 45)) (tile (id 181) - (images "waterfall2-3-1.png" "waterfall2-3-2.png" "waterfall2-3-3.png" "waterfall2-3-4.png") + (images "waterfall-trans2-3-1.png" "waterfall-trans2-3-2.png" "waterfall-trans2-3-3.png" "waterfall-trans2-3-4.png") (water #t) (anim-speed 45)) (tile (id 182) - (images "waterfall2-4-1.png" "waterfall2-4-2.png" "waterfall2-4-3.png" "waterfall2-4-4.png") + (images "waterfall-trans2-4-1.png" "waterfall-trans2-4-2.png" "waterfall-trans2-4-3.png" "waterfall-trans2-4-4.png") (water #t) (anim-speed 45)) (tile (id 183) - (images "waterfall3-1-1.png" "waterfall3-1-2.png" "waterfall3-1-3.png" "waterfall3-1-4.png") + (images "waterfall-trans3-1-1.png" "waterfall-trans3-1-2.png" "waterfall-trans3-1-3.png" "waterfall-trans3-1-4.png") (water #t) (anim-speed 45)) (tile (id 184) - (images "waterfall3-2-1.png" "waterfall3-2-2.png" "waterfall3-2-3.png" "waterfall3-2-4.png") + (images "waterfall-trans3-2-1.png" "waterfall-trans3-2-2.png" "waterfall-trans3-2-3.png" "waterfall-trans3-2-4.png") (water #t) (anim-speed 45)) (tile (id 185) - (images "waterfall3-3-1.png" "waterfall3-3-2.png" "waterfall3-3-3.png" "waterfall3-3-4.png") + (images "waterfall-trans3-3-1.png" "waterfall-trans3-3-2.png" "waterfall-trans3-3-3.png" "waterfall-trans3-3-4.png") (water #t) (anim-speed 45)) (tile (id 186) - (images "waterfall3-4-1.png" "waterfall3-4-2.png" "waterfall3-4-3.png" "waterfall3-4-4.png") + (images "waterfall-trans3-4-1.png" "waterfall-trans3-4-2.png" "waterfall-trans3-4-3.png" "waterfall-trans3-4-4.png") (water #t) (anim-speed 45)) (tile (id 187) - (images "waterfall4-1-1.png" "waterfall4-1-2.png" "waterfall4-1-3.png" "waterfall4-1-4.png") + (images "waterfall-trans4-1-1.png" "waterfall-trans4-1-2.png" "waterfall-trans4-1-3.png" "waterfall-trans4-1-4.png") (water #t) (anim-speed 45)) (tile (id 188) - (images "waterfall4-2-1.png" "waterfall4-2-2.png" "waterfall4-2-3.png" "waterfall4-2-4.png") + (images "waterfall-trans4-2-1.png" "waterfall-trans4-2-2.png" "waterfall-trans4-2-3.png" "waterfall-trans4-2-4.png") (water #t) (anim-speed 45)) (tile (id 189) - (images "waterfall4-3-1.png" "waterfall4-3-2.png" "waterfall4-3-3.png" "waterfall4-3-4.png") + (images "waterfall-trans4-3-1.png" "waterfall-trans4-3-2.png" "waterfall-trans4-3-3.png" "waterfall-trans4-3-4.png") (water #t) (anim-speed 45)) (tile (id 190) - (images "waterfall4-4-1.png" "waterfall4-4-2.png" "waterfall4-4-3.png" "waterfall4-4-4.png") + (images "waterfall-trans4-4-1.png" "waterfall-trans4-4-2.png" "waterfall-trans4-4-3.png" "waterfall-trans4-4-4.png") (water #t) (anim-speed 45)) (tile (id 191) - (images "waterfall5-1-1.png" "waterfall5-1-2.png" "waterfall5-1-3.png" "waterfall5-1-4.png") + (images "waterfall-trans5-1-1.png" "waterfall-trans5-1-2.png" "waterfall-trans5-1-3.png" "waterfall-trans5-1-4.png") (water #t) (anim-speed 45)) (tile (id 192) - (images "waterfall5-2-1.png" "waterfall5-2-2.png" "waterfall5-2-3.png" "waterfall5-2-4.png") + (images "waterfall-trans5-2-1.png" "waterfall-trans5-2-2.png" "waterfall-trans5-2-3.png" "waterfall-trans5-2-4.png") (water #t) (anim-speed 45)) (tile (id 193) - (images "waterfall5-3-1.png" "waterfall5-3-2.png" "waterfall5-3-3.png" "waterfall5-3-4.png") + (images "waterfall-trans5-3-1.png" "waterfall-trans5-3-2.png" "waterfall-trans5-3-3.png" "waterfall-trans5-3-4.png") (water #t) (anim-speed 45)) (tile (id 194) - (images "waterfall5-4-1.png" "waterfall5-4-2.png" "waterfall5-4-3.png" "waterfall5-4-4.png") + (images "waterfall-trans5-4-1.png" "waterfall-trans5-4-2.png" "waterfall-trans5-4-3.png" "waterfall-trans5-4-4.png") (water #t) (anim-speed 45)) (tile (id 195) - (images "waterfall1-0-0.png" "waterfall1-0-1.png" "waterfall1-0-2.png") + (images "waterfall1-0-1.png" "waterfall1-0-2.png" "waterfall1-0-3.png" "waterfall1-0-4.png") (water #t) - (anim-speed 50)) + (anim-speed 45)) (tile (id 196) - (images "waterfall1-5-0.png" "waterfall1-5-1.png" "waterfall1-5-2.png") + (images "waterfall1-5-1.png" "waterfall1-5-2.png" "waterfall1-5-3.png" "waterfall1-5-4.png") (water #t) - (anim-speed 50)) + (anim-speed 45)) (tile (id 197) - (images "waterfall0-0-0.png" "waterfall0-0-1.png" "waterfall0-0-2.png") + (images "waterfall0-0-1.png" "waterfall0-0-2.png" "waterfall0-0-3.png" "waterfall0-0-4.png") (water #t) - (anim-speed 50)) + (anim-speed 45)) (tile (id 198) - (images "waterfall0-1-0.png" "waterfall0-1-1.png" "waterfall0-1-2.png") + (images "waterfall0-1-1.png" "waterfall0-1-2.png" "waterfall0-1-3.png" "waterfall0-1-4.png") (water #t) - (anim-speed 50)) + (anim-speed 45)) (tile (id 199) - (images "waterfall0-2-0.png" "waterfall0-2-1.png" "waterfall0-2-2.png") + (images "waterfall0-2-1.png" "waterfall0-2-2.png" "waterfall0-2-3.png" "waterfall0-2-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 200) + (images "water-trans.png") + (water #t)) + (tile (id 201) + (images "waves-trans-0.png" "waves-trans-1.png" "waves-trans-2.png") (water #t) (anim-speed 50)) + (tile (id 275) + (images "waterfall1-1-1.png" "waterfall1-1-2.png" "waterfall1-1-3.png" "waterfall1-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 276) + (images "waterfall1-2-1.png" "waterfall1-2-2.png" "waterfall1-2-3.png" "waterfall1-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 277) + (images "waterfall1-3-1.png" "waterfall1-3-2.png" "waterfall1-3-3.png" "waterfall1-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 278) + (images "waterfall1-4-1.png" "waterfall1-4-2.png" "waterfall1-4-3.png" "waterfall1-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 279) + (images "waterfall2-1-1.png" "waterfall2-1-2.png" "waterfall2-1-3.png" "waterfall2-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 280) + (images "waterfall2-2-1.png" "waterfall2-2-2.png" "waterfall2-2-3.png" "waterfall2-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 281) + (images "waterfall2-3-1.png" "waterfall2-3-2.png" "waterfall2-3-3.png" "waterfall2-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 282) + (images "waterfall2-4-1.png" "waterfall2-4-2.png" "waterfall2-4-3.png" "waterfall2-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 283) + (images "waterfall3-1-1.png" "waterfall3-1-2.png" "waterfall3-1-3.png" "waterfall3-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 284) + (images "waterfall3-2-1.png" "waterfall3-2-2.png" "waterfall3-2-3.png" "waterfall3-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 285) + (images "waterfall3-3-1.png" "waterfall3-3-2.png" "waterfall3-3-3.png" "waterfall3-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 286) + (images "waterfall3-4-1.png" "waterfall3-4-2.png" "waterfall3-4-3.png" "waterfall3-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 287) + (images "waterfall4-1-1.png" "waterfall4-1-2.png" "waterfall4-1-3.png" "waterfall4-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 288) + (images "waterfall4-2-1.png" "waterfall4-2-2.png" "waterfall4-2-3.png" "waterfall4-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 289) + (images "waterfall4-3-1.png" "waterfall4-3-2.png" "waterfall4-3-3.png" "waterfall4-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 290) + (images "waterfall4-4-1.png" "waterfall4-4-2.png" "waterfall4-4-3.png" "waterfall4-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 291) + (images "waterfall5-1-1.png" "waterfall5-1-2.png" "waterfall5-1-3.png" "waterfall5-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 292) + (images "waterfall5-2-1.png" "waterfall5-2-2.png" "waterfall5-2-3.png" "waterfall5-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 293) + (images "waterfall5-3-1.png" "waterfall5-3-2.png" "waterfall5-3-3.png" "waterfall5-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 294) + (images "waterfall5-4-1.png" "waterfall5-4-2.png" "waterfall5-4-3.png" "waterfall5-4-4.png") + (water #t) + (anim-speed 45)) + ) --- NEW FILE: waterfall-trans1-2-1.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-3-4.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-3-4.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvs9p3G65 and /tmp/cvszP735Y differ Index: waterfall1-1-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-1-1.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsWaynr7 and /tmp/cvsbFzMx0 differ --- NEW FILE: waterfall-trans3-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-0-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-3-3.png --- (This appears to be a binary file; contents omitted.) --- waterfall1-5-0.png DELETED --- Index: waterfall1-4-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-4-2.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsOCRGJc and /tmp/cvsSDK6U5 differ --- NEW FILE: waterfall1-5-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-4-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-3-1.png --- (This appears to be a binary file; contents omitted.) --- waterfall0-0-0.png DELETED --- Index: waterfall0-1-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall0-1-1.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvslv8bOl and /tmp/cvsjzI13e differ --- NEW FILE: waterfall0-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-4-4.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-3-3.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-3-3.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsxXebus and /tmp/cvsQiqpOl differ Index: waterfall1-3-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-3-2.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsDqS6Oy and /tmp/cvsZJfXes differ Index: waterfall1-5-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-5-1.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsnLEj7C and /tmp/cvsxImYzw differ --- NEW FILE: waterfall-trans4-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-3-1.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-0-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-0-1.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsgcyHLL and /tmp/cvsNxlviF differ --- NEW FILE: waterfall-trans2-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-4-3.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-0-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-0-2.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsKCaQqS and /tmp/cvsZnkZ1L differ --- NEW FILE: waterfall-trans4-4-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-2-3.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-2-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-2-2.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvshNaHW9 and /tmp/cvsCBzyP3 differ --- NEW FILE: waterfall-trans2-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-4-1.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-2-3.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-2-3.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsjtyfHq and /tmp/cvsozNXKk differ Index: waterfall1-1-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-1-2.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsfNsxqv and /tmp/cvslIUFxp differ --- NEW FILE: waterfall-trans3-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-3-2.png --- (This appears to be a binary file; contents omitted.) Index: waterfall0-1-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall0-1-2.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsorGNLE and /tmp/cvs8r9HYy differ --- NEW FILE: waterfall-trans3-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-5-3.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-2-4.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-2-4.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvs11PwYI and /tmp/cvsJwP2fD differ Index: waterfall1-4-4.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-4-4.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsLXBouU and /tmp/cvsUwg5SO differ --- NEW FILE: waterfall-trans4-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-0-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans3-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-0-4.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-1-3.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-1-3.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvs72Kyc3 and /tmp/cvsX6kpFX differ --- NEW FILE: waterfall-trans1-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waves-trans-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waves-trans-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans1-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-0-3.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-2-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-2-1.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsG86P47 and /tmp/cvsMFblB2 differ --- NEW FILE: waterfall-trans3-4-3.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-4-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-4-1.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsV2PFD9 and /tmp/cvs09H9i4 differ --- NEW FILE: waterfall-trans3-1-4.png --- (This appears to be a binary file; contents omitted.) Index: waterfall1-1-4.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall1-1-4.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsR1Wy9p and /tmp/cvsOv1m0k differ Index: waterfall0-0-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall0-0-1.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvspClHHO and /tmp/cvsQylkNJ differ --- NEW FILE: waterfall-trans1-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-4-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-3-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans4-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans2-2-4.png --- (This appears to be a binary file; contents omitted.) Index: waterfall0-2-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall0-2-2.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvssUgFtT and /tmp/cvsgPypCO differ Index: waterfall0-2-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waterfall0-2-1.png,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 Binary files /tmp/cvsYzwNXZ and /tmp/cvsqrTNaV differ --- NEW FILE: waves-trans-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall-trans5-3-1.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-08-10 16:18:16
|
Update of /cvsroot/super-tux/supertux/data/levels/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7688/data/levels/default Modified Files: Tag: supertux_0_1_1_branch bonusisland.stwm Log Message: Added a '-' before Tux talks. Just so that it looks like it is Tux talking... Marek, if you don't like it, feel free to remove it. Index: bonusisland.stwm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/default/Attic/bonusisland.stwm,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -u -d -r1.1.2.16 -r1.1.2.17 --- bonusisland.stwm 6 Aug 2004 21:29:06 -0000 1.1.2.16 +++ bonusisland.stwm 10 Aug 2004 16:18:08 -0000 1.1.2.17 @@ -137,22 +137,22 @@ (x 49) (y 29) (apply-action-down #f)) - (level (map-message "I cannot enter from this side.") + (level (map-message "- I cannot enter from this side.") (x 13) (y 27) (apply-action-up #f) (passive-message #f)) - (level (map-message "I cannot enter from this side.") + (level (map-message "- I cannot enter from this side.") (x 23) (y 27) (apply-action-up #f) (passive-message #f)) - (level (map-message "I cannot enter from this side.") + (level (map-message "- I cannot enter from this side.") (x 39) (y 27) (apply-action-up #f) (passive-message #f)) - (level (map-message "I cannot enter from this side.") + (level (map-message "- I cannot enter from this side.") (x 49) (y 27) (apply-action-up #f) (passive-message #f)) - (level (map-message "I cannot enter from this side.") + (level (map-message "- I cannot enter from this side.") (x 62) (y 27) (apply-action-up #f) (passive-message #f)) - (level (map-message "Something is blocking the way.") + (level (map-message "- Something is blocking the way.") (x 34) (y 4) (apply-action-left #f) (passive-message #f)) |
|
From: Ricardo C. <rm...@us...> - 2004-08-10 16:07:38
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5484/src Modified Files: misc.cpp Log Message: Use SDL toggle call in non-windows systems. This should be faster and more X11 friendly. Index: misc.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/misc.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- misc.cpp 25 Jul 2004 19:03:36 -0000 1.4 +++ misc.cpp 10 Aug 2004 16:07:28 -0000 1.5 @@ -56,7 +56,11 @@ if(use_fullscreen != options_menu->isToggled(MNID_FULLSCREEN)) { use_fullscreen = !use_fullscreen; +#ifdef WIN32 Setup::video(screen->w,screen->h); +#else + SDL_WM_ToggleFullScreen(screen); +#endif } break; case MNID_SOUND: |
|
From: Ricardo C. <rm...@us...> - 2004-08-10 11:44:07
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23173/src Modified Files: special.cpp Log Message: There is no point in making a Y inferior to scroll_y checking, since bullets accel is down. Fixes bug reported by unDEFER in the mailing list. Index: special.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- special.cpp 26 Jul 2004 18:09:14 -0000 1.65 +++ special.cpp 10 Aug 2004 11:43:57 -0000 1.66 @@ -104,7 +104,7 @@ Sector::current()->camera->get_translation().y; if (base.x < scroll_x || base.x > scroll_x + screen->w || - base.y < scroll_y || +// base.y < scroll_y || base.y > scroll_y + screen->h || life_count <= 0) { |
|
From: Ricardo C. <rm...@us...> - 2004-08-10 11:35:04
|
Update of /cvsroot/super-tux/supertux/lib/app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21759/lib/app Modified Files: setup.cpp Log Message: Added a space on --version. Index: setup.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/app/setup.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- setup.cpp 6 Aug 2004 12:10:54 -0000 1.13 +++ setup.cpp 10 Aug 2004 11:34:54 -0000 1.14 @@ -745,7 +745,7 @@ else if (strcmp(argv[i], "--version") == 0) { /* Show version: */ - printf((package_name + package_version + "\n").c_str() ); + printf((package_name + " " + package_version + "\n").c_str() ); exit(0); } else if (strcmp(argv[i], "--disable-sound") == 0) |
|
From: Ricardo C. <rm...@us...> - 2004-08-10 11:34:35
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21704/src Modified Files: Tag: supertux_0_1_1_branch title.cpp Log Message: Fixed slot deleting. Bug report from Mickael Husson. Index: title.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v retrieving revision 1.81.2.4 retrieving revision 1.81.2.5 diff -u -d -r1.81.2.4 -r1.81.2.5 --- title.cpp 22 Jul 2004 09:41:19 -0000 1.81.2.4 +++ title.cpp 10 Aug 2004 11:34:25 -0000 1.81.2.5 @@ -354,6 +354,7 @@ update_load_save_game_menu(load_game_menu); update_time = st_get_ticks(); + Menu::set_current(main_menu); } else if (process_load_game_menu()) { |
|
From: Ricardo C. <rm...@us...> - 2004-08-10 11:33:34
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21580 Modified Files: Tag: supertux_0_1_1_branch configure.ac Log Message: Changed 0.1.1 to 0.1.2 in 0_1_1_branch. Index: configure.ac =================================================================== RCS file: /cvsroot/super-tux/supertux/configure.ac,v retrieving revision 1.23.2.1 retrieving revision 1.23.2.2 diff -u -d -r1.23.2.1 -r1.23.2.2 --- configure.ac 5 Aug 2004 14:54:09 -0000 1.23.2.1 +++ configure.ac 10 Aug 2004 11:33:26 -0000 1.23.2.2 @@ -12,7 +12,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.54]) -AC_INIT(SuperTux, 0.1.1) +AC_INIT(SuperTux, 0.1.2) AC_CONFIG_SRCDIR([src/supertux.cpp]) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(dist-bzip2) |
|
From: Ricardo C. <rm...@us...> - 2004-08-10 11:33:06
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21506 Modified Files: configure.ac Log Message: Changed 0.1.1 version to 0.2-cvs in HEAD. Index: configure.ac =================================================================== RCS file: /cvsroot/super-tux/supertux/configure.ac,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- configure.ac 20 Jul 2004 18:00:43 -0000 1.31 +++ configure.ac 10 Aug 2004 11:32:54 -0000 1.32 @@ -11,7 +11,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.54]) -AC_INIT(SuperTux, 0.1.1) +AC_INIT(SuperTux, 0.2-cvs) AC_CONFIG_HEADERS(config.h) AC_CONFIG_SRCDIR([src/supertux.cpp]) AC_CANONICAL_TARGET |
|
From: Tobias G. <to...@us...> - 2004-08-08 15:46:32
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4893/src Modified Files: bitmask.cpp bitmask.h Log Message: Merged the bitmask code with a newer version (1.3) of the bitmask library. Index: bitmask.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/bitmask.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- bitmask.h 23 Mar 2004 17:25:15 -0000 1.3 +++ bitmask.h 8 Aug 2004 15:46:21 -0000 1.4 @@ -10,7 +10,6 @@ * to check for collisions. * The current implementation uses 32 bit wide stripes to hold * the masks, but should work just as well with 64 bit sizes. - * (Note that the current bitcount function is 32 bit only!) * * The overlap tests uses the following offsets (which may be negative): * @@ -26,11 +25,6 @@ * with some kind of pre-sorting to avoid comparing objects far from * each other. * - * BUGS: No known bugs, even though they may certainly be in here somewhere. - * Possible performance improvements could be to remove the div in - * bitmask_overlap_pos() and to implement wider stripes if the masks used - * are wider than 64 bits on the average. - * * Performance of the various functions goes something like: * (relative timings, smaller is better) * @@ -65,11 +59,12 @@ #define SUPERTUX_BITMASK_H #include <SDL.h> +#include <climits> /* Define INLINE for different compilers. */ #ifndef INLINE # ifdef __GNUC__ -# define INLINE __inline__ +# define INLINE inline # else # ifdef _MSC_VER # define INLINE __inline @@ -80,8 +75,8 @@ #endif #define BITW unsigned long int -#define BITW_LEN 32 -#define BITW_MASK 31 +#define BITW_LEN (sizeof(BITW)*CHAR_BIT) +#define BITW_MASK (BITW_LEN - 1) #define BITN(n) ((BITW)1 << (n)) struct bitmask @@ -96,6 +91,9 @@ bitmask *bitmask_create(int w, int h); void bitmask_free(bitmask *m); +void bitmask_clear(bitmask *m); +void bitmask_fill(bitmask *m); + /* Returns nonzero if the bit at (x,y) is set. * Coordinates start at (0,0) */ @@ -123,7 +121,7 @@ int bitmask_overlap(const bitmask *a,const bitmask *b,int xoffset, int yoffset); /* Like bitmask_overlap(), but will also give a point of intersection. - * x and y are given in the coordinates of mask a, and are untouched if the is + * x and y are given in the coordinates of mask a, and are untouched if there is * no overlap. */ int bitmask_overlap_pos(const bitmask *a,const bitmask *b,int xoffset, int yoffset, int *x, int *y); Index: bitmask.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/bitmask.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- bitmask.cpp 8 Aug 2004 13:07:22 -0000 1.2 +++ bitmask.cpp 8 Aug 2004 15:46:20 -0000 1.3 @@ -23,8 +23,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <stdlib.h> -#include <stdio.h> +#include <cstdlib> +#include <cstdio> +#include <cstring> #include "bitmask.h" #define MIN(a,b) ((a) < (b) ? (a) : (b)) @@ -46,6 +47,8 @@ return temp; } +/* (C) Tobias Glaesser <tob...@gm...>, 2004. + This function isn't available in the original bitmask library. */ bitmask *bitmask_create_SDL(SDL_Surface* surf) { bitmask* pbitmask = bitmask_create(surf->w, surf->h); @@ -56,7 +59,7 @@ if(surf->format->BytesPerPixel != 4) //This function only works for true-color surfaces with an alpha channel return 0; - + fmt = surf->format; for(h = 0; h <= surf->h; ++h) { @@ -81,6 +84,16 @@ free(m); } +void bitmask_clear(bitmask *m) +{ + memset(m->bits,0,m->h*((m->w - 1)/BITW_LEN + 1)*sizeof(BITW)); +} + +void bitmask_fill(bitmask *m) +{ + memset(m->bits,255,m->h*((m->w - 1)/BITW_LEN + 1)*sizeof(BITW)); +} + int bitmask_overlap(const bitmask *a,const bitmask *b,int xoffset, int yoffset) { BITW *a_entry,*a_end; @@ -184,24 +197,26 @@ BITW *a_entry,*a_end; BITW *b_entry; BITW *ap,*bp; - int shift,rshift,i,astripes,bstripes; + int shift,rshift,i,astripes,bstripes,xbase; if ((xoffset >= a->w) || (yoffset >= a->h) || (yoffset <= - b->h)) return 0; if (xoffset >= 0) { + xbase = xoffset/BITW_LEN; /* first stripe from mask a */ if (yoffset >= 0) { - a_entry = a->bits + a->h*(xoffset/BITW_LEN) + yoffset; + a_entry = a->bits + a->h*xbase + yoffset; a_end = a_entry + MIN(b->h,a->h - yoffset); b_entry = b->bits; } else { - a_entry = a->bits + a->h*(xoffset/BITW_LEN); + a_entry = a->bits + a->h*xbase; a_end = a_entry + MIN(b->h + yoffset,a->h); b_entry = b->bits - yoffset; + yoffset = 0; /* relied on below */ } shift = xoffset & BITW_MASK; if (shift) @@ -216,8 +231,8 @@ for (ap = a_entry,bp = b_entry;ap < a_end;ap++,bp++) if (*ap & (*bp << shift)) { - *y = (ap - a->bits) % a->h; - *x = ((ap - a->bits) / a->h)*BITW_LEN + firstsetbit(*ap & (*bp << shift)); + *y = ap - a_entry + yoffset; + *x = (xbase + i)*BITW_LEN + firstsetbit(*ap & (*bp << shift)); return 1; } a_entry += a->h; @@ -225,8 +240,8 @@ for (ap = a_entry,bp = b_entry;ap < a_end;ap++,bp++) if (*ap & (*bp >> rshift)) { - *y = (ap - a->bits) % a->h; - *x = ((ap - a->bits) / a->h)*BITW_LEN + firstsetbit(*ap & (*bp >> rshift)); + *y = ap - a_entry + yoffset; + *x = (xbase + i + 1)*BITW_LEN + firstsetbit(*ap & (*bp >> rshift)); return 1; } b_entry += b->h; @@ -234,8 +249,8 @@ for (ap = a_entry,bp = b_entry;ap < a_end;ap++,bp++) if (*ap & (*bp << shift)) { - *y = (ap - a->bits) % a->h; - *x = ((ap - a->bits) / a->h)*BITW_LEN + firstsetbit(*ap & (*bp << shift)); + *y = ap - a_entry + yoffset; + *x = (xbase + astripes)*BITW_LEN + firstsetbit(*ap & (*bp << shift)); return 1; } return 0; @@ -247,8 +262,8 @@ for (ap = a_entry,bp = b_entry;ap < a_end;ap++,bp++) if (*ap & (*bp << shift)) { - *y = (ap - a->bits) % a->h; - *x = ((ap - a->bits) / a->h)*BITW_LEN + firstsetbit(*ap & (*bp << shift)); + *y = ap - a_entry + yoffset; + *x = (xbase + i)*BITW_LEN + firstsetbit(*ap & (*bp << shift)); return 1; } a_entry += a->h; @@ -256,8 +271,8 @@ for (ap = a_entry,bp = b_entry;ap < a_end;ap++,bp++) if (*ap & (*bp >> rshift)) { - *y = (ap - a->bits) % a->h; - *x = ((ap - a->bits) / a->h)*BITW_LEN + firstsetbit(*ap & (*bp >> rshift)); + *y = ap - a_entry + yoffset; + *x = (xbase + i + 1)*BITW_LEN + firstsetbit(*ap & (*bp >> rshift)); return 1; } b_entry += b->h; @@ -265,7 +280,8 @@ return 0; } } - else /* xoffset is a multiple of the stripe width, and the above routines won't work. */ + else /* xoffset is a multiple of the stripe width, and the above routines + won't work. This way is also slightly faster. */ { astripes = (MIN(b->w,a->w - xoffset) - 1)/BITW_LEN + 1; for (i=0;i<astripes;i++) @@ -274,8 +290,8 @@ { if (*ap & *bp) { - *y = (ap - a->bits) % a->h; - *x = ((ap - a->bits) / a->h)*BITW_LEN + firstsetbit(*ap & *bp); + *y = ap - a_entry + yoffset; + *x = (xbase + i)*BITW_LEN + firstsetbit(*ap & *bp); return 1; } } @@ -299,20 +315,34 @@ } } - - -/* (C) Donald W. Gillies, 1992. All rights reserved. You may reuse - this bitcount() function anywhere you please as long as you retain - this Copyright Notice. */ static INLINE int bitcount(unsigned long n) { - register unsigned long tmp; - return (tmp = (n) - (((n) >> 1) & 033333333333) - (((n) >> 2) & 011111111111),\ - tmp = ((tmp + (tmp >> 3)) & 030707070707), \ - tmp = (tmp + (tmp >> 6)), \ - tmp = (tmp + (tmp >> 12) + (tmp >> 24)) & 077); + if (BITW_LEN == 32) + { + /* (C) Donald W. Gillies, 1992. All rights reserved. You may reuse + this bitcount() function anywhere you please as long as you retain + this Copyright Notice. */ + register unsigned long tmp; + return (tmp = (n) - (((n) >> 1) & 033333333333) - + (((n) >> 2) & 011111111111), + tmp = ((tmp + (tmp >> 3)) & 030707070707), + tmp = (tmp + (tmp >> 6)), + tmp = (tmp + (tmp >> 12) + (tmp >> 24)) & 077); + /* End of Donald W. Gillies bitcount code */ + } + else + { + /* Handle non-32 bit case the slow way */ + int nbits = 0; + while (n) + { + if (n & 1) + nbits++; + n = n >> 1; + } + return nbits; + } } -/* End of Donald W. Gillies bitcount code */ int bitmask_overlap_area(const bitmask *a,const bitmask *b,int xoffset, int yoffset) @@ -474,7 +504,8 @@ } else { - /* 'Swapping' arguments to be able to almost reuse the code above */ + /* 'Swapping' arguments to be able to almost reuse the code above, + should be taken care of by the compiler efficiently. */ swap = a; a = b; b = swap; |
|
From: Tobias G. <to...@us...> - 2004-08-08 13:07:32
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17499/src Modified Files: bitmask.cpp Log Message: Finally tested and implemented the bitmask_create_SDL function right. It should actually work now and is a good option for an advanced collision detection implementation. Index: bitmask.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/bitmask.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- bitmask.cpp 17 Mar 2004 19:19:10 -0000 1.1 +++ bitmask.cpp 8 Aug 2004 13:07:22 -0000 1.2 @@ -48,38 +48,33 @@ bitmask *bitmask_create_SDL(SDL_Surface* surf) { + bitmask* pbitmask = bitmask_create(surf->w, surf->h); int w,h; - int bpp; - Uint8* p; + SDL_PixelFormat* fmt; + Uint32 temp, pixel; + Uint8 alpha; - bitmask *temp = (bitmask*) malloc(sizeof(bitmask)); - if (! temp) + if(surf->format->BytesPerPixel != 4) //This function only works for true-color surfaces with an alpha channel return 0; - temp->w = surf->w; - temp->h = surf->h; - temp->bits = (long unsigned int*) calloc(surf->h*((surf->w - 1)/BITW_LEN + 1),sizeof(BITW)); - if (! temp->bits) - { - free(temp); - return 0; - } - else - return temp; - - bpp = surf->format->BytesPerPixel; + + fmt = surf->format; for(h = 0; h <= surf->h; ++h) { - for(w = 0; w <= surf->h; ++w) + for(w = 0; w <= surf->w; ++w) { - p = (Uint8 *)surf->pixels + h*surf->pitch + w*bpp; - if(*p == 255) - bitmask_setbit(temp,w,h); + pixel = *((Uint32*)((Uint8 *)surf->pixels + h * surf->pitch + w * 4)); + /* Get Alpha component */ + temp=pixel&fmt->Amask; /* Isolate alpha component */ + temp=temp>>fmt->Ashift;/* Shift it down to 8-bit */ + temp=temp<<fmt->Aloss; /* Expand to a full 8-bit number */ + alpha=(Uint8)temp; + if (fmt->Amask == 0 || alpha != 0) + bitmask_setbit(pbitmask,w,h); } } - + return pbitmask; } - void bitmask_free(bitmask *m) { free(m->bits); |
|
From: Marek M. <wa...@us...> - 2004-08-08 12:34:16
|
Update of /cvsroot/super-tux/supertux/data/images/worldmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13207/data/images/worldmap Added Files: Tag: supertux_0_1_1_branch teleporter.png Log Message: added a simple teleporter leveldot i hope someone can come up with something better... --- NEW FILE: teleporter.png --- (This appears to be a binary file; contents omitted.) |
|
From: Marek M. <wa...@us...> - 2004-08-08 10:37:11
|
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23160/data/images/tilesets Modified Files: Tag: supertux_0_1_1_branch supertux.stgt Log Message: updated secret level (i.e. added waterfall :-) ) Index: supertux.stgt =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/supertux.stgt,v retrieving revision 1.28.2.2 retrieving revision 1.28.2.3 diff -u -d -r1.28.2.2 -r1.28.2.3 --- supertux.stgt 8 Aug 2004 09:39:20 -0000 1.28.2.2 +++ supertux.stgt 8 Aug 2004 10:37:02 -0000 1.28.2.3 @@ -15,7 +15,7 @@ (tilegroup (name "Misc") (tiles 75 76 79 80 126 127 129 130 134 135 136 137 138 139 81 173 174)) (tilegroup (name "Pipe") (tiles 53 54 55 56 57 58 59 60)) (tilegroup (name "Grey") (tiles 64 65 66 67 68 69)) - (tilegroup (name "WaterFall") (tiles 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199)) + (tilegroup (name "Waterfall") (tiles 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199)) (tile (id 0) (images "notile.png")) |
Update of /cvsroot/super-tux/supertux/data/images/tilesets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22959/data/images/tilesets Modified Files: supertux.stgt water.png waves-0.png waves-1.png waves-2.png Added Files: waterfall0-0-0.png waterfall0-0-1.png waterfall0-0-2.png waterfall0-1-0.png waterfall0-1-1.png waterfall0-1-2.png waterfall0-2-0.png waterfall0-2-1.png waterfall0-2-2.png waterfall1-0-0.png waterfall1-0-1.png waterfall1-0-2.png waterfall1-1-1.png waterfall1-1-2.png waterfall1-1-3.png waterfall1-1-4.png waterfall1-2-1.png waterfall1-2-2.png waterfall1-2-3.png waterfall1-2-4.png waterfall1-3-1.png waterfall1-3-2.png waterfall1-3-3.png waterfall1-3-4.png waterfall1-4-1.png waterfall1-4-2.png waterfall1-4-3.png waterfall1-4-4.png waterfall1-5-0.png waterfall1-5-1.png waterfall1-5-2.png waterfall2-1-1.png waterfall2-1-2.png waterfall2-1-3.png waterfall2-1-4.png waterfall2-2-1.png waterfall2-2-2.png waterfall2-2-3.png waterfall2-2-4.png waterfall2-3-1.png waterfall2-3-2.png waterfall2-3-3.png waterfall2-3-4.png waterfall2-4-1.png waterfall2-4-2.png waterfall2-4-3.png waterfall2-4-4.png waterfall3-1-1.png waterfall3-1-2.png waterfall3-1-3.png waterfall3-1-4.png waterfall3-2-1.png waterfall3-2-2.png waterfall3-2-3.png waterfall3-2-4.png waterfall3-3-1.png waterfall3-3-2.png waterfall3-3-3.png waterfall3-3-4.png waterfall3-4-1.png waterfall3-4-2.png waterfall3-4-3.png waterfall3-4-4.png waterfall4-1-1.png waterfall4-1-2.png waterfall4-1-3.png waterfall4-1-4.png waterfall4-2-1.png waterfall4-2-2.png waterfall4-2-3.png waterfall4-2-4.png waterfall4-3-1.png waterfall4-3-2.png waterfall4-3-3.png waterfall4-3-4.png waterfall4-4-1.png waterfall4-4-2.png waterfall4-4-3.png waterfall4-4-4.png waterfall5-1-1.png waterfall5-1-2.png waterfall5-1-3.png waterfall5-1-4.png waterfall5-2-1.png waterfall5-2-2.png waterfall5-2-3.png waterfall5-2-4.png waterfall5-3-1.png waterfall5-3-2.png waterfall5-3-3.png waterfall5-3-4.png waterfall5-4-1.png waterfall5-4-2.png waterfall5-4-3.png waterfall5-4-4.png Log Message: added waterfall tiles --- NEW FILE: waterfall5-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-5-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-4-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-3-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-3-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-3-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-4-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-2-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-0-0.png --- (This appears to be a binary file; contents omitted.) Index: water.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/water.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsTJ6nQq and /tmp/cvs9EzHCe differ --- NEW FILE: waterfall5-4-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-4-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-2-3.png --- (This appears to be a binary file; contents omitted.) Index: waves-2.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waves-2.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvs9XPXvy and /tmp/cvs4LJKlm differ --- NEW FILE: waterfall2-4-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-1-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-4-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-3-4.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.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- supertux.stgt 4 Aug 2004 17:59:54 -0000 1.44 +++ supertux.stgt 8 Aug 2004 10:34:33 -0000 1.45 @@ -19,6 +19,7 @@ (tilegroup (name "Grasslands") (tiles 145 146 147 148)) (tilegroup (name "Jungle") (tiles 301 302 303 304 305 306 307 308 309 310 311 312)) (tilegroup (name "Slopes") (tiles 400 401)) + (tilegroup (name "Waterfall") (tiles 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199)) (tile (id 0) (images "notile.png")) @@ -599,8 +600,115 @@ (images "lava2-1.png" "lava2-2.png" "lava2-3.png" "lava2-4.png") (water #t) (anim-speed 120)) + + ;; WaterFall + (tile (id 175) + (images "waterfall1-1-1.png" "waterfall1-1-2.png" "waterfall1-1-3.png" "waterfall1-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 176) + (images "waterfall1-2-1.png" "waterfall1-2-2.png" "waterfall1-2-3.png" "waterfall1-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 177) + (images "waterfall1-3-1.png" "waterfall1-3-2.png" "waterfall1-3-3.png" "waterfall1-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 178) + (images "waterfall1-4-1.png" "waterfall1-4-2.png" "waterfall1-4-3.png" "waterfall1-4-4.png") + (water #t) + (anim-speed 45)) - + (tile (id 179) + (images "waterfall2-1-1.png" "waterfall2-1-2.png" "waterfall2-1-3.png" "waterfall2-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 180) + (images "waterfall2-2-1.png" "waterfall2-2-2.png" "waterfall2-2-3.png" "waterfall2-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 181) + (images "waterfall2-3-1.png" "waterfall2-3-2.png" "waterfall2-3-3.png" "waterfall2-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 182) + (images "waterfall2-4-1.png" "waterfall2-4-2.png" "waterfall2-4-3.png" "waterfall2-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 183) + (images "waterfall3-1-1.png" "waterfall3-1-2.png" "waterfall3-1-3.png" "waterfall3-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 184) + (images "waterfall3-2-1.png" "waterfall3-2-2.png" "waterfall3-2-3.png" "waterfall3-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 185) + (images "waterfall3-3-1.png" "waterfall3-3-2.png" "waterfall3-3-3.png" "waterfall3-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 186) + (images "waterfall3-4-1.png" "waterfall3-4-2.png" "waterfall3-4-3.png" "waterfall3-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 187) + (images "waterfall4-1-1.png" "waterfall4-1-2.png" "waterfall4-1-3.png" "waterfall4-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 188) + (images "waterfall4-2-1.png" "waterfall4-2-2.png" "waterfall4-2-3.png" "waterfall4-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 189) + (images "waterfall4-3-1.png" "waterfall4-3-2.png" "waterfall4-3-3.png" "waterfall4-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 190) + (images "waterfall4-4-1.png" "waterfall4-4-2.png" "waterfall4-4-3.png" "waterfall4-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 191) + (images "waterfall5-1-1.png" "waterfall5-1-2.png" "waterfall5-1-3.png" "waterfall5-1-4.png") + (water #t) + (anim-speed 45)) + (tile (id 192) + (images "waterfall5-2-1.png" "waterfall5-2-2.png" "waterfall5-2-3.png" "waterfall5-2-4.png") + (water #t) + (anim-speed 45)) + (tile (id 193) + (images "waterfall5-3-1.png" "waterfall5-3-2.png" "waterfall5-3-3.png" "waterfall5-3-4.png") + (water #t) + (anim-speed 45)) + (tile (id 194) + (images "waterfall5-4-1.png" "waterfall5-4-2.png" "waterfall5-4-3.png" "waterfall5-4-4.png") + (water #t) + (anim-speed 45)) + + (tile (id 195) + (images "waterfall1-0-0.png" "waterfall1-0-1.png" "waterfall1-0-2.png") + (water #t) + (anim-speed 50)) + (tile (id 196) + (images "waterfall1-5-0.png" "waterfall1-5-1.png" "waterfall1-5-2.png") + (water #t) + (anim-speed 50)) + (tile (id 197) + (images "waterfall0-0-0.png" "waterfall0-0-1.png" "waterfall0-0-2.png") + (water #t) + (anim-speed 50)) + (tile (id 198) + (images "waterfall0-1-0.png" "waterfall0-1-1.png" "waterfall0-1-2.png") + (water #t) + (anim-speed 50)) + (tile (id 199) + (images "waterfall0-2-0.png" "waterfall0-2-1.png" "waterfall0-2-2.png") + (water #t) + (anim-speed 50)) + + ;; Jungle (tile (id 301) --- NEW FILE: waterfall3-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-0-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-5-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-4-1.png --- (This appears to be a binary file; contents omitted.) Index: waves-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waves-1.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsnHbmIG and /tmp/cvss2c4Eu differ --- NEW FILE: waterfall4-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-0-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-4-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-3-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-4-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-4-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-3-1.png --- (This appears to be a binary file; contents omitted.) Index: waves-0.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/tilesets/waves-0.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsBXZksM and /tmp/cvsxMeJsA differ --- NEW FILE: waterfall4-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-4-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-0-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-5-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-0-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-1-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-1-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-0-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-3-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-2-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-4-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-3-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-1-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall1-1-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall3-4-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall2-2-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-3-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall5-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-2-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall0-2-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: waterfall4-2-4.png --- (This appears to be a binary file; contents omitted.) |
248 messages has been excluded from this view by a project administrator.
