supertux.git
20 years agoimprove tux holding objects
Matthias Braun [Thu, 20 May 2004 23:46:50 +0000 (23:46 +0000)]
improve tux holding objects

SVN-Revision: 1290

20 years agofixed bullet problems
Matthias Braun [Thu, 20 May 2004 23:34:53 +0000 (23:34 +0000)]
fixed bullet problems

SVN-Revision: 1289

20 years agodon't remove trampolines twice
Matthias Braun [Thu, 20 May 2004 23:25:30 +0000 (23:25 +0000)]
don't remove trampolines twice

SVN-Revision: 1288

20 years agoadded standard header to files
Matthias Braun [Thu, 20 May 2004 23:19:55 +0000 (23:19 +0000)]
added standard header to files

SVN-Revision: 1287

20 years agoalso install xpm icon
Matthias Braun [Thu, 20 May 2004 23:09:40 +0000 (23:09 +0000)]
also install xpm icon

SVN-Revision: 1286

20 years agofix for trampoline syntax
Matthias Braun [Thu, 20 May 2004 23:09:19 +0000 (23:09 +0000)]
fix for trampoline syntax

SVN-Revision: 1285

20 years ago-converted remaining classes to GameObject
Matthias Braun [Thu, 20 May 2004 23:07:25 +0000 (23:07 +0000)]
-converted remaining classes to GameObject
-remove old GameObject type
-removed base_type.xm,ym and replaced code that was still using them

SVN-Revision: 1284

20 years agoforgot to add some files
Matthias Braun [Thu, 20 May 2004 19:57:20 +0000 (19:57 +0000)]
forgot to add some files

SVN-Revision: 1283

20 years ago-changed Level class to save tiles in a big 1 dimensional array instead of
Matthias Braun [Thu, 20 May 2004 19:56:37 +0000 (19:56 +0000)]
-changed Level class to save tiles in a big 1 dimensional array instead of
 vector<vector>. You can access a tile like this now tiles[y * width + x] is the tile at place x,y
-introduced new Serializable interface that is implemented by all objects that
 are able to save themselfes to disk
-added new lispwriter class
-changed level laoding/save code to use new serializable/lispwriter stuff

SVN-Revision: 1282

20 years agoconverted player to new object system
Matthias Braun [Thu, 20 May 2004 15:58:10 +0000 (15:58 +0000)]
converted player to new object system

SVN-Revision: 1281

20 years agoJust added a missing header.
Ricardo Cruz [Thu, 20 May 2004 15:09:58 +0000 (15:09 +0000)]
Just added a missing header.

SVN-Revision: 1280

20 years agoforgot to add some files
Matthias Braun [Thu, 20 May 2004 14:56:16 +0000 (14:56 +0000)]
forgot to add some files

SVN-Revision: 1279

20 years agofixed score display and converted tilemap to a gameobject
Matthias Braun [Thu, 20 May 2004 14:55:41 +0000 (14:55 +0000)]
fixed score display and converted tilemap to a gameobject

SVN-Revision: 1278

20 years agooops
Matthias Braun [Thu, 20 May 2004 13:33:26 +0000 (13:33 +0000)]
oops

SVN-Revision: 1277

20 years ago-Added new object system and converted some GameObjects to it.
Matthias Braun [Thu, 20 May 2004 12:12:39 +0000 (12:12 +0000)]
-Added new object system and converted some GameObjects to it.
 Please take a look if you like this new interface and complain as soon as
 possible :)
-Currently you experience some stuff is drawn at the wrong layer, that is
 because not everything is using the new displaymanager yet.

SVN-Revision: 1276

20 years agoDon't do string objects tests this way!
Ricardo Cruz [Wed, 19 May 2004 18:22:48 +0000 (18:22 +0000)]
Don't do string objects tests this way!

SVN-Revision: 1272

20 years agoJust improved a bit the butt jump control.
Ricardo Cruz [Wed, 19 May 2004 13:46:45 +0000 (13:46 +0000)]
Just improved a bit the butt jump control.
You don't have to press Down while pressing Up, but still you've to press it right away...

SVN-Revision: 1271

20 years agoRemake of the Ingo's background.
Ricardo Cruz [Wed, 19 May 2004 10:55:31 +0000 (10:55 +0000)]
Remake of the Ingo's background.

