Ingo Ruhnke [Sun, 30 May 2004 15:25:01 +0000 (15:25 +0000)]
replaced std::sort with stable_sort to avoid sorting errors with objects in the same layer
SVN-Revision: 1366
Matthias Braun [Sun, 30 May 2004 13:55:28 +0000 (13:55 +0000)]
fix so that pause text is displayed correctly
SVN-Revision: 1365
Matthias Braun [Sun, 30 May 2004 13:54:40 +0000 (13:54 +0000)]
fix tiles being 1 pixel off their correct position
SVN-Revision: 1364
Ingo Ruhnke [Sun, 30 May 2004 13:35:56 +0000 (13:35 +0000)]
- added missing assert header
SVN-Revision: 1363
Matthias Braun [Sun, 30 May 2004 12:57:56 +0000 (12:57 +0000)]
don't include polygon code yet
SVN-Revision: 1362
Matthias Braun [Sun, 30 May 2004 01:08:50 +0000 (01:08 +0000)]
-Changed drawing model. Everything is handled through DrawingContext now and
has an additional layer argument. So now you can paint into
background/foreground as you like. The DrawingContext will queue app all
commands, sort them and execute them in 1 go.
SVN-Revision: 1361
Ryan Flegel [Sat, 29 May 2004 01:29:00 +0000 (01:29 +0000)]
- small eq'n fixes
SVN-Revision: 1360
Ryan Flegel [Sat, 29 May 2004 00:38:15 +0000 (00:38 +0000)]
- fixed level editor crash (a hack)
SVN-Revision: 1359
Ricardo Cruz [Fri, 28 May 2004 23:09:37 +0000 (23:09 +0000)]
Added the 16 margin to the camera move checking as suggested by Ryan.
I still prefer no value, but at least it is not as bad as 32.
SVN-Revision: 1358
Ricardo Cruz [Fri, 28 May 2004 22:57:31 +0000 (22:57 +0000)]
Just retified the solution for the space issue.
SVN-Revision: 1357
Ricardo Cruz [Fri, 28 May 2004 22:37:48 +0000 (22:37 +0000)]
Minor fix for shrink fade.
Removed not working fade in (i'll work on that).
SVN-Revision: 1356
Ryan Flegel [Fri, 28 May 2004 22:35:05 +0000 (22:35 +0000)]
- fixed some resolution related leveditor bugs
SVN-Revision: 1355
Ryan Flegel [Fri, 28 May 2004 20:33:37 +0000 (20:33 +0000)]
- fixed 'When you jump into the roof or a bonus and fall back down you collide with badguys twice'
SVN-Revision: 1354
Ryan Flegel [Fri, 28 May 2004 19:47:16 +0000 (19:47 +0000)]
- made bombs explode instantly when they run into an exploding bomb (from Ricardo)
- only flip death animations when y-velocity is negative
SVN-Revision: 1353
Ricardo Cruz [Fri, 28 May 2004 18:41:58 +0000 (18:41 +0000)]
Just removed a part of the applied patch. IMO it is so much better when player changes direction.
Didn't touch the speed.
SVN-Revision: 1352
Ricardo Cruz [Fri, 28 May 2004 18:35:20 +0000 (18:35 +0000)]
Just reduced fading time when slot is chosen.
SVN-Revision: 1351
Ricardo Cruz [Fri, 28 May 2004 18:32:58 +0000 (18:32 +0000)]
Fixed the fade func problem. Just a simple mistake.
Also applied fade when choosing a slot.
SVN-Revision: 1350
Ricardo Cruz [Fri, 28 May 2004 18:13:17 +0000 (18:13 +0000)]
Fade when entering a level.
Sometimes doesn't work, i'll have a look at the fade func later.
SVN-Revision: 1349
Ricardo Cruz [Fri, 28 May 2004 14:57:58 +0000 (14:57 +0000)]
Just removed upside down thing. Done.
SVN-Revision: 1348
Ricardo Cruz [Fri, 28 May 2004 14:51:56 +0000 (14:51 +0000)]
Removed vertical flipping drawing hacks.
Anyway, can we remove the update argument from the drawing functions? It is not used anywhere and OpenGL doesn't support it.
SVN-Revision: 1347
Matthias Braun [Fri, 28 May 2004 14:46:16 +0000 (14:46 +0000)]
mention how to configure sound&video in SDL
SVN-Revision: 1346
Matthias Braun [Fri, 28 May 2004 09:41:45 +0000 (09:41 +0000)]
added inheritance diagram for the gameobjects
SVN-Revision: 1345
Ryan Flegel [Fri, 28 May 2004 07:31:25 +0000 (07:31 +0000)]
- added unisolid patch from Upsilon
SVN-Revision: 1344
Ryan Flegel [Thu, 27 May 2004 23:54:31 +0000 (23:54 +0000)]
- walking tree tweaks
SVN-Revision: 1343
Ricardo Cruz [Thu, 27 May 2004 19:48:24 +0000 (19:48 +0000)]
Resized level to 19 height tiles.
This makes 1-13 levels done! Another 13 to go!
SVN-Revision: 1342
Ricardo Cruz [Thu, 27 May 2004 17:01:28 +0000 (17:01 +0000)]
Implemented Tux growing animation.
Bug: since the Sprite does not respect the frames order, it may not animate correctly. I think the best fix is to make Player object to take care of that using Surfaces.
SVN-Revision: 1341
Ricardo Cruz [Thu, 27 May 2004 16:58:16 +0000 (16:58 +0000)]
Added growing Tux entries.
SVN-Revision: 1340
Ricardo Cruz [Thu, 27 May 2004 16:57:47 +0000 (16:57 +0000)]
Tux growing animation by Benjamin!
SVN-Revision: 1339
Ricardo Cruz [Thu, 27 May 2004 14:18:00 +0000 (14:18 +0000)]
Draw enemies upside down when falling.
The drawing code in texture.cpp is just a hack. Not sure how we can flip surfaces in SDL. The OpenGL should be easily done, I will take care of it later.
SVN-Revision: 1338
Ryan Flegel [Thu, 27 May 2004 03:04:12 +0000 (03:04 +0000)]
- updated TODO
SVN-Revision: 1337
Ricardo Cruz [Thu, 27 May 2004 02:47:32 +0000 (02:47 +0000)]
Resized level to 19 height.
SVN-Revision: 1336
Ricardo Cruz [Wed, 26 May 2004 22:57:33 +0000 (22:57 +0000)]
Updated file to reflect added files.
SVN-Revision: 1335
Ricardo Cruz [Wed, 26 May 2004 22:56:04 +0000 (22:56 +0000)]
Uploaded Benjamin's flying platform animations.
These are bigger, should they be resized to the older size (96x40)?
SVN-Revision: 1334
Ricardo Cruz [Wed, 26 May 2004 22:46:59 +0000 (22:46 +0000)]
A couple of improvements for the flying platform.
SVN-Revision: 1333
Matthias Braun [Wed, 26 May 2004 15:57:36 +0000 (15:57 +0000)]
some cleanups and robustness checks, I added while searching for a bug (that was none as it turned out :)
SVN-Revision: 1332
Ryan Flegel [Tue, 25 May 2004 23:53:43 +0000 (23:53 +0000)]
- added David's camera patch
SVN-Revision: 1331
Ryan Flegel [Tue, 25 May 2004 23:24:10 +0000 (23:24 +0000)]
- added walkingtree to test level
SVN-Revision: 1330
Ryan Flegel [Tue, 25 May 2004 22:05:07 +0000 (22:05 +0000)]
- tweaked walkingtree
SVN-Revision: 1329
Ryan Flegel [Tue, 25 May 2004 21:21:22 +0000 (21:21 +0000)]
- added walking tree enemy. still needs some work
SVN-Revision: 1328
Ryan Flegel [Tue, 25 May 2004 19:41:48 +0000 (19:41 +0000)]
- some wingling tweaks
SVN-Revision: 1327
Ricardo Cruz [Tue, 25 May 2004 15:32:45 +0000 (15:32 +0000)]
Disable gravity when on flying platform.
SVN-Revision: 1326
Matthias Braun [Tue, 25 May 2004 10:38:52 +0000 (10:38 +0000)]
more tuning of badguy activation
SVN-Revision: 1325
Matthias Braun [Tue, 25 May 2004 10:13:07 +0000 (10:13 +0000)]
attempt to tune badguy activation
SVN-Revision: 1324
Matthias Braun [Tue, 25 May 2004 10:09:30 +0000 (10:09 +0000)]
forgot to commit my changes to testlevels yesterday
SVN-Revision: 1323
Ryan Flegel [Tue, 25 May 2004 02:56:31 +0000 (02:56 +0000)]
- added wingling to test level
SVN-Revision: 1322
Ryan Flegel [Tue, 25 May 2004 02:51:30 +0000 (02:51 +0000)]
- beginnings of a wingling
SVN-Revision: 1321
Matthias Braun [Tue, 25 May 2004 00:28:24 +0000 (00:28 +0000)]
implemented autoscrolling and proper camera parsing in levelfiles
SVN-Revision: 1320
Ryan Flegel [Mon, 24 May 2004 23:32:41 +0000 (23:32 +0000)]
- fixed it so Tux doesn't die on spikes if safety timer is started
SVN-Revision: 1319
Ryan Flegel [Mon, 24 May 2004 23:03:43 +0000 (23:03 +0000)]
- fixed it so arm is not drawn when Tux is shooting and ducking
SVN-Revision: 1318
Matthias Braun [Mon, 24 May 2004 23:02:34 +0000 (23:02 +0000)]
added some comments to scrolling code
SVN-Revision: 1317
Matthias Braun [Mon, 24 May 2004 22:53:39 +0000 (22:53 +0000)]
increase offscreen distance
SVN-Revision: 1316
Matthias Braun [Mon, 24 May 2004 22:36:56 +0000 (22:36 +0000)]
make badguys reappear when scrolling back
SVN-Revision: 1315
Ricardo Cruz [Mon, 24 May 2004 21:52:14 +0000 (21:52 +0000)]
Small fix. Don't do back scrolling, in case it is unabled.
And don't do vertical scrolling when there are 19 height tiles. It is necessary to explecity say so cause in this case, the actual height of the level is 608, higher than the screen (600).
SVN-Revision: 1314
Ryan Flegel [Mon, 24 May 2004 21:29:11 +0000 (21:29 +0000)]
- missing include
SVN-Revision: 1313
Matthias Braun [Mon, 24 May 2004 21:28:44 +0000 (21:28 +0000)]
try to make the scrolling a bit smoother
SVN-Revision: 1312
Matthias Braun [Mon, 24 May 2004 21:18:56 +0000 (21:18 +0000)]
fixed bug I just introduced
SVN-Revision: 1311
Ricardo Cruz [Mon, 24 May 2004 21:05:58 +0000 (21:05 +0000)]
Forest background made by Benjamin!
SVN-Revision: 1310
Matthias Braun [Mon, 24 May 2004 21:02:44 +0000 (21:02 +0000)]
-renamed ViewPort to Camera
-removed type() function from GameObject, you should better use C++ RTTI:
* casting: BadGuy* badguy = dynamic_cast<BadGuy*> (object);
* comparing for specific type if(typeid(object) == typeid(BadGuy))
* getting the name typeid(object).name()
-moved camera handling into Camera class
-tweaked camera behaviour. Look for details in
http://netpanzer.berlios.de/supertux/index.php/Camera
Horizontal scrolling seems to be nicely now, vertical scrolling is still a bit
too hectically...
SVN-Revision: 1309
Ricardo Cruz [Mon, 24 May 2004 20:42:21 +0000 (20:42 +0000)]
Fixed checking for next point and the use of sprites.
SVN-Revision: 1308
Matthias Braun [Mon, 24 May 2004 16:14:42 +0000 (16:14 +0000)]
add -Werror flag to debug mode
SVN-Revision: 1307
Ricardo Cruz [Mon, 24 May 2004 12:02:25 +0000 (12:02 +0000)]
Added flying platform into the buttjump and trampoline test level.
SVN-Revision: 1306
Ricardo Cruz [Mon, 24 May 2004 12:01:35 +0000 (12:01 +0000)]
Added entry for flying platform.
SVN-Revision: 1305
Ricardo Cruz [Mon, 24 May 2004 12:01:07 +0000 (12:01 +0000)]
Added Benjamin's flying platform image.
I could not add more than one frame cause the format is animated GIF...
SVN-Revision: 1304
Ricardo Cruz [Mon, 24 May 2004 11:59:59 +0000 (11:59 +0000)]
New flying platform object.
Though seems to have some probs checking if reached next point, resulting in a bad movement. I'll have a look at this later.
SVN-Revision: 1303
Matthias Braun [Sun, 23 May 2004 22:46:34 +0000 (22:46 +0000)]
fix a bug when resizing maps and when saving maps which I recently introduced
SVN-Revision: 1302
Matthias Braun [Sun, 23 May 2004 20:20:20 +0000 (20:20 +0000)]
default image changed to arctis.jpg
SVN-Revision: 1301
Ricardo Cruz [Sun, 23 May 2004 00:11:58 +0000 (00:11 +0000)]
Made butt-jump to behave according to what Marek asked. You can tune a definition...
Now, we just need a butt-jump image.
SVN-Revision: 1300
Ricardo Cruz [Sat, 22 May 2004 18:42:40 +0000 (18:42 +0000)]
Don't remove badguys, just because they are out of the screen borders.
SVN-Revision: 1299
Ricardo Cruz [Sat, 22 May 2004 17:55:44 +0000 (17:55 +0000)]
Fixes.
SVN-Revision: 1298
Ricardo Cruz [Sat, 22 May 2004 15:27:45 +0000 (15:27 +0000)]
Tux shows arm when firing.
SVN-Revision: 1297
Ryan Flegel [Fri, 21 May 2004 23:37:56 +0000 (23:37 +0000)]
- made some changes for joystick in menu. better?
SVN-Revision: 1296
Ryan Flegel [Fri, 21 May 2004 19:35:14 +0000 (19:35 +0000)]
- fixed level editor crash
- inserting objects still doesn't work, however
SVN-Revision: 1295
Ryan Flegel [Fri, 21 May 2004 02:28:27 +0000 (02:28 +0000)]
- made some fun changes :)
- theres a hideen path on the right side if you don't want to buttjump your way all the way down
SVN-Revision: 1294
Matthias Braun [Fri, 21 May 2004 00:43:30 +0000 (00:43 +0000)]
fix firetux not being able to pickup stuff
SVN-Revision: 1293
Matthias Braun [Fri, 21 May 2004 00:22:57 +0000 (00:22 +0000)]
eliminated global scroll_x and scroll_y variables
SVN-Revision: 1292
Matthias Braun [Thu, 20 May 2004 23:58:31 +0000 (23:58 +0000)]
fix jerky scrolling
SVN-Revision: 1291
Matthias Braun [Thu, 20 May 2004 23:46:50 +0000 (23:46 +0000)]
improve tux holding objects
SVN-Revision: 1290
Matthias Braun [Thu, 20 May 2004 23:34:53 +0000 (23:34 +0000)]
fixed bullet problems
SVN-Revision: 1289
Matthias Braun [Thu, 20 May 2004 23:25:30 +0000 (23:25 +0000)]
don't remove trampolines twice
SVN-Revision: 1288
Matthias Braun [Thu, 20 May 2004 23:19:55 +0000 (23:19 +0000)]
added standard header to files
SVN-Revision: 1287
Matthias Braun [Thu, 20 May 2004 23:09:40 +0000 (23:09 +0000)]
also install xpm icon
SVN-Revision: 1286
Matthias Braun [Thu, 20 May 2004 23:09:19 +0000 (23:09 +0000)]
fix for trampoline syntax
SVN-Revision: 1285
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
Matthias Braun [Thu, 20 May 2004 19:57:20 +0000 (19:57 +0000)]
forgot to add some files
SVN-Revision: 1283
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
Matthias Braun [Thu, 20 May 2004 15:58:10 +0000 (15:58 +0000)]
converted player to new object system
SVN-Revision: 1281
Ricardo Cruz [Thu, 20 May 2004 15:09:58 +0000 (15:09 +0000)]
Just added a missing header.
SVN-Revision: 1280
Matthias Braun [Thu, 20 May 2004 14:56:16 +0000 (14:56 +0000)]
forgot to add some files
SVN-Revision: 1279
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
Matthias Braun [Thu, 20 May 2004 13:33:26 +0000 (13:33 +0000)]
oops
SVN-Revision: 1277
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
Ricardo Cruz [Wed, 19 May 2004 18:22:48 +0000 (18:22 +0000)]
Don't do string objects tests this way!
SVN-Revision: 1272
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
Ricardo Cruz [Wed, 19 May 2004 10:55:31 +0000 (10:55 +0000)]
Remake of the Ingo's background.
SVN-Revision: 1270
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
Ricardo Cruz [Wed, 19 May 2004 10:28:38 +0000 (10:28 +0000)]
Bullet fire counting with its height.
SVN-Revision: 1268
Ryan Flegel [Wed, 19 May 2004 04:17:04 +0000 (04:17 +0000)]
- touched up bomb-explosion image
SVN-Revision: 1267
Ryan Flegel [Wed, 19 May 2004 03:49:53 +0000 (03:49 +0000)]
-updated TODO
SVN-Revision: 1266
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
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