super-tux-commit Mailing List for Super Tux (Page 34)
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: Ricardo C. <rm...@us...> - 2004-09-08 13:59:19
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30166/lib/special Modified Files: sprite.cpp Log Message: This checking is useless. It is done before drawing on update(). Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- sprite.cpp 8 Sep 2004 13:50:36 -0000 1.22 +++ sprite.cpp 8 Sep 2004 13:59:09 -0000 1.23 @@ -131,9 +131,6 @@ return; } action = i->second; - -if((int)frame >= get_frames()) - frame = 0; } void |
|
From: Ricardo C. <rm...@us...> - 2004-09-08 13:50:48
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28921/lib/special Modified Files: sprite.cpp Log Message: This should fix animations. (bugs in the line of bomb explosions) Though, there are still warnings of out of range animations. Would be nice if someone could have a look at this. Index: sprite.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- sprite.cpp 27 Aug 2004 20:34:01 -0000 1.21 +++ sprite.cpp 8 Sep 2004 13:50:36 -0000 1.22 @@ -131,6 +131,9 @@ return; } action = i->second; + +if((int)frame >= get_frames()) + frame = 0; } void @@ -202,7 +205,7 @@ } else { - float excedent = frame - action->surfaces.size(); + float excedent = frame - (get_frames()+1); if((int)excedent >= 0) { frame = 0; @@ -230,7 +233,7 @@ if((int)frame >= get_frames() || (int)frame < 0) std::cerr << "Warning: frame out of range: " << (int)frame - << "/" << get_frames() << " at sprite: " << get_name() + << "/" << get_frames() << " at " << get_name() << "/" << get_action_name() << std::endl; else context.draw_surface(action->surfaces[(int)frame], |
|
From: Ricardo C. <rm...@us...> - 2004-09-08 13:48:53
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28539/src Modified Files: badguy.cpp Log Message: Removed stupid checking. Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.116 retrieving revision 1.117 diff -u -d -r1.116 -r1.117 --- badguy.cpp 30 Aug 2004 19:11:14 -0000 1.116 +++ badguy.cpp 8 Sep 2004 13:48:41 -0000 1.117 @@ -1265,7 +1265,7 @@ pbad_c->explode(true); return; } - else if (pbad_c->kind != BAD_MRBOMB) + else { pbad_c->kill_me(50); } |
|
From: Ricardo C. <rm...@us...> - 2004-09-08 13:33:41
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25902/data/images Modified Files: supertux.strf Log Message: Fixed small Tux standing images used. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- supertux.strf 8 Sep 2004 11:22:32 -0000 1.9 +++ supertux.strf 8 Sep 2004 13:33:30 -0000 1.10 @@ -24,7 +24,7 @@ (fps 15.0) (x-offset 5) (y-offset 14) - (images "shared/smalltux/arms-walk-0.png")) + (images "shared/smalltux/arms-walk-5.png")) (action (name "jump") @@ -74,7 +74,7 @@ (fps 15.0) (x-offset 5) (y-offset 14) - (images "shared/smalltux/body-walk-0.png")) + (images "shared/smalltux/body-walk-5.png")) (action (name "jump") |
|
From: Ricardo C. <rm...@us...> - 2004-09-08 11:23:46
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2328/src Modified Files: player.cpp resources.cpp Log Message: Made use of small tux. Support for null body parts. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.159 retrieving revision 1.160 diff -u -d -r1.159 -r1.160 --- player.cpp 4 Sep 2004 21:16:05 -0000 1.159 +++ player.cpp 8 Sep 2004 11:23:29 -0000 1.160 @@ -88,29 +88,41 @@ void TuxBodyParts::set_action(std::string action) { - head->set_action(action); - body->set_action(action); - arms->set_action(action); - feet->set_action(action); + if(head != NULL) + head->set_action(action); + if(body != NULL) + body->set_action(action); + if(arms != NULL) + arms->set_action(action); + if(feet != NULL) + feet->set_action(action); } void TuxBodyParts::one_time_animation() { - head->start_animation(1); - body->start_animation(1); - arms->start_animation(1); - feet->start_animation(1); + if(head != NULL) + head->start_animation(1); + if(body != NULL) + body->start_animation(1); + if(arms != NULL) + arms->start_animation(1); + if(feet != NULL) + feet->start_animation(1); } void TuxBodyParts::draw(DrawingContext& context, const Vector& pos, int layer, Uint32 drawing_effect) { - head->draw(context, pos, layer, drawing_effect); - body->draw(context, pos, layer, drawing_effect); - arms->draw(context, pos, layer, drawing_effect); - feet->draw(context, pos, layer, drawing_effect); + if(head != NULL) + head->draw(context, pos, layer, drawing_effect); + if(body != NULL) + body->draw(context, pos, layer, drawing_effect); + if(arms != NULL) + arms->draw(context, pos, layer, drawing_effect); + if(feet != NULL) + feet->draw(context, pos, layer, drawing_effect); } Player::Player() @@ -759,8 +771,11 @@ if(idle_timer.get_left() < 0) { - tux_body->head->set_action("idle"); - tux_body->head->start_animation(1); + if(size == BIG) + { + tux_body->head->set_action("idle"); + tux_body->head->start_animation(1); + } idle_timer.start(IDLE_TIME); } Index: resources.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- resources.cpp 26 Aug 2004 23:05:03 -0000 1.51 +++ resources.cpp 8 Sep 2004 11:23:29 -0000 1.52 @@ -133,10 +133,10 @@ } small_tux = new TuxBodyParts(); - small_tux->head = sprite_manager->load("big-tux-head"); - small_tux->body = sprite_manager->load("big-tux-body"); - small_tux->arms = sprite_manager->load("big-tux-arms"); - small_tux->feet = sprite_manager->load("big-tux-feet"); + small_tux->head = NULL; + small_tux->body = sprite_manager->load("small-tux-body"); + small_tux->arms = sprite_manager->load("small-tux-arms"); + small_tux->feet = NULL; big_tux = new TuxBodyParts(); big_tux->head = sprite_manager->load("big-tux-head"); |
|
From: Ricardo C. <rm...@us...> - 2004-09-08 11:22:41
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2164/data/images Modified Files: supertux.strf Log Message: Added entries for small tux. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- supertux.strf 4 Sep 2004 21:16:40 -0000 1.8 +++ supertux.strf 8 Sep 2004 11:22:32 -0000 1.9 @@ -1,6 +1,102 @@ ;; -*- mode: scheme; -*- (supertux-resources +; Small Tux sprite + (sprite +;; Small Tux arms + (name "small-tux-arms") + (action + (name "walk") + (fps 15.0) + (x-offset 5) + (y-offset 14) + (images "shared/smalltux/arms-walk-0.png" + "shared/smalltux/arms-walk-1.png" + "shared/smalltux/arms-walk-2.png" + "shared/smalltux/arms-walk-3.png" + "shared/smalltux/arms-walk-4.png" + "shared/smalltux/arms-walk-5.png" + "shared/smalltux/arms-walk-6.png" + "shared/smalltux/arms-walk-7.png")) + + (action + (name "stand") + (fps 15.0) + (x-offset 5) + (y-offset 14) + (images "shared/smalltux/arms-walk-0.png")) + + (action + (name "jump") + (fps 15.0) + (x-offset 5) + (y-offset 14) + (images "shared/smalltux/arms-jump-0.png")) + + (action + (name "skid") + (x-offset 6) + (y-offset 15) + (images "shared/smalltux/arms-skid-0.png")) + + (action + (name "kick") + (x-offset 5) + (y-offset 14) + (images "shared/smalltux/arms-kick-0.png")) + +; Grabbing is arms specific! + (action + (name "grab") + (x-offset 5) + (y-offset 14) + (images "shared/bigtux/arms-grab-0.png"))) + +;; Small Tux Body + (sprite + (name "small-tux-body") + (action + (name "walk") + (fps 15.0) + (x-offset 5) + (y-offset 14) + (images "shared/smalltux/body-walk-0.png" + "shared/smalltux/body-walk-1.png" + "shared/smalltux/body-walk-2.png" + "shared/smalltux/body-walk-3.png" + "shared/smalltux/body-walk-4.png" + "shared/smalltux/body-walk-5.png" + "shared/smalltux/body-walk-6.png" + "shared/smalltux/body-walk-7.png")) + + (action + (name "stand") + (fps 15.0) + (x-offset 5) + (y-offset 14) + (images "shared/smalltux/body-walk-0.png")) + + (action + (name "jump") + (fps 15.0) + (x-offset 5) + (y-offset 14) + (images "shared/smalltux/body-jump-0.png")) + + (action + (name "skid") + (x-offset 6) + (y-offset 15) + (images "shared/smalltux/body-skid-0.png")) + + (action + (name "kick") + (x-offset 5) + (y-offset 14) + (images "shared/smalltux/body-kick-0.png"))) + +; End of Small Tux sprite + ; Big Tux (no power) sprite (sprite ;; Big Tux arms @@ -10,7 +106,7 @@ (name "walk") (fps 15.0) (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/arms-walk-0.png" "shared/bigtux/arms-walk-1.png" "shared/bigtux/arms-walk-2.png" @@ -22,52 +118,46 @@ (name "stand") (fps 15.0) (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/arms-stand-0.png")) (action (name "jump") (fps 15.0) (x-offset 5) - (y-offset 60) + (y-offset 30) (images "shared/bigtux/arms-jump-0.png")) (action - (name "duck") - (x-offset 5) - (y-offset 62) - (images "shared/bigtux/arms-duck-0.png")) - - (action (name "skid") (x-offset 6) - (y-offset 61) + (y-offset 31) (images "shared/bigtux/arms-skid-0.png")) (action (name "kick") (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/arms-stand-0.png")) (action (name "buttjump") (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/arms-stand-0.png")) ; Grabbing is arms specific! (action (name "grab") (x-offset 5) - (y-offset 62) - (images "shared/bigtux/arms-grab-0.png"))) + (y-offset 32) + (images "shared/bigtux/arms-grab-0.png")) (action (name "duck+grab") (x-offset 5) - (y-offset 62) - (images "shared/bigtux/arms-duck+grab-0.png")) + (y-offset 32) + (images "shared/bigtux/arms-duck+grab-0.png"))) ;; Big Tux Head (sprite @@ -76,53 +166,53 @@ (name "walk") (fps 15.0) (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/head-stand-0.png")) (action (name "stand") (fps 15.0) (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/head-stand-0.png")) (action (name "jump") (fps 15.0) (x-offset 5) - (y-offset 60) + (y-offset 30) (images "shared/bigtux/head-stand-0.png")) (action (name "duck") (fps 15.0) (x-offset 5) - (y-offset 60) + (y-offset 30) (images "shared/bigtux/head-duck-0.png")) (action (name "skid") (x-offset 6) - (y-offset 61) + (y-offset 31) (images "shared/bigtux/head-skid-0.png")) (action (name "kick") (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/head-stand-0.png")) (action (name "buttjump") (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/head-stand-0.png")) (action (name "idle") (fps 1.0) (x-offset 6) - (y-offset 61) + (y-offset 31) (images "shared/bigtux/head-idle-blink-0.png" "shared/bigtux/head-idle-blink-1.png"))) @@ -134,46 +224,46 @@ (name "walk") (fps 15.0) (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/body-stand-0.png")) (action (name "stand") (fps 15.0) (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/body-stand-0.png")) (action (name "jump") (fps 15.0) (x-offset 5) - (y-offset 60) + (y-offset 30) (images "shared/bigtux/body-stand-0.png")) (action (name "duck") (fps 15.0) (x-offset 5) - (y-offset 60) + (y-offset 30) (images "shared/bigtux/body-duck-0.png")) (action (name "skid") (x-offset 6) - (y-offset 61) + (y-offset 31) (images "shared/bigtux/body-skid-0.png")) (action (name "kick") (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/body-stand-0.png")) (action (name "buttjump") (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/body-stand-0.png"))) ;; Big Tux Feet @@ -183,7 +273,7 @@ (name "walk") (fps 15.0) (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/feet-walk-0.png" "shared/bigtux/feet-walk-1.png" "shared/bigtux/feet-walk-2.png" @@ -195,39 +285,39 @@ (name "stand") (fps 15.0) (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/feet-stand-0.png")) (action (name "jump") (fps 15.0) (x-offset 5) - (y-offset 60) + (y-offset 30) (images "shared/bigtux/feet-jump-0.png")) (action (name "duck") (fps 15.0) (x-offset 5) - (y-offset 60) + (y-offset 30) (images "shared/bigtux/feet-duck-0.png")) (action (name "skid") (x-offset 6) - (y-offset 61) + (y-offset 31) (images "shared/bigtux/feet-skid-0.png")) (action (name "kick") (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/feet-kick-0.png")) (action (name "buttjump") (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/feet-buttjump-0.png"))) ; End of Big Tux (no power) sprite @@ -240,53 +330,53 @@ (name "walk") (fps 15.0) (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "stand") (fps 15.0) (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "jump") (fps 15.0) (x-offset 5) - (y-offset 60) + (y-offset 30) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "duck") (fps 15.0) (x-offset 5) - (y-offset 60) + (y-offset 30) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "skid") (x-offset 6) - (y-offset 61) + (y-offset 31) (images "shared/bigtux/head-skid-0.png")) (action (name "kick") (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "buttjump") (x-offset 5) - (y-offset 62) + (y-offset 32) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "idle") (fps 1.0) (x-offset 6) - (y-offset 61) + (y-offset 31) (images "shared/bigtux/head-idle-blink-0.png" "shared/bigtux/head-idle-blink-1.png"))) |
|
From: Benjamin P. J. <lit...@us...> - 2004-09-08 10:45:00
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26939/data/images Added Files: supertux.ico Log Message: Created a Super Tux Icon file in ICO format (as used by windows platforms). The ico file contains a 16*16px and a 32*32px version of the original Super Tux icon. The icon was used using 'icotool' from the 'icoutil' package by Oskar Liljeblad. (See http://www.student.lu.se/~nbi98oli/icoutils.html) --- NEW FILE: supertux.ico --- (This appears to be a binary file; contents omitted.) |
Update of /cvsroot/super-tux/supertux/data/images/shared/smalltux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19542/data/images/shared/smalltux Added Files: body-walk-6.png body-idle-blink-0.png body-walk-7.png body-walk-0.png arms-jump-0.png body-walk-5.png body-walk-1.png body-idle-blink-1.png arms-walk-6.png body-jump-0.png body-kick-0.png arms-walk-1.png arms-walk-5.png body-walk-4.png arms-grab-0.png arms-walk-4.png arms-kick-0.png arms-skid-0.png body-walk-2.png arms-walk-3.png body-skid-0.png body-walk-3.png arms-walk-7.png arms-walk-0.png arms-walk-2.png Log Message: Added split-up body parts of the small Super Tux character. They have a size of 48*48px each as it was the easiest way 'ter do them. Some parts might still be missing (e.g. arms-skid+grab and arms-jump+grab). --- NEW FILE: arms-kick-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: body-kick-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: body-idle-blink-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: body-walk-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: body-walk-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: body-walk-7.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: body-walk-6.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-walk-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-walk-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-walk-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-walk-4.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: body-skid-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-jump-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: body-idle-blink-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-skid-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: body-walk-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: body-walk-3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: body-walk-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: body-walk-5.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-walk-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-grab-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-walk-6.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-walk-7.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: body-jump-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-walk-5.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-09-05 09:27:42
|
Update of /cvsroot/super-tux/supertux/lib/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8256/lib/video Modified Files: surface.cpp Log Message: Fixed application of a color mask. If anyone wants to code a less expensive function, feel free to do so. Index: surface.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/video/surface.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- surface.cpp 27 Aug 2004 20:34:56 -0000 1.8 +++ surface.cpp 5 Sep 2004 09:27:24 -0000 1.9 @@ -257,24 +257,24 @@ { if(filter == MASK_FILTER) { + SDL_Surface* sur_copy = sdl_surface_from_sdl_surface(surface, true); + Uint8 r,g,b,a; - SDL_Rect rect; - rect.w = rect.h = 1; - SDL_LockSurface(surface); - for(int x = 0; x < surface->w; x++) - for(int y = 0; y < surface->h; y++) + + SDL_LockSurface(sur_copy); + for(int x = 0; x < sur_copy->w; x++) + for(int y = 0; y < sur_copy->h; y++) { -// SDL_LockSurface(surface); - SDL_GetRGBA(getpixel(surface,x,y), surface->format, &r,&g,&b,&a); -// SDL_UnlockSurface(surface); + SDL_GetRGBA(getpixel(sur_copy,x,y), sur_copy->format, &r,&g,&b,&a); if(a != 0) { - putpixel(surface, x,y, color.map_rgba(surface)); -// rect.x = x; rect.y = y; -// SDL_FillRect(surface, &rect, color.map_rgba(surface)); + putpixel(sur_copy, x,y, color.map_rgba(sur_copy)); } } - SDL_UnlockSurface(surface); + SDL_UnlockSurface(sur_copy); + + SDL_BlitSurface(sur_copy, NULL, surface, NULL); + SDL_FreeSurface(sur_copy); } } @@ -362,6 +362,7 @@ SuperTux::sdl_surface_from_sdl_surface(SDL_Surface* sdl_surf, bool use_alpha) { SDL_Surface* sdl_surface; +#if 0 Uint32 saved_flags; Uint8 saved_alpha; @@ -373,18 +374,21 @@ { SDL_SetAlpha(sdl_surf, 0, 0); } +#endif if(use_alpha == false && !use_gl) sdl_surface = SDL_DisplayFormat(sdl_surf); else sdl_surface = SDL_DisplayFormatAlpha(sdl_surf); +#if 0 /* Restore the alpha blending attributes */ if ( (saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA ) { SDL_SetAlpha(sdl_surface, saved_flags, saved_alpha); } +#endif if (sdl_surface == NULL) Termination::abort("Can't covert to display format", "SURFACE"); |
|
From: Ricardo C. <rm...@us...> - 2004-09-04 21:16:48
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23265a/data/images Modified Files: supertux.strf Log Message: Added the ducking entries for Benjamin's duck Tux body parts. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- supertux.strf 4 Sep 2004 14:58:54 -0000 1.7 +++ supertux.strf 4 Sep 2004 21:16:40 -0000 1.8 @@ -33,6 +33,12 @@ (images "shared/bigtux/arms-jump-0.png")) (action + (name "duck") + (x-offset 5) + (y-offset 62) + (images "shared/bigtux/arms-duck-0.png")) + + (action (name "skid") (x-offset 6) (y-offset 61) @@ -57,6 +63,12 @@ (y-offset 62) (images "shared/bigtux/arms-grab-0.png"))) + (action + (name "duck+grab") + (x-offset 5) + (y-offset 62) + (images "shared/bigtux/arms-duck+grab-0.png")) + ;; Big Tux Head (sprite (name "big-tux-head") @@ -82,6 +94,13 @@ (images "shared/bigtux/head-stand-0.png")) (action + (name "duck") + (fps 15.0) + (x-offset 5) + (y-offset 60) + (images "shared/bigtux/head-duck-0.png")) + + (action (name "skid") (x-offset 6) (y-offset 61) @@ -133,6 +152,13 @@ (images "shared/bigtux/body-stand-0.png")) (action + (name "duck") + (fps 15.0) + (x-offset 5) + (y-offset 60) + (images "shared/bigtux/body-duck-0.png")) + + (action (name "skid") (x-offset 6) (y-offset 61) @@ -180,6 +206,13 @@ (images "shared/bigtux/feet-jump-0.png")) (action + (name "duck") + (fps 15.0) + (x-offset 5) + (y-offset 60) + (images "shared/bigtux/feet-duck-0.png")) + + (action (name "skid") (x-offset 6) (y-offset 61) @@ -225,6 +258,13 @@ (images "shared/bigtux/head-fire-stand-0.png")) (action + (name "duck") + (fps 15.0) + (x-offset 5) + (y-offset 60) + (images "shared/bigtux/head-fire-stand-0.png")) + + (action (name "skid") (x-offset 6) (y-offset 61) |
|
From: Ricardo C. <rm...@us...> - 2004-09-04 21:16:14
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23170/src Modified Files: player.cpp Log Message: Added grabbing while ducking. Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.158 retrieving revision 1.159 diff -u -d -r1.158 -r1.159 --- player.cpp 25 Aug 2004 05:47:57 -0000 1.158 +++ player.cpp 4 Sep 2004 21:16:05 -0000 1.159 @@ -767,9 +767,12 @@ // Tux is holding something if ((holding_something && physic.get_velocity_y() == 0) || - shooting_timer.check() && !duck) + shooting_timer.check()) { - tux_body->arms->set_action("grab"); + if (duck) + tux_body->arms->set_action("duck+grab"); + else + tux_body->arms->set_action("grab"); } /* Draw Tux */ |
|
From: Benjamin P. J. <lit...@us...> - 2004-09-04 16:23:33
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1702/data/images Modified Files: supertux.png supertux.xpm Log Message: Changed the Super Tux icons. They no longer show the small tux character with way too big eyes but instead the original small Super Tux character from within the game. I also increased the size of the PNG image icon from 44*44 to 48*48px (standard icon size for big GNOME/KDE panels afaik) Index: supertux.xpm =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.xpm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- supertux.xpm 13 May 2004 23:16:46 -0000 1.1 +++ supertux.xpm 4 Sep 2004 16:22:58 -0000 1.2 @@ -1,497 +1,100 @@ /* XPM */ -static char * icon_xpm[] = { -"32 32 462 2", -" c None", -". c #5AA7EF", -"+ c #66B4FC", -"@ c #5CA9EF", -"# c #5AA6EF", -"$ c #5EB0FC", -"% c #70B8FE", -"& c #66ADF0", -"* c #62ABEF", -"= c #5EA9EF", -"- c #5AA8EF", -"; c #79BEFE", -"> c #6EB2F1", -", c #6BB0F0", -"' c #67AEF0", -") c #5CA7EF", -"! c #82C2FF", -"~ c #78B8F2", -"{ c #73B5F2", -"] c #70B3F3", -"^ c #6CB2F2", -"/ c #68B0F3", -"( c #64ACF1", -"_ c #5FAAF0", -": c #5CA8F0", -"< c #8BC7FF", -"[ c #81BCF3", -"} c #7EBDF7", -"| c #7ABAF6", -"1 c #75B5F2", -"2 c #6FB2EF", -"3 c #6AADED", -"4 c #69B0F4", -"5 c #68B3F8", -"6 c #62AEF5", -"7 c #5CA9F1", -"8 c #5FAEFC", -"9 c #94CDFF", -"0 c #8AC2F6", -"a c #85C2F9", -"b c #77AEE1", -"c c #688DB1", -"d c #5B7186", -"e c #485663", -"f c #283848", -"g c #26415B", -"h c #3F6B96", -"i c #5CA0DE", -"j c #63B1F8", -"k c #5DAAF2", -"l c #5EAFFC", -"m c #A6DBFF", -"n c #93C5F5", -"o c #90C7FB", -"p c #73A1CB", -"q c #515E6A", -"r c #575554", -"s c #4E4B48", -"t c #3E3B38", -"u c #090602", -"v c #020000", -"w c #050100", -"x c #0D1C2A", -"y c #4E8AC0", -"z c #63B1F9", -"A c #63B9FF", -"B c #AFE1FF", -"C c #A2D4FF", -"D c #99CCF9", -"E c #8DBEEC", -"F c #515E6D", -"G c #534F4C", -"H c #555452", -"I c #3E3E3D", -"J c #1C1C1D", -"K c #242321", -"L c #BEBAAA", -"M c #D6D1BF", -"N c #3B342E", -"O c #213950", -"P c #66B1F5", -"Q c #62ADF2", -"R c #63B2FC", -"S c #64B9FF", -"T c #B0DBFF", -"U c #A3CEF6", -"V c #9ECCF6", -"W c #A3D4FF", -"X c #6987A2", -"Y c #434343", -"Z c #575654", -"` c #484848", -" . c #333333", -".. c #070708", -"+. c #969286", -"@. c #FFFFF9", -"#. c #9F9D9D", -"$. c #393638", -"%. c #040A10", -"&. c #5CA1E9", -"*. c #61AEFC", -"=. c #5DAAF4", -"-. c #5BA9F1", -";. c #5FAFFD", -">. c #B9E1FF", -",. c #ABD2F7", -"'. c #A8D0F6", -"). c #A5D1FA", -"!. c #A1CFFA", -"~. c #3B4753", -"{. c #454340", -"]. c #565555", -"^. c #454545", -"/. c #363636", -"(. c #090A0B", -"_. c #BEB6AA", -":. c #FFFFFE", -"<. c #5E595B", -"[. c #0F0E14", -"}. c #3D3000", -"|. c #ABBC85", -"1. c #8FBCC0", -"2. c #6AAEE9", -"3. c #5AAAF9", -"4. c #57A8F6", -"5. c #5BAEFF", -"6. c #C3E5FF", -"7. c #B5D7F7", -"8. c #B0D5F7", -"9. c #ACD2F8", -"0. c #AED7FF", -"a. c #8CB2D3", -"b. c #171C21", -"c. c #474543", -"d. c #545454", -"e. c #3B3B3B", -"f. c #0D0E0F", -"g. c #716B61", -"h. c #DFDFDD", -"i. c #C8C3C4", -"j. c #9D8C68", -"k. c #DDB82A", -"l. c #FFE220", -"m. c #FFE218", -"n. c #FADA2C", -"o. c #D2CA61", -"p. c #AEBF8A", -"q. c #7AAFCA", -"r. c #5CB0FF", -"s. c #CBEAFF", -"t. c #BDDBF8", -"u. c #B9D9F8", -"v. c #B3D7F9", -"w. c #B3DAFF", -"x. c #6F8AA4", -"y. c #0F1012", -"z. c #424241", -"A. c #3F3F3F", -"B. c #323232", -"C. c #0E0E0F", -"D. c #060503", -"E. c #3F3E39", -"F. c #736658", -"G. c #CB9850", -"H. c #E2AB3E", -"I. c #F1BC36", -"J. c #F4BF2B", -"K. c #F0B124", -"L. c #F0B420", -"M. c #DEBB45", -"N. c #91B4B0", -"O. c #5AA8F4", -"P. c #60AFFC", -"Q. c #D5EEFF", -"R. c #C6E0F9", -"S. c #C2DEF8", -"T. c #BDDCF8", -"U. c #B9D9F9", -"V. c #BBDEFF", -"W. c #A6CAE9", -"X. c #29343D", -"Y. c #131211", -"Z. c #3C3B3B", -"`. c #2F2F2F", -" + c #151515", -".+ c #090909", -"++ c #000000", -"@+ c #634222", -"#+ c #84592E", -"$+ c #A07448", -"%+ c #9B9FA5", -"&+ c #80A4CB", -"*+ c #71ACE6", -"=+ c #6BAFF0", -"-+ c #63ADF6", -";+ c #61ABF3", -">+ c #5FAAEF", -",+ c #62B1FC", -"'+ c #DEF3FF", -")+ c #CFE5FA", -"!+ c #CAE2F9", -"~+ c #C6E1F9", -"{+ c #C2E0F8", -"]+ c #C0DFFB", -"^+ c #65798C", -"/+ c #0D0E0D", -"(+ c #323130", -"_+ c #414141", -":+ c #2B2B2B", -"<+ c #0D0D0D", -"[+ c #1B1C1F", -"}+ c #373534", -"|+ c #474C4E", -"1+ c #73B9FC", -"2+ c #71B5F7", -"3+ c #6FB2F4", -"4+ c #6CB1F1", -"5+ c #63ACF0", -"6+ c #5EAAF1", -"7+ c #DBEBFB", -"8+ c #D7E9FA", -"9+ c #D2E8FA", -"0+ c #CEE5FA", -"a+ c #CAE2FA", -"b+ c #C8E2FA", -"c+ c #CAE8FF", -"d+ c #A0BAD1", -"e+ c #1E2021", -"f+ c #2F2E2C", -"g+ c #3E3E3E", -"h+ c #262626", -"i+ c #050505", -"j+ c #9C9C9D", -"k+ c #DFDFDF", -"l+ c #D0D0CF", -"m+ c #93AFCB", -"n+ c #76B3EC", -"o+ c #75B7F2", -"p+ c #74B5F1", -"q+ c #70B3F1", -"r+ c #6CB1F0", -"s+ c #68AEF0", -"t+ c #62ACEF", -"u+ c #60AAEF", -"v+ c #5DA9EF", -"w+ c #DFEDFB", -"x+ c #DDECFB", -"y+ c #D7EAFA", -"z+ c #D3E8FA", -"A+ c #CDE6FB", -"B+ c #C9E1FA", -"C+ c #4D5862", -"D+ c #262422", -"E+ c #4A4A49", -"F+ c #444444", -"G+ c #303030", -"H+ c #0C0C0C", -"I+ c #0B0B0B", -"J+ c #161616", -"K+ c #222222", -"L+ c #959595", -"M+ c #FFFFFF", -"N+ c #FFFEFA", -"O+ c #9CC0E0", -"P+ c #77B7F3", -"Q+ c #79B7F2", -"R+ c #75B5F1", -"S+ c #71B3F1", -"T+ c #6DB1F0", -"U+ c #69AEF0", -"V+ c #65ACEF", -"W+ c #DEEFFB", -"X+ c #D8EAFA", -"Y+ c #D4E8FA", -"Z+ c #D3EAFF", -"`+ c #BAD1E6", -" @ c #30363A", -".@ c #3C3B3A", -"+@ c #505050", -"@@ c #464646", -"#@ c #191919", -"$@ c #1D1D1D", -"%@ c #A0A0A0", -"&@ c #EFEFEF", -"*@ c #FFFEFE", -"=@ c #D7DBDD", -"-@ c #73AEE7", -";@ c #7CBBF6", -">@ c #78B6F4", -",@ c #ECFBFF", -"'@ c #DCECFB", -")@ c #D9EAFA", -"!@ c #D9EFFF", -"~@ c #ACBED2", -"{@ c #262B31", -"]@ c #424142", -"^@ c #555555", -"/@ c #353535", -"(@ c #1B1B1B", -"_@ c #606060", -":@ c #C2C2C2", -"<@ c #FEFEFE", -"[@ c #F3EFEF", -"}@ c #79A8D9", -"|@ c #88C2F4", -"1@ c #7CBAF5", -"2@ c #77B8FA", -"3@ c #76B6F1", -"4@ c #76BCFE", -"5@ c #DFEFFB", -"6@ c #DEEDFD", -"7@ c #CDCD9F", -"8@ c #4D4B30", -"9@ c #373841", -"0@ c #58585A", -"a@ c #3D3D3D", -"b@ c #202020", -"c@ c #232323", -"d@ c #2C2C2C", -"e@ c #8C8C8C", -"f@ c #EBEBEB", -"g@ c #FDFBFF", -"h@ c #B2BC9A", -"i@ c #FFEC23", -"j@ c #BBBA4D", -"k@ c #7ABDFF", -"l@ c #7AB8F1", -"m@ c #DFEFFD", -"n@ c #DCE6EC", -"o@ c #D2BB53", -"p@ c #C5AB1A", -"q@ c #424137", -"r@ c #4E4F59", -"s@ c #3D3D3F", -"t@ c #212121", -"u@ c #0A0A0A", -"v@ c #C5C5C5", -"w@ c #F6F7FF", -"x@ c #BDB348", -"y@ c #E8CC00", -"z@ c #A09532", -"A@ c #7EC0FF", -"B@ c #F0FEFF", -"C@ c #C9C39A", -"D@ c #CFAF25", -"E@ c #D7BD22", -"F@ c #646146", -"G@ c #3B3C44", -"H@ c #2C2D2E", -"I@ c #030303", -"J@ c #383838", -"K@ c #9F9F9F", -"L@ c #828282", -"M@ c #929292", -"N@ c #DEDEDE", -"O@ c #F0F0F0", -"P@ c #FCFCFC", -"Q@ c #D3D5DE", -"R@ c #96833B", -"S@ c #998D48", -"T@ c #8CB5D0", -"U@ c #C6CED3", -"V@ c #99894D", -"W@ c #D2B51F", -"X@ c #C2AF30", -"Y@ c #54533F", -"Z@ c #353640", -"`@ c #2D2D2E", -" # c #242424", -".# c #D7D7D7", -"+# c #CCCCCC", -"@# c #CFCFCF", -"## c #D0D0D0", -"$# c #D5D5D5", -"%# c #E5E5E5", -"&# c #EFEFF0", -"*# c #BDBBB9", -"=# c #877F4A", -"-# c #8FAAB0", -";# c #1B1E23", -"># c #302D28", -",# c #937D25", -"'# c #D8BE23", -")# c #C6B921", -"!# c #454542", -"~# c #282937", -"{# c #141419", -"]# c #1E1E1F", -"^# c #E1E1E1", -"/# c #D2D2D2", -"(# c #D9D9D9", -"_# c #DEDDDE", -":# c #99947E", -"<# c #97B0B0", -"[# c #12141B", -"}# c #463F2B", -"|# c #987F21", -"1# c #EBD319", -"2# c #CEC222", -"3# c #3E3C17", -"4# c #131301", -"5# c #4E4E4F", -"6# c #969696", -"7# c #B5B5B5", -"8# c #C0C0C1", -"9# c #B7B7B9", -"0# c #B7B6B5", -"a# c #9D9E92", -"b# c #97AEB4", -"c# c #000001", -"d# c #141515", -"e# c #726841", -"f# c #A78F1F", -"g# c #D7C20D", -"h# c #D5CA04", -"i# c #CEC402", -"j# c #8C8402", -"k# c #070400", -"l# c #000002", -"m# c #1F1F23", -"n# c #36311E", -"o# c #615F46", -"p# c #92A7AE", -"q# c #B3AD88", -"r# c #7D6A1A", -"s# c #87730D", -"t# c #9C890D", -"u# c #A69A2C", -"v# c #8F9795", -"w# c #8594A6", -"x# c #7E8D99", -"y# c #4D4319", -"z# c #493B03", -"A# c #645001", -"B# c #A2AD9A", -"C# c #EEFFFF", -"D# c #EBFDFF", -"E# c #E6FAFF", -"F# c #E1F8FF", -"G# c #DEF5FF", -"H# c #DCF4FF", -"I# c #DBF5FF", -"J# c #D9F6FF", -"K# c #D4F4FF", -"L# c #CBEEFF", -"M# c #E4F0FC", -"N# c #E2EEFB", -"O# c #D9EBFB", -"P# c #D4E8FB", -"Q# c #D1E6FA", -"R# c #CDE4FA", -"S# c #C8E2F9", -"T# c #F0FDFF", -"U# c #E1EFFB", -"V# c #DEEDFB", -"W# c #D5E9FB", -"X# c #E6F0FC", -"Y# c #E2EFFC", -"Z# c #DEEDFC", -"`# c #DAEBFB", -" $ c #E5F1FC", -".$ c #E2F0FC", -" . . ", -" + @ # $ ", -" % & * = - $ ", -" ; > , ' * = ) $ ", -" ! ~ { ] ^ / ( _ : $ ", -" < [ } | 1 2 3 4 5 6 7 8 ", -" 9 0 a b c d e f g h i j k l ", -" m n o p q r s t u v w x y z : A ", -" B C D E F G H I J K L M N O P Q R S ", -" T U V W X Y Z ` ...+.@.#.$.%.&.*.=.-.;. ", -" >.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5. ", -" 6.7.8.9.0.a.b.c.d.` e.f.g.h.i.j.k.l.m.n.o.p.q.r. ", -" s.t.u.7.v.w.x.y.z.A.B.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P. ", -" Q.R.S.T.U.V.W.X.Y.Z.`. +.+++++++++@+#+$+%+&+*+=+-+;+>+,+ ", -" '+)+!+~+{+]+6.^+/+(+_+:+<+++++++++++[+}+|+2 1+2+3+4+' 5+6+,+ ", -"7+8+9+0+a+b+c+d+e+f+Y g+h+i+++++++++ +j+k+l+m+n+o+p+q+r+s+t+u+v+", -"w+x+y+z+)+A+B+C+D+E+F+A.G+H+I+J+++K+L+M+M+M+N+O+P+Q+R+S+T+U+V+u+", -" W+x+X+Y+Z+`+ @.@+@@@g+#@++++$@Y %@&@M+M+*@M+=@-@;@>@1 S+T+U+ ", -" ,@'@)@!@~@{@]@^@@@/@(@I+++++_@:@&@M+M+<@M+[@}@|@1@2@3@4@ ", -" 5@6@5@7@8@9@0@a@b@<+$@c@++++d@e@f@M+<@M+g@h@i@j@k@l@ ", -" m@n@o@p@q@r@s@t@u@H+A.B.++++G+v@M+M+M+w@x@y@z@A@ ", -" B@C@D@E@F@G@H@#@++I@J@K@L@M@N@O@P@<@Q@R@S@T@ ", -" U@V@W@X@Y@Z@`@I+++ #.#+#@###$#%#&#*#=#-# ", -" ;#>#,#'#)#!#~#{#++]#@#^#^#$#/#(#_#:#<# ", -" ++[#}#|#1#2#3#4#++++5#6#7#8#9#0#a#b# ", -" c#d#e#f#g#h#i#j#k#++++l#m#n#o#p# ", -" q#r#s#t#u#v#w#x#y#z#A#B# ", -" C#D#E#F#G#H#I#J#K#L# ", -" M#N#x+O#P#Q#R#S# ", -" T#U#V#O#W#H# ", -" X#Y#Z#`# ", -" $.$ "}; +static char * supertux_xpm[] = { +"32 32 65 1", +" c None", +". c #020400", +"+ c #10120F", +"@ c #1E1D02", +"# c #1A1B19", +"$ c #262827", +"% c #333534", +"& c #413517", +"* c #3C342A", +"= c #424341", +"- c #514714", +"; c #52492B", +"> c #444A4F", +", c #3D4D60", +"' c #51524F", +") c #5C5E5B", +"! c #5A646F", +"~ c #696648", +"{ c #7A6A1D", +"] c #55708B", +"^ c #8E6635", +"/ c #7D7232", +"( c #70716E", +"_ c #597E9E", +": c #978123", +"< c #908234", +"[ c #6D8297", +"} c #A3783C", +"| c #838481", +"1 c #9C8E14", +"2 c #9A9072", +"3 c #BF8940", +"4 c #939490", +"5 c #A79D3A", +"6 c #929799", +"7 c #84A2BB", +"8 c #72A6DC", +"9 c #AC9B7E", +"0 c #6BA7F2", +"a c #BFA525", +"b c #6DB1F1", +"c c #B9A960", +"d c #A7A7A1", +"e c #8AB7E1", +"f c #A1BBA6", +"g c #88BBF1", +"h c #DFB23E", +"i c #9EB9CE", +"j c #D3C30E", +"k c #CEBE46", +"l c #B3C396", +"m c #DAC437", +"n c #C2C985", +"o c #C0C2BF", +"p c #A2CBF4", +"q c #ECCB2C", +"r c #E5DA1D", +"s c #CDCDB4", +"t c #B7D4ED", +"u c #D0D2CF", +"v c #D3DAE1", +"w c #C7E2F7", +"x c #DFE1DD", +"y c #EAECE9", +"z c #FAFCF9", +" ", +" gg ", +" gppg ", +" eppeeg ", +" e7[!,]_8 ", +" ])'=%#..$, ", +" [>)'=$+++.._ ", +" 7!''=%#%|6!.,8 ", +" p!>)>=$$>v|.+#78 ", +" pi%=''=%#'u..&:knlf ", +" pw7$=>=>%##'%:amqqqmmm ", +" ptt]#%=%%$...+^3hhqhhhk ", +" twt7%#%%$.#....*^}}9di7g ", +" pwwt,#%=%$.......#*'ebbbb0 ", +" twwt6$$>%$#......=|d67ggbgb0 ", +" twww7,%===%#.....$4vzzxegbbbb0 ", +" pwww[$=>==$#..+#=|xzzzzvebbbb0 ", +" twv>%='=%$...$'4uyzzzzzi8bb0 ", +" pt,%'>=%#...#>|vyzzzzziei8 ", +" ps~%''%$######$(yzzzzzunrk ", +" ch/''=$###$$$##6yzzzzsmj1 ", +" cam^'%%##.#)!)=6vyzzzdk: ", +" <ah/=%$#..(oooovxyyx2< ", +" ;/am^=%$..!douvouvvu2 ", +" .#;<am<%#..$6vuuvuuu2 ", +" .+$-:qr{-@..$(ddd4d4 ", +" ..#-:ajjm1...##$*; ", +" {{:11<[]]'&-{ ", +" gppppg ", +" gppg ", +" gg ", +" "}; Index: supertux.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsDYFvP1 and /tmp/cvsvGQk9p differ |
|
From: Benjamin P. J. <lit...@us...> - 2004-09-04 16:04:02
|
Update of /cvsroot/super-tux/supertux/data/images/shared/bigtux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30409/data/images/shared/bigtux Modified Files: arms-duck+grab-0.png Log Message: Updated the image as it contained some pixels that were 'not ment to be'. Index: arms-duck+grab-0.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/bigtux/arms-duck+grab-0.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsp9HaW1 and /tmp/cvs6p2Dkm differ |
|
From: Benjamin P. J. <lit...@us...> - 2004-09-04 15:59:20
|
Update of /cvsroot/super-tux/supertux/data/images/shared/bigtux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29430/data/images/shared/bigtux Added Files: feet-duck-0.png head-duck-0.png body-duck-0.png arms-duck-0.png arms-duck+grab-0.png Log Message: - Added images for ducking big Super Tux. --- NEW FILE: feet-duck-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-duck-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: body-duck-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arms-duck+grab-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: head-duck-0.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-09-04 14:59:03
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18039/data/images Modified Files: supertux.strf Log Message: Fixed Tux Y-offset, according to Benjamin's position. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- supertux.strf 30 Aug 2004 19:10:47 -0000 1.6 +++ supertux.strf 4 Sep 2004 14:58:54 -0000 1.7 @@ -7,10 +7,10 @@ (name "big-tux-arms") (action - (name "walk") (apply-mask 0 0 255 60) + (name "walk") (fps 15.0) (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/arms-walk-0.png" "shared/bigtux/arms-walk-1.png" "shared/bigtux/arms-walk-2.png" @@ -22,88 +22,88 @@ (name "stand") (fps 15.0) (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/arms-stand-0.png")) (action (name "jump") (fps 15.0) (x-offset 5) - (y-offset 7) + (y-offset 60) (images "shared/bigtux/arms-jump-0.png")) (action (name "skid") (x-offset 6) - (y-offset 8) + (y-offset 61) (images "shared/bigtux/arms-skid-0.png")) (action (name "kick") (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/arms-stand-0.png")) (action (name "buttjump") (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/arms-stand-0.png")) ; Grabbing is arms specific! (action (name "grab") (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/arms-grab-0.png"))) ;; Big Tux Head (sprite (name "big-tux-head") (action - (name "walk") (apply-mask 0 0 255 60) + (name "walk") (fps 15.0) (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/head-stand-0.png")) (action (name "stand") (fps 15.0) (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/head-stand-0.png")) (action (name "jump") (fps 15.0) (x-offset 5) - (y-offset 7) + (y-offset 60) (images "shared/bigtux/head-stand-0.png")) (action (name "skid") (x-offset 6) - (y-offset 8) + (y-offset 61) (images "shared/bigtux/head-skid-0.png")) (action (name "kick") (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/head-stand-0.png")) (action (name "buttjump") (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/head-stand-0.png")) (action (name "idle") (fps 1.0) (x-offset 6) - (y-offset 8) + (y-offset 61) (images "shared/bigtux/head-idle-blink-0.png" "shared/bigtux/head-idle-blink-1.png"))) @@ -112,52 +112,52 @@ (sprite (name "big-tux-body") (action - (name "walk") (apply-mask 0 0 255 60) + (name "walk") (fps 15.0) (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/body-stand-0.png")) (action (name "stand") (fps 15.0) (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/body-stand-0.png")) (action (name "jump") (fps 15.0) (x-offset 5) - (y-offset 7) + (y-offset 60) (images "shared/bigtux/body-stand-0.png")) (action (name "skid") (x-offset 6) - (y-offset 8) + (y-offset 61) (images "shared/bigtux/body-skid-0.png")) (action (name "kick") (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/body-stand-0.png")) (action (name "buttjump") (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/body-stand-0.png"))) ;; Big Tux Feet (sprite (name "big-tux-feet") (action - (name "walk") (apply-mask 0 0 255 60) + (name "walk") (fps 15.0) (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/feet-walk-0.png" "shared/bigtux/feet-walk-1.png" "shared/bigtux/feet-walk-2.png" @@ -169,32 +169,32 @@ (name "stand") (fps 15.0) (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/feet-stand-0.png")) (action (name "jump") (fps 15.0) (x-offset 5) - (y-offset 7) + (y-offset 60) (images "shared/bigtux/feet-jump-0.png")) (action (name "skid") (x-offset 6) - (y-offset 8) + (y-offset 61) (images "shared/bigtux/feet-skid-0.png")) (action (name "kick") (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/feet-kick-0.png")) (action (name "buttjump") (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/feet-buttjump-0.png"))) ; End of Big Tux (no power) sprite @@ -204,49 +204,49 @@ (sprite (name "big-fire-tux-head") (action - (name "walk") (apply-mask 0 0 255 60) + (name "walk") (fps 15.0) (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "stand") (fps 15.0) (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "jump") (fps 15.0) (x-offset 5) - (y-offset 7) + (y-offset 60) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "skid") (x-offset 6) - (y-offset 8) + (y-offset 61) (images "shared/bigtux/head-skid-0.png")) (action (name "kick") (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "buttjump") (x-offset 5) - (y-offset 9) + (y-offset 62) (images "shared/bigtux/head-fire-stand-0.png")) (action (name "idle") (fps 1.0) (x-offset 6) - (y-offset 8) + (y-offset 61) (images "shared/bigtux/head-idle-blink-0.png" "shared/bigtux/head-idle-blink-1.png"))) |
|
From: Benjamin P. J. <lit...@us...> - 2004-09-04 14:40:15
|
Update of /cvsroot/super-tux/supertux/data/images/fonts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14854/data/images/fonts Modified Files: gold.png gray.png blue.png Log Message: - Added colorized versions of the 'new' extended font which features Latin Extended-A characters. Index: gray.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/fonts/gray.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsFE8W7X and /tmp/cvs0UrdCv differ Index: blue.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/fonts/blue.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsLSEQib and /tmp/cvsax8fUI differ Index: gold.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/fonts/gold.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsEBkZhd and /tmp/cvspcsUWK differ |
|
From: Benjamin P. J. <lit...@us...> - 2004-09-04 14:28:21
|
Update of /cvsroot/super-tux/supertux/data/images/fonts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13134/data/images/fonts Modified Files: white.png white-small.png white-big.png Log Message: - Added Latin Extended-A characters to all the white letters (U+0100 to U+017F). - Small white letters (white-small.png) now support Latin1 + Latin Ext.-A. The old 'ATARI-like' letters are no longer used for the small font but instead a modified version of the big font is being used. - Guillemets (right & left) are a bit smaller now (someone did complain that they were wrong otherwise) Index: white-big.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/fonts/white-big.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsN4JvrT and /tmp/cvswOm4CI differ Index: white.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/fonts/white.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsx4rkLX and /tmp/cvsmRnzZM differ Index: white-small.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/fonts/white-small.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsK0jmi3 and /tmp/cvsRMIlBS differ |
|
From: Benjamin P. J. <lit...@us...> - 2004-09-04 14:01:07
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9436 Modified Files: WORLDMAPDESIGN Log Message: - Fixed a typo (this -> these) - Content now fits nicely into a 80 characters wide window. Index: WORLDMAPDESIGN =================================================================== RCS file: /cvsroot/super-tux/supertux/WORLDMAPDESIGN,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- WORLDMAPDESIGN 26 Aug 2004 23:05:52 -0000 1.1 +++ WORLDMAPDESIGN 4 Sep 2004 14:00:56 -0000 1.2 @@ -2,7 +2,7 @@ - World Map editing for SuperTux - http://super-tux.sf.net/ -Last update: August 26, 2004 +Last update: September 4, 2004 This document describes how to edit a world map. @@ -13,8 +13,8 @@ = AVAILABLE SPECIAL TILES = -This are the available special tiles (even if 0_1_1 branch has some of them, they -will most likely have different names or used in another way): +These are the available special tiles (even if 0_1_1 branch has some of them, +they will most likely have different names or used in another way): ; This is a comment! @@ -40,8 +40,8 @@ (passive-message #t) ; Apply action only in this/these direction(s) [WORKS FOR: passive-message] - -; default: true for all - possible values: north/south/east/west. More than one can -; be used with a separator or not +; default: true for all - possible values: north/south/east/west. +; More than one can be used with a separator or not (apply-to-direction "north-east") ; Add a teleporter tile to |
|
From: Benjamin P. J. <lit...@us...> - 2004-09-04 13:53:53
|
Update of /cvsroot/super-tux/supertux/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8313/data Modified Files: supertux.desktop Log Message: Added german translations to the Supertux Desktop Entry file Lines 'Name[de]=(...)' & 'Comment[de]=(...)' have been inserted. Index: supertux.desktop =================================================================== RCS file: /cvsroot/super-tux/supertux/data/supertux.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- supertux.desktop 13 May 2004 23:16:45 -0000 1.1 +++ supertux.desktop 4 Sep 2004 13:53:44 -0000 1.2 @@ -1,10 +1,11 @@ [Desktop Entry] Encoding=UTF-8 Name=SuperTux Platform Game +Name[de]=SuperTux Jump&Run Spiel Comment=A Super Mario inspired penguin platform game +Comment[de]=Ein von Super Mario inspiriertes Pinguin Jump&Run Spiel Exec=supertux Terminal=false Type=Application Categories=Application;Game;ArcadeGame -Icon=supertux.png - +Icon=supertux.png \ No newline at end of file |
|
From: Ricardo C. <rm...@us...> - 2004-09-01 11:40:36
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27571/data/images/shared Modified Files: flamefish-down-0.png flamefish-left-0.png flamefish-left-1.png Log Message: Added alpha transparency rather than a black background by Daniel Alston! Index: flamefish-left-1.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/flamefish-left-1.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvssn8HDZ and /tmp/cvs8WixyM differ Index: flamefish-left-0.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/flamefish-left-0.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvskuep89 and /tmp/cvstPCe7W differ Index: flamefish-down-0.png =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/shared/flamefish-down-0.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsii9HYe and /tmp/cvsgyTH01 differ |
|
From: Ricardo C. <rm...@us...> - 2004-08-30 19:11:23
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2526/src Modified Files: badguy.cpp badguy.h Log Message: Added flame fish. Index: badguy.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.h,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- badguy.h 26 Jul 2004 18:09:13 -0000 1.61 +++ badguy.h 30 Aug 2004 19:11:14 -0000 1.62 @@ -50,6 +50,7 @@ BAD_STALACTITE, BAD_FLAME, BAD_FISH, + BAD_FLAMEFISH, BAD_BOUNCINGSNOWBALL, BAD_FLYINGSNOWBALL, BAD_SPIKY, Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.115 retrieving revision 1.116 diff -u -d -r1.115 -r1.116 --- badguy.cpp 29 Aug 2004 17:29:32 -0000 1.115 +++ badguy.cpp 30 Aug 2004 19:11:14 -0000 1.116 @@ -59,6 +59,8 @@ Sprite* img_fish_down; Sprite* img_fish_iced; Sprite* img_fish_iced_down; +Sprite* img_flamefish; +Sprite* img_flamefish_down; Sprite* img_bouncingsnowball_left; Sprite* img_bouncingsnowball_right; Sprite* img_bouncingsnowball_squished; @@ -93,6 +95,8 @@ return BAD_FLAME; else if (str == "fish") return BAD_FISH; + else if (str == "flamefish") + return BAD_FLAMEFISH; else if (str == "bouncingsnowball") return BAD_BOUNCINGSNOWBALL; else if (str == "flyingsnowball") @@ -133,6 +137,9 @@ case BAD_FISH: return "fish"; break; + case BAD_FLAMEFISH: + return "flamefish"; + break; case BAD_BOUNCINGSNOWBALL: return "bouncingsnowball"; break; @@ -207,7 +214,7 @@ // if we're in a solid tile at start correct that now if(Sector::current()) { - if(kind != BAD_FLAME && kind != BAD_FISH && collision_object_map(base)) + if(kind != BAD_FLAME && kind != BAD_FISH && kind != BAD_FLAMEFISH && collision_object_map(base)) { std::cout << "Warning: badguy started in wall: kind: " << badguykind_to_string(kind) << " pos: (" << base.x << ", " << base.y << ")" << std::endl; @@ -281,6 +288,9 @@ } else if(kind == BAD_FISH) { set_sprite(img_fish, img_fish); physic.enable_gravity(true); + } else if(kind == BAD_FLAMEFISH) { + set_sprite(img_flamefish, img_flamefish); + physic.enable_gravity(true); } else if(kind == BAD_FLYINGSNOWBALL) { set_sprite(img_flyingsnowball, img_flyingsnowball); physic.enable_gravity(false); @@ -658,7 +668,10 @@ else if(mode == FISH_WAIT && !timer.check()) { // jump again - set_sprite(img_fish, img_fish); + if(kind == BAD_FISH) + set_sprite(img_fish, img_fish); + else // BAD_FLAMEFISH + set_sprite(img_flamefish, img_flamefish); mode = NORMAL; physic.set_velocity(0, JUMPV); physic.enable_gravity(true); @@ -669,7 +682,12 @@ collision_swept_object_map(&old_base, &base); if(physic.get_velocity_y() < 0) - set_sprite(img_fish_down, img_fish_down); + { + if(kind == BAD_FISH) + set_sprite(img_fish_down, img_fish_down); + else // BAD_FLAMEFISH + set_sprite(img_flamefish_down, img_flamefish_down); + } } void @@ -913,6 +931,7 @@ break; case BAD_FISH: + case BAD_FLAMEFISH: action_fish(elapsed_time); break; @@ -1001,7 +1020,7 @@ { // these can't be bumped if(kind == BAD_FLAME || kind == BAD_BOMB || kind == BAD_FISH - || kind == BAD_FLYINGSNOWBALL) + || kind == BAD_FLAMEFISH || kind == BAD_FLYINGSNOWBALL) return; physic.set_velocity_y(3); @@ -1079,7 +1098,7 @@ } return; - } else if(kind == BAD_FISH) { + } else if(kind == BAD_FISH || kind == BAD_FLAMEFISH) { // fish can only be killed when falling down if(physic.get_velocity_y() >= 0) return; @@ -1206,12 +1225,13 @@ if(pbullet_c->kind == FIRE_BULLET) { - if (kind != BAD_BOMB && kind != BAD_STALACTITE && kind != BAD_FLAME) + if (kind != BAD_BOMB && kind != BAD_STALACTITE && kind != BAD_FLAME + && kind != BAD_FLAMEFISH) kill_me(10); } else if(pbullet_c->kind == ICE_BULLET) { - if(kind == BAD_FLAME) + if(kind == BAD_FLAME || kind == BAD_FLAMEFISH) kill_me(10); else frozen_timer.start(FROZEN_TIME); @@ -1273,7 +1293,8 @@ // Jumpy, fish, flame, stalactites, wingling are exceptions if (pbad_c->kind == BAD_JUMPY || pbad_c->kind == BAD_FLAME - || pbad_c->kind == BAD_STALACTITE || pbad_c->kind == BAD_FISH) + || pbad_c->kind == BAD_STALACTITE || pbad_c->kind == BAD_FISH + || pbad_c->kind == BAD_FLAMEFISH) break; // Bounce off of other badguy if we land on top of him @@ -1373,6 +1394,8 @@ img_fish_down = sprite_manager->load("fish-down"); img_fish_iced = sprite_manager->load("fish-iced"); img_fish_iced_down = sprite_manager->load("fish-iced-down"); + img_flamefish = sprite_manager->load("flamefish"); + img_flamefish_down = sprite_manager->load("flamefish-down"); img_bouncingsnowball_left = sprite_manager->load("bouncingsnowball-left"); img_bouncingsnowball_right = sprite_manager->load("bouncingsnowball-right"); img_bouncingsnowball_squished = sprite_manager->load("bouncingsnowball-squished"); |
|
From: Ricardo C. <rm...@us...> - 2004-08-30 19:11:02
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2433/data/images Modified Files: supertux.strf Log Message: Added images to strf file. Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- supertux.strf 21 Aug 2004 11:47:06 -0000 1.5 +++ supertux.strf 30 Aug 2004 19:10:47 -0000 1.6 @@ -7,7 +7,7 @@ (name "big-tux-arms") (action - (name "walk") + (name "walk") (apply-mask 0 0 255 60) (fps 15.0) (x-offset 5) (y-offset 9) @@ -61,7 +61,7 @@ (sprite (name "big-tux-head") (action - (name "walk") + (name "walk") (apply-mask 0 0 255 60) (fps 15.0) (x-offset 5) (y-offset 9) @@ -112,7 +112,7 @@ (sprite (name "big-tux-body") (action - (name "walk") + (name "walk") (apply-mask 0 0 255 60) (fps 15.0) (x-offset 5) (y-offset 9) @@ -154,7 +154,7 @@ (sprite (name "big-tux-feet") (action - (name "walk") + (name "walk") (apply-mask 0 0 255 60) (fps 15.0) (x-offset 5) (y-offset 9) @@ -204,7 +204,7 @@ (sprite (name "big-fire-tux-head") (action - (name "walk") + (name "walk") (apply-mask 0 0 255 60) (fps 15.0) (x-offset 5) (y-offset 9) @@ -430,7 +430,7 @@ (sprite (name "mrbomb-ticking-right") (action (fps 15.0) - (x-offset 10) + (x-offset 255) (y-offset 8) (images "shared/mrbombx-right-0.png" "shared/mrbombx-right-1.png"))) @@ -485,6 +485,19 @@ (y-offset 11) (images "shared/fish-iced-down-0.png"))) + (sprite (name "flamefish") + (action + (x-offset 2) + (y-offset 3) + (images "shared/flamefish-left-0.png" + "shared/flamefish-left-1.png"))) + + (sprite (name "flamefish-down") + (action + (x-offset 2) + (y-offset 11) + (images "shared/flamefish-down-0.png"))) + (sprite (name "bouncingsnowball-left") (action (x-offset 1) @@ -529,26 +542,26 @@ (sprite (name "spiky-left") (action (x-offset 6) - (y-offset 10) + (y-offset 255) (images "shared/spiky-left-0.png" "shared/spiky-left-1.png" "shared/spiky-left-2.png"))) (sprite (name "spiky-right") (action (x-offset 6) - (y-offset 10) + (y-offset 255) (images "shared/spiky-right-0.png" "shared/spiky-right-1.png" "shared/spiky-right-2.png"))) (sprite (name "spiky-iced-left") (action (x-offset 6) - (y-offset 10) + (y-offset 255) (images "shared/spiky-iced-left-0.png"))) (sprite (name "spiky-iced-right") (action (x-offset 6) - (y-offset 10) + (y-offset 255) (images "shared/spiky-iced-right-0.png"))) (sprite (name "snowball-left") @@ -603,7 +616,7 @@ (action (x-offset 12) (x-offset 12) - (fps 20) + (fps 255) (images "shared/firebullet-1.png" "shared/firebullet-2.png" "shared/firebullet-3.png" @@ -612,7 +625,7 @@ (action (x-offset 12) (x-offset 12) - (fps 20) + (fps 255) (images "shared/icebullet-1.png"))) ; Trampoline (sprite (name "trampoline") |
|
From: Ricardo C. <rm...@us...> - 2004-08-30 19:09:47
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1998/data/images/shared Added Files: flamefish-down-0.png flamefish-left-0.png flamefish-left-1.png Log Message: Added red fish images. Artists: replace this by a boned one. --- NEW FILE: flamefish-left-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: flamefish-left-0.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: flamefish-down-0.png --- (This appears to be a binary file; contents omitted.) |
|
From: Ricardo C. <rm...@us...> - 2004-08-29 17:29:41
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32761/src Modified Files: badguy.cpp Log Message: Ice fire destroys flame. Index: badguy.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy.cpp,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- badguy.cpp 14 Aug 2004 11:50:58 -0000 1.114 +++ badguy.cpp 29 Aug 2004 17:29:32 -0000 1.115 @@ -1211,9 +1211,9 @@ } else if(pbullet_c->kind == ICE_BULLET) { - //if(kind == BAD_FLAME) - // kill_me(10); - //else + if(kind == BAD_FLAME) + kill_me(10); + else frozen_timer.start(FROZEN_TIME); } break; |
|
From: Ryan F. <sik...@us...> - 2004-08-27 21:01:35
|
Update of /cvsroot/super-tux/htdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29671 Modified Files: screenshots.xml Log Message: - reworded screenshots section Index: screenshots.xml =================================================================== RCS file: /cvsroot/super-tux/htdocs/screenshots.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- screenshots.xml 26 Aug 2004 19:15:16 -0000 1.9 +++ screenshots.xml 27 Aug 2004 21:01:23 -0000 1.10 @@ -8,10 +8,10 @@ <subsection title="SuperTux 0.1.2"> <p> - This is a release for the hardcore players. We were asked to make more - levels and harder levels, so here's our answer. This version has a - brand new Bonus Island map, new map features, a new enemy and some new - tiles. + This is a release for the big SuperTux fans. We were asked to make more + levels, making some more challenging, so here's our answer. This + version has a brand new Bonus Island map, new map features, a new enemy + and some new tiles. </p> <center> |
248 messages has been excluded from this view by a project administrator.