SVN-Revision: 1270

20 years agoLevel's draw_bg() now takes full care of the background drawing.
Ricardo Cruz [Wed, 19 May 2004 10:29:39 +0000 (10:29 +0000)]
Level's draw_bg() now takes full care of the background drawing.

SVN-Revision: 1269

20 years agoBullet fire counting with its height.
Ricardo Cruz [Wed, 19 May 2004 10:28:38 +0000 (10:28 +0000)]
Bullet fire counting with its height.

SVN-Revision: 1268

20 years ago- touched up bomb-explosion image
Ryan Flegel [Wed, 19 May 2004 04:17:04 +0000 (04:17 +0000)]
- touched up bomb-explosion image

SVN-Revision: 1267

20 years ago-updated TODO
Ryan Flegel [Wed, 19 May 2004 03:49:53 +0000 (03:49 +0000)]
-updated TODO

SVN-Revision: 1266

20 years ago- much nicer scrolling
Ryan Flegel [Wed, 19 May 2004 03:20:50 +0000 (03:20 +0000)]
- much nicer scrolling
- Patch submitted by David Kettler (Upsilon)

SVN-Revision: 1265

20 years agoOnly butt jump after a full jump. This approuch is different; instead of enabling...
Ricardo Cruz [Tue, 18 May 2004 23:45:30 +0000 (23:45 +0000)]
Only butt jump after a full jump. This approuch is different; instead of enabling butt jump only when the conditions are satisfory, keep it enabled and disable in case something doesn't satisfy them.

SVN-Revision: 1264

20 years agoRyan was right, Tux was firing from the head :D
Ricardo Cruz [Tue, 18 May 2004 23:15:31 +0000 (23:15 +0000)]
Ryan was right, Tux was firing from the head :D

SVN-Revision: 1263

20 years ago- just some formatting stuff
Ryan Flegel [Tue, 18 May 2004 21:11:41 +0000 (21:11 +0000)]
- just some formatting stuff

SVN-Revision: 1262

20 years ago-updated TODO
Ryan Flegel [Tue, 18 May 2004 20:39:31 +0000 (20:39 +0000)]
-updated TODO

SVN-Revision: 1261

20 years ago- ObjectManager stuff
Ryan Flegel [Tue, 18 May 2004 19:17:33 +0000 (19:17 +0000)]
- ObjectManager stuff

SVN-Revision: 1260

20 years ago- barebones BadGuyManager -> ObjectManager
Ryan Flegel [Tue, 18 May 2004 18:12:16 +0000 (18:12 +0000)]
- barebones BadGuyManager -> ObjectManager

SVN-Revision: 1259

20 years agoChanged back the sliding fix because it was buggy
Marek Moeckel [Tue, 18 May 2004 18:04:53 +0000 (18:04 +0000)]
Changed back the sliding fix because it was buggy

SVN-Revision: 1258

20 years agoreverted totally pointless commit of rmcruz. size does NOT contain the current power...
Matthias Braun [Tue, 18 May 2004 17:56:28 +0000 (17:56 +0000)]
reverted totally pointless commit of rmcruz. size does NOT contain the current power of tux.

SVN-Revision: 1257

20 years agoFix bug reported by Ryan: in level smaller than 19, Tux would stay in dead move forever.
Ricardo Cruz [Tue, 18 May 2004 17:46:05 +0000 (17:46 +0000)]
Fix bug reported by Ryan: in level smaller than 19, Tux would stay in dead move forever.

SVN-Revision: 1256

20 years agoTiny fix. Just to make fire or ice Tux to be able to do butt jump, as well.
Ricardo Cruz [Tue, 18 May 2004 17:20:27 +0000 (17:20 +0000)]
Tiny fix. Just to make fire or ice Tux to be able to do butt jump, as well.

SVN-Revision: 1255

20 years agoTODO update
Matthias Braun [Tue, 18 May 2004 17:17:32 +0000 (17:17 +0000)]
TODO update

SVN-Revision: 1254

20 years agoChanged it so that only big Tux is able to butt-jump
Marek Moeckel [Tue, 18 May 2004 17:12:54 +0000 (17:12 +0000)]
Changed it so that only big Tux is able to butt-jump
Prevented big Tux from being able to slide under one-tile-wide spaces
Now he will just slide out again the direction he came from
That allows to create places where being small Tux is an advantage

