From e1c9b4aa6ae0d46827ee614f9121f5d84fdffc51 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tobias=20Gl=C3=A4=C3=9Fer?= Date: Mon, 15 Mar 2004 17:45:29 +0000 Subject: [PATCH] update SVN-Revision: 244 --- ChangeLog | 23 +++++++++++++++++++---- INSTALL | 4 ++-- README | 4 ++-- TODO.txt | 8 +++++--- data/CREDITS | 4 ++-- src/badguy.c | 3 +++ src/defines.h | 4 ++-- src/gameloop.c | 2 +- src/gameloop.h | 4 ++-- src/globals.h | 2 +- src/intro.c | 2 +- src/intro.h | 2 +- src/leveleditor.c | 5 +++-- src/leveleditor.h | 3 ++- src/menu.c | 2 +- src/screen.c | 2 +- src/screen.h | 2 +- src/setup.c | 2 +- src/setup.h | 2 +- src/sound.c | 2 +- src/sound.h | 2 +- src/supertux.c | 2 +- src/title.c | 2 +- src/title.h | 2 +- 24 files changed, 56 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed1774e6c..3bd47e197 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,12 +5,27 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ -0.0.6 - current CVS version +0.0.6 - March 15th, 2004 --------------------------- + * Levels can have own gravity settings. + Tobias Glaesser + + * Created Level 4 (Tux in Sky) + Ricardo Cruz + + * Created Level 3 (Mondo) + Philippe Saint-Pierre + + * New collision detection. (object vs. map) + Tobias Glaesser + + * Nice level-editor help text. + Christopher A. Webber + * Compiling with g++ is supported. Tobias Glaesser - * Added realistic physic. Only implemented for the bad money atm. + * Added realistic physics. Tobias Glaesser * Created new letters. @@ -95,7 +110,7 @@ http://www.newbreedsoftware.com/supertux/ (FIXME: Pause doesn't work properly for now) Tobias Glaesser - * Introduced highly experimental OpenGL mode. + * Added OpenGL mode. Tobias Glaesser * Restructured much code or even all code of SuperTux in an object orientated way. @@ -114,7 +129,7 @@ http://www.newbreedsoftware.com/supertux/ * Fixed possible segfaults. Tobias Glaesser - * Reorganized level-code and introced level-subset-structure. + * Reorganized level-code and introduced level-subset-structure. Tobias Glaesser * Fixed Amiga/MorphOS build problem. diff --git a/INSTALL b/INSTALL index f75a7287b..d5712ce1a 100644 --- a/INSTALL +++ b/INSTALL @@ -4,9 +4,9 @@ by Bill Kendrick bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ -Version 0.0.6 (in development) +Version 0.0.6 -December 26th, 2003 +December 15, 2004 REQUIREMENTS diff --git a/README b/README index ec7973334..b7b40f2b5 100644 --- a/README +++ b/README @@ -4,9 +4,9 @@ by Bill Kendrick bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ -Version 0.0.6 (in development) +Version 0.0.6 -December 26th, 2003 +March 15, 2004 NOTICE! THIS GAME IS UNDER CONSTRUCTION! diff --git a/TODO.txt b/TODO.txt index f539a379d..7d8ef3065 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,12 +1,12 @@ TODO.txt for Super Tux -by Bill Kendrick +by Bill Kendrick & Tobias Glaesser bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ -Version 0.0.6 (in development) +Version 0.0.6 -December 26th, 2003 +March 15, 2004 TO DO @@ -17,6 +17,8 @@ TO DO More levels Play as Gown, rescuing Tux + Note: Use our mailing-list to find out what is really to do. + DONE ----- One-ups, End game on game over (by Tobias Glaesser ) diff --git a/data/CREDITS b/data/CREDITS index 8088f1049..fcba95dec 100644 --- a/data/CREDITS +++ b/data/CREDITS @@ -1,7 +1,7 @@ CREDITS for Super Tux - Version 0.0.6 (in development) - January 1st, 2004 + Version 0.0.6 + March 15, 2004 Developers diff --git a/src/badguy.c b/src/badguy.c index c6b47727b..29f19c1b1 100644 --- a/src/badguy.c +++ b/src/badguy.c @@ -331,7 +331,10 @@ void badguy_action(bad_guy_type* pbad) if (pbad->mode == FLAT && pbad->mode != HELD) { if(!timer_check(&pbad->timer)) + { pbad->mode = NORMAL; + pbad->base.xm = 4; + } } else if (pbad->mode == KICK) { diff --git a/src/defines.h b/src/defines.h index 899da1c96..5beafb0ce 100644 --- a/src/defines.h +++ b/src/defines.h @@ -3,11 +3,11 @@ Super Tux - by Bill Kendrick + by Bill Kendrick & Tobias Glaesser bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 11, 2000 - February 1, 2004 + April 11, 2000 - March 15, 2004 */ diff --git a/src/gameloop.c b/src/gameloop.c index d1de9eeb3..5a39f066e 100644 --- a/src/gameloop.c +++ b/src/gameloop.c @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 11, 2000 - February 1st, 2004 + April 11, 2000 - March 15, 2004 */ #include diff --git a/src/gameloop.h b/src/gameloop.h index 0c23c95e4..8dd56caf0 100644 --- a/src/gameloop.h +++ b/src/gameloop.h @@ -3,11 +3,11 @@ Super Tux - Game Loop! - by Bill Kendrick + by Bill Kendrick & Tobias Glaesser bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 11, 2000 - Junuary 1st, 2004 + April 11, 2000 - March 15, 2004 */ #ifndef SUPERTUX_GAMELOOP_H diff --git a/src/globals.h b/src/globals.h index 09f892d39..8695868ff 100644 --- a/src/globals.h +++ b/src/globals.h @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 11, 2000 - April 21, 2000 + April 11, 2000 - March 15, 2004 */ diff --git a/src/intro.c b/src/intro.c index b0db71c3f..c608d807b 100644 --- a/src/intro.c +++ b/src/intro.c @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 11, 2000 - February 1st, 2004 + April 11, 2000 - March 15, 2004 */ #include diff --git a/src/intro.h b/src/intro.h index 0080138e8..c49187ae6 100644 --- a/src/intro.h +++ b/src/intro.h @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 11, 2000 - April 11, 2000 + April 11, 2000 - March 15, 2004 */ int intro(void); diff --git a/src/leveleditor.c b/src/leveleditor.c index 1882e6814..6da610c95 100644 --- a/src/leveleditor.c +++ b/src/leveleditor.c @@ -7,10 +7,11 @@ * * ***************************************************************************/ -/* December 28, 2003 - February 1st, 2004 */ +/* December 28, 2003 - March 15, 2004 */ /* leveleditor.c - A built-in level editor for SuperTux - by Ricardo Cruz */ + Ricardo Cruz + Tobias Glaesser */ #include #include diff --git a/src/leveleditor.h b/src/leveleditor.h index 0317e8bfc..8c83582d7 100644 --- a/src/leveleditor.h +++ b/src/leveleditor.h @@ -10,7 +10,8 @@ /* December 28, 2003 - February 1st, 2004 */ /* leveleditor.h - A built-in level editor for SuperTux - by Ricardo Cruz */ + Ricardo Cruz + Tobias Glaesser */ #ifndef SUPERTUX_LEVELEDITOR_H #define SUPERTUX_LEVELEDITOR_H diff --git a/src/menu.c b/src/menu.c index f3c1604c7..edfb20517 100644 --- a/src/menu.c +++ b/src/menu.c @@ -7,7 +7,7 @@ tobi.web@gmx.de http://www.newbreedsoftware.com/supertux/ - December 20, 2003 - December 30, 2003 + December 20, 2003 - March 15, 2004 */ #ifdef LINUX diff --git a/src/screen.c b/src/screen.c index 86e83a458..40d1e7bdf 100644 --- a/src/screen.c +++ b/src/screen.c @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 11, 2000 - April 22, 2000 + April 11, 2000 - March 15, 2004 */ #include diff --git a/src/screen.h b/src/screen.h index f8c73eb1f..b32bd8ff5 100644 --- a/src/screen.h +++ b/src/screen.h @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 11, 2000 - February 1, 2004 + April 11, 2000 - March 15, 2004 */ #ifndef SUPERTUX_SCREEN_H diff --git a/src/setup.c b/src/setup.c index 32d7f2f4c..ecc64baec 100644 --- a/src/setup.c +++ b/src/setup.c @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 11, 2000 - February 1st, 2004 + April 11, 2000 - March 15, 2004 */ #include diff --git a/src/setup.h b/src/setup.h index 60154cb96..9e2ff62a4 100644 --- a/src/setup.h +++ b/src/setup.h @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 11, 2000 - April 13, 2000 + April 11, 2000 - March 15, 2004 */ #ifndef SUPERTUX_SETUP_H diff --git a/src/sound.c b/src/sound.c index 8766094c7..172148f6d 100644 --- a/src/sound.c +++ b/src/sound.c @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 22, 2000 - December 28, 2003 + April 22, 2000 - March 15, 2004 */ #include "defines.h" diff --git a/src/sound.h b/src/sound.h index 48a26a376..57e17a19f 100644 --- a/src/sound.h +++ b/src/sound.h @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 22, 2000 - December 28, 2003 + April 22, 2000 - March 15, 2004 Current maintainer: Duong-Khang NGUYEN diff --git a/src/supertux.c b/src/supertux.c index d18565fc9..44aebe5f3 100644 --- a/src/supertux.c +++ b/src/supertux.c @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 11, 2000 - December 29, 2003 + April 11, 2000 - March 15, 2004 */ diff --git a/src/title.c b/src/title.c index 3407a4549..ea74ca864 100644 --- a/src/title.c +++ b/src/title.c @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 11, 2000 - December 29, 2003 + April 11, 2000 - March 15, 2004 */ #include diff --git a/src/title.h b/src/title.h index c7b05586f..4241a8836 100644 --- a/src/title.h +++ b/src/title.h @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 11, 2000 - April 11, 2000 + April 11, 2000 - March 15, 2004 */ int title(void); -- 2.11.0