SVN-Revision: 1253

20 years agochanged duck mode a bit so that you can only jump a little bit when being ducked...
Matthias Braun [Tue, 18 May 2004 16:57:57 +0000 (16:57 +0000)]
changed duck mode a bit so that you can only jump a little bit when being ducked and that you can unduck in air

SVN-Revision: 1252

20 years agofixed butt jump to work even when up-key is not pressed, added a little jump after...
Matthias Braun [Tue, 18 May 2004 16:43:37 +0000 (16:43 +0000)]
fixed butt jump to work even when up-key is not pressed, added a little jump after breaking a brick. The thing still has problems with breaking the correct fix, as the used position is not the actual one, but the target position for the next frame, so you can break some bricks that aren't reachable normally

SVN-Revision: 1251

20 years agoNow the player dies when reaching the bottom of the level, even in Y-scrolling levels.
Ricardo Cruz [Tue, 18 May 2004 14:16:38 +0000 (14:16 +0000)]
Now the player dies when reaching the bottom of the level, even in Y-scrolling levels.

SVN-Revision: 1250

20 years agoRemoved 10 and putted 11 as 10.
Ricardo Cruz [Tue, 18 May 2004 14:15:38 +0000 (14:15 +0000)]
Removed 10 and putted 11 as 10.
Also, made test level 11 to have a background image to test it when scrolling Y.

SVN-Revision: 1249

20 years agoI think this fixes image background scrolling.
Ricardo Cruz [Tue, 18 May 2004 14:03:53 +0000 (14:03 +0000)]
I think this fixes image background scrolling.
Still needs testing.

SVN-Revision: 1248

20 years agoJust pushed the level info down.
Ricardo Cruz [Tue, 18 May 2004 14:02:47 +0000 (14:02 +0000)]
Just pushed the level info down.

SVN-Revision: 1247

20 years ago- update to TODO
Ryan Flegel [Mon, 17 May 2004 23:15:43 +0000 (23:15 +0000)]
- update to TODO

SVN-Revision: 1246

20 years ago- updated TODO with suggestions sent from Torfi to the ml
Ryan Flegel [Mon, 17 May 2004 23:07:21 +0000 (23:07 +0000)]
- updated TODO with suggestions sent from Torfi to the ml

SVN-Revision: 1245

20 years ago- updated TODO
Ryan Flegel [Mon, 17 May 2004 20:04:45 +0000 (20:04 +0000)]
- updated TODO

SVN-Revision: 1244

20 years agoadded another test level which covers vertical scrolling, the butt stomp and the...
Marek Moeckel [Mon, 17 May 2004 17:28:52 +0000 (17:28 +0000)]
added another test level which covers vertical scrolling, the butt stomp and the forest tune (although it doesn't fit in there, of course)

SVN-Revision: 1243

20 years ago- typo fix
Ryan Flegel [Mon, 17 May 2004 17:05:22 +0000 (17:05 +0000)]
- typo fix

SVN-Revision: 1242

20 years ago- some trampoline changes
Ryan Flegel [Mon, 17 May 2004 17:01:21 +0000 (17:01 +0000)]
- some trampoline changes
- fixed bug mentioned by Marek in the mailing list (I think)

SVN-Revision: 1241

20 years agoImproved forest tune
Marek Moeckel [Mon, 17 May 2004 16:52:05 +0000 (16:52 +0000)]
Improved forest tune

SVN-Revision: 1240

20 years agoJust made the keys UP code go when the menu is called.
Ricardo Cruz [Mon, 17 May 2004 14:11:03 +0000 (14:11 +0000)]
Just made the keys UP code go when the menu is called.
This way they are only done once, instead of every time. Doesn't solve anything, it's just cleaner IMO.

SVN-Revision: 1239

20 years agoMade player to use the old status when aborting a level.
Ricardo Cruz [Mon, 17 May 2004 10:15:01 +0000 (10:15 +0000)]
Made player to use the old status when aborting a level.

SVN-Revision: 1238

20 years agoThis is a duplication of the arctic image.
Ricardo Cruz [Mon, 17 May 2004 10:14:29 +0000 (10:14 +0000)]
This is a duplication of the arctic image.

SVN-Revision: 1237

20 years agoIt was using a duplication of the arctis image.
Ricardo Cruz [Mon, 17 May 2004 10:13:17 +0000 (10:13 +0000)]
It was using a duplication of the arctis image.

SVN-Revision: 1236

20 years agoFixed a crash. It was using the old name of the background image.
Ricardo Cruz [Mon, 17 May 2004 10:12:19 +0000 (10:12 +0000)]
Fixed a crash. It was using the old name of the background image.

SVN-Revision: 1235

20 years agoDon't open the menu on the end sequence.
Ricardo Cruz [Mon, 17 May 2004 10:11:43 +0000 (10:11 +0000)]
Don't open the menu on the end sequence.

SVN-Revision: 1234

20 years agoMake use of the arctic background instead of the Tux oil one.
Ricardo Cruz [Mon, 17 May 2004 09:13:14 +0000 (09:13 +0000)]
Make use of the arctic background instead of the Tux oil one.
I think we should keep the oil Tux for the end of the game credits background... To be like a reward.

SVN-Revision: 1233

20 years agoAdded a skelaton for the config bad guys code. Just a rip from the Ingo's tiles code.
Ricardo Cruz [Mon, 17 May 2004 09:11:58 +0000 (09:11 +0000)]
Added a skelaton for the config bad guys code. Just a rip from the Ingo's tiles code.

SVN-Revision: 1232

20 years ago- spike test level
Ryan Flegel [Mon, 17 May 2004 06:27:12 +0000 (06:27 +0000)]
- spike test level

SVN-Revision: 1231

20 years ago- added spikes
Ryan Flegel [Mon, 17 May 2004 06:26:41 +0000 (06:26 +0000)]
- added spikes

SVN-Revision: 1230

20 years ago- gave spike the spike property
Ryan Flegel [Mon, 17 May 2004 06:00:25 +0000 (06:00 +0000)]
- gave spike the spike property

SVN-Revision: 1229

20 years ago- added spike tile from Benjamin
Ryan Flegel [Mon, 17 May 2004 05:49:08 +0000 (05:49 +0000)]
- added spike tile from Benjamin

SVN-Revision: 1228

20 years ago- oops. don't need two iostream's.. or do we.. :)
Ryan Flegel [Mon, 17 May 2004 05:35:21 +0000 (05:35 +0000)]
- oops. don't need two iostream's.. or do we.. :)

SVN-Revision: 1227

20 years ago- tux can now pick up trampoline
Ryan Flegel [Mon, 17 May 2004 05:24:40 +0000 (05:24 +0000)]
- tux can now pick up trampoline

SVN-Revision: 1226

20 years ago- trampoline stuff
Ryan Flegel [Mon, 17 May 2004 01:24:24 +0000 (01:24 +0000)]
- trampoline stuff

SVN-Revision: 1225

20 years ago- Trampoline test level
Ryan Flegel [Sun, 16 May 2004 23:11:54 +0000 (23:11 +0000)]
- Trampoline test level

SVN-Revision: 1222

20 years ago- collision fix
Ryan Flegel [Sun, 16 May 2004 18:44:54 +0000 (18:44 +0000)]
- collision fix

SVN-Revision: 1221

20 years agoNew music!
Marek Moeckel [Sun, 16 May 2004 18:19:36 +0000 (18:19 +0000)]
New music!

SVN-Revision: 1220

20 years agoPushed copyright message down.
Ricardo Cruz [Sun, 16 May 2004 18:14:19 +0000 (18:14 +0000)]
Pushed copyright message down.
It feels a bit empty, but I am thinking in re-introducing Highscores, so...

SVN-Revision: 1219

20 years agoChanged the menu to have 19-height tiles.
Ricardo Cruz [Sun, 16 May 2004 18:11:08 +0000 (18:11 +0000)]
Changed the menu to have 19-height tiles.

SVN-Revision: 1218

20 years ago- added trampoline entries
Ryan Flegel [Sun, 16 May 2004 18:05:10 +0000 (18:05 +0000)]
- added trampoline entries

SVN-Revision: 1217

20 years agoAdded '--leveleditor' to --usage and corrected another thing.
Ricardo Cruz [Sun, 16 May 2004 17:56:58 +0000 (17:56 +0000)]
Added '--leveleditor' to --usage and corrected another thing.

SVN-Revision: 1216

20 years ago- added missing include
Ryan Flegel [Sun, 16 May 2004 17:44:39 +0000 (17:44 +0000)]
- added missing include

SVN-Revision: 1215

20 years ago- trampoline stuff
Ryan Flegel [Sun, 16 May 2004 16:49:13 +0000 (16:49 +0000)]
- trampoline stuff

SVN-Revision: 1213

20 years agoRenamed sound effect files, so that musiceans now better what which one means.
Ricardo Cruz [Sun, 16 May 2004 16:33:21 +0000 (16:33 +0000)]
Renamed sound effect files, so that musiceans now better what which one means.

SVN-Revision: 1212

20 years agoGame end screen is drawn by the world map now. This is just a step to make a dialog...
Ricardo Cruz [Sun, 16 May 2004 12:31:31 +0000 (12:31 +0000)]
Game end screen is drawn by the world map now. This is just a step to make a dialog like the SM3 one when the player's lost all lives.
(In case there isn't any worldmap, we should draw it anyway...)
Also, don't allow the player to open the menu when he is dying. Avoids cheating.

SVN-Revision: 1211

20 years agoY background scrolling. It should start be drawing from the bottom of the level to...
Ricardo Cruz [Sun, 16 May 2004 12:18:05 +0000 (12:18 +0000)]
Y background scrolling. It should start be drawing from the bottom of the level to the up.
Dunno if it is working well.

SVN-Revision: 1210

20 years agoResized the arctis background to 800x600
Marek Moeckel [Sun, 16 May 2004 09:48:49 +0000 (09:48 +0000)]
Resized the arctis background to 800x600
(Has a few glitches, don't know if they are noticable)
Saved the old background as arctis640.png
Resized levels 9-12

SVN-Revision: 1209

20 years ago- trampoline stuff
Ryan Flegel [Sun, 16 May 2004 05:48:28 +0000 (05:48 +0000)]
- trampoline stuff

SVN-Revision: 1208

20 years ago- started creating trampoline functions
Ryan Flegel [Sun, 16 May 2004 04:04:03 +0000 (04:04 +0000)]
- started creating trampoline functions

SVN-Revision: 1207

20 years ago- more game object changes. looks a bit nicer now
Ryan Flegel [Sun, 16 May 2004 03:28:22 +0000 (03:28 +0000)]
- more game object changes. looks a bit nicer now

SVN-Revision: 1206

20 years ago- more game object progress
Ryan Flegel [Sun, 16 May 2004 02:07:26 +0000 (02:07 +0000)]
- more game object progress

SVN-Revision: 1205

20 years ago- Made some changes to object code
Ryan Flegel [Sun, 16 May 2004 01:36:54 +0000 (01:36 +0000)]
- Made some changes to object code

I'm Cleaning up object code to make it more flexible/reusable.
It's currently in an unfinished state.

SVN-Revision: 1204

20 years ago- added support for different types of objects
Ryan Flegel [Sun, 16 May 2004 00:36:58 +0000 (00:36 +0000)]
- added support for different types of objects
- working on adding trampoline

SVN-Revision: 1203

20 years ago- added Ben's trampoline images
Ryan Flegel [Sun, 16 May 2004 00:01:19 +0000 (00:01 +0000)]
- added Ben's trampoline images

SVN-Revision: 1202

20 years agoMade the menu to get back to the main menu after the slot deleting dialog.
Ricardo Cruz [Sat, 15 May 2004 18:27:57 +0000 (18:27 +0000)]
Made the menu to get back to the main menu after the slot deleting dialog.
I would prefer it would get back to the load menu, but at least this is better than exiting the game...

SVN-Revision: 1199

20 years agoMade level editor to use the draw_bg() that Ryan added to level. This way the backgro...
Ricardo Cruz [Sat, 15 May 2004 18:26:48 +0000 (18:26 +0000)]
Made level editor to use the draw_bg() that Ryan added to level. This way the background bug is fixed.

SVN-Revision: 1198

20 years agoResized levels 6-8
Marek Moeckel [Sat, 15 May 2004 16:07:20 +0000 (16:07 +0000)]
Resized levels 6-8

SVN-Revision: 1197

20 years agoOoops, forgot to remove a comment.
Ricardo Cruz [Sat, 15 May 2004 14:26:38 +0000 (14:26 +0000)]
Ooops, forgot to remove a comment.

SVN-Revision: 1196

20 years agoI allways noticed that in the SDL mode, the gradient was sometimes different than...
Ricardo Cruz [Sat, 15 May 2004 14:19:01 +0000 (14:19 +0000)]
I allways noticed that in the SDL mode, the gradient was sometimes different than the OpenGL. But when I did the function, everything was okay and in most of the gradients it worked fine.
Finally, gone to the code and corrected that. It was just a typo (screen->w was being used in green and blue calculation, instead of screen->h).

SVN-Revision: 1195

20 years agoChanged the gradient colors.
Ricardo Cruz [Sat, 15 May 2004 14:16:15 +0000 (14:16 +0000)]
Changed the gradient colors.
This gradient caused the SDL frontend to be different than the OpenGL.

SVN-Revision: 1194

20 years agoOnly do vertical scrolling when the height is higher than 19.
Ricardo Cruz [Sat, 15 May 2004 12:08:57 +0000 (12:08 +0000)]
Only do vertical scrolling when the height is higher than 19.
This fixes the problem that scrolling was used in 19 Y tiles levels. Since the right number of Y tiles is 18.75, not 19.

SVN-Revision: 1193

20 years agoUpdated matrix's grassland tiles
Marek Moeckel [Sat, 15 May 2004 11:31:48 +0000 (11:31 +0000)]
Updated matrix's grassland tiles
Edited levels 1-5 to fit the new resolution

SVN-Revision: 1192

20 years agoFixed Coins text position in world map.
Ricardo Cruz [Sat, 15 May 2004 11:29:47 +0000 (11:29 +0000)]
Fixed Coins text position in world map.

SVN-Revision: 1191

20 years ago- fixed level editor crash
Ryan Flegel [Sat, 15 May 2004 11:00:32 +0000 (11:00 +0000)]
- fixed level editor crash
- some other resolution fixes in level editor
- fixed level editor not scrolling all the way to end of level (last two columns were hiding behind the panel). This is in 0.1.1, too.

SVN-Revision: 1190

20 years ago- fixed drawgradient() function (res fix)
Ryan Flegel [Sat, 15 May 2004 10:29:35 +0000 (10:29 +0000)]
- fixed drawgradient() function (res fix)

SVN-Revision: 1189

20 years agoMade levels to use arctis.jpg, instead of arctis2.jpg
Ricardo Cruz [Sat, 15 May 2004 10:09:59 +0000 (10:09 +0000)]
Made levels to use arctis.jpg, instead of arctis2.jpg

SVN-Revision: 1188

20 years agoChanged "arctis2.jpg" to "arctis.jpg".
Ricardo Cruz [Sat, 15 May 2004 10:07:41 +0000 (10:07 +0000)]
Changed "arctis2.jpg" to "arctis.jpg".

SVN-Revision: 1187

20 years agoMoved old arctic background image into the old dir.
Ricardo Cruz [Sat, 15 May 2004 10:06:48 +0000 (10:06 +0000)]
Moved old arctic background image into the old dir.

SVN-Revision: 1186

20 years agoReplaced this background by a 800x600 version.
Ricardo Cruz [Sat, 15 May 2004 10:01:07 +0000 (10:01 +0000)]
Replaced this background by a 800x600 version.
Ingo sent this some time ago to the mailing list.

SVN-Revision: 1185

20 years agoCleanup. Also applied the same fix to leveleditor. Unfortanely, still crashes, aparen...
Ricardo Cruz [Sat, 15 May 2004 09:59:02 +0000 (09:59 +0000)]
Cleanup. Also applied the same fix to leveleditor. Unfortanely, still crashes, aparentelly in the same point.

SVN-Revision: 1184

20 years ago- even more res fixes--we're getting there
Ryan Flegel [Fri, 14 May 2004 22:47:35 +0000 (22:47 +0000)]
- even more res fixes--we're getting there

SVN-Revision: 1183