Ricardo Cruz [Wed, 18 Aug 2004 21:36:00 +0000 (21:36 +0000)]
Forward bug fix port to HEAD.
Bug reported by Seneca.
Also changed UPGRADE_HERRING by UPGRADE_STAR.
SVN-Revision: 1813
Ricardo Cruz [Wed, 18 Aug 2004 18:27:32 +0000 (18:27 +0000)]
Made draw() func on Player more sane.
Bugfix: blink Tux on safe time.
SVN-Revision: 1811
Ricardo Cruz [Wed, 18 Aug 2004 18:26:40 +0000 (18:26 +0000)]
Round frame on checking for last frame, so that the last frame is used.
SVN-Revision: 1810
Ricardo Cruz [Wed, 18 Aug 2004 11:04:06 +0000 (11:04 +0000)]
A few more tiles for World 1 by Demon Night!
SVN-Revision: 1809
Ricardo Cruz [Wed, 18 Aug 2004 10:44:15 +0000 (10:44 +0000)]
Added menu bugs.
SVN-Revision: 1808
Ricardo Cruz [Wed, 18 Aug 2004 10:38:10 +0000 (10:38 +0000)]
Just got rid of the damn reference.
Can anyone fix this hack with horizontal lines, titles...?
Maybe we should just replace this code by the old one.
SVN-Revision: 1807
Ricardo Cruz [Wed, 18 Aug 2004 10:32:26 +0000 (10:32 +0000)]
Improvements.
SVN-Revision: 1806
Ricardo Cruz [Wed, 18 Aug 2004 10:31:49 +0000 (10:31 +0000)]
Idle change.
SVN-Revision: 1805
Ryan Flegel [Wed, 18 Aug 2004 00:11:22 +0000 (00:11 +0000)]
- removing generated file
SVN-Revision: 1804
Ricardo Cruz [Tue, 17 Aug 2004 23:23:11 +0000 (23:23 +0000)]
Changed next action behavior.
SVN-Revision: 1803
Ricardo Cruz [Tue, 17 Aug 2004 23:06:27 +0000 (23:06 +0000)]
Added more animations.
Didn't manage to put idle one working.
SVN-Revision: 1802
Ricardo Cruz [Tue, 17 Aug 2004 23:05:25 +0000 (23:05 +0000)]
Added a few more animations.
SVN-Revision: 1801
Ricardo Cruz [Tue, 17 Aug 2004 23:04:54 +0000 (23:04 +0000)]
Renaming images.
SVN-Revision: 1800
Ricardo Cruz [Tue, 17 Aug 2004 23:01:58 +0000 (23:01 +0000)]
Added next action to sprite.
SVN-Revision: 1799
Ricardo Cruz [Tue, 17 Aug 2004 22:01:20 +0000 (22:01 +0000)]
Renaming images.
SVN-Revision: 1798
Ricardo Cruz [Tue, 17 Aug 2004 22:01:20 +0000 (22:01 +0000)]
Renaming images.
SVN-Revision: 1797
Ricardo Cruz [Tue, 17 Aug 2004 21:54:22 +0000 (21:54 +0000)]
Separated body parts!
SVN-Revision: 1796
Ricardo Cruz [Tue, 17 Aug 2004 21:53:20 +0000 (21:53 +0000)]
Changed output message.
SVN-Revision: 1795
Ricardo Cruz [Tue, 17 Aug 2004 21:52:45 +0000 (21:52 +0000)]
Added entries for separated body parts.
SVN-Revision: 1794
Ricardo Cruz [Tue, 17 Aug 2004 21:51:31 +0000 (21:51 +0000)]
Moved supertux.strf to inside images/.
SVN-Revision: 1793
Ricardo Cruz [Tue, 17 Aug 2004 21:46:41 +0000 (21:46 +0000)]
Renaming images.
SVN-Revision: 1792
Marek Moeckel [Tue, 17 Aug 2004 09:54:23 +0000 (09:54 +0000)]
...and another one...
SVN-Revision: 1791
Marek Moeckel [Tue, 17 Aug 2004 09:49:34 +0000 (09:49 +0000)]
small fix in level24
SVN-Revision: 1790
Marek Moeckel [Mon, 16 Aug 2004 23:57:04 +0000 (23:57 +0000)]
...and welcome back again! :)
SVN-Revision: 1789
Marek Moeckel [Mon, 16 Aug 2004 23:56:03 +0000 (23:56 +0000)]
something went wrong when updating one level file, so good-bye, torfi-level1...
SVN-Revision: 1788
Marek Moeckel [Mon, 16 Aug 2004 23:52:20 +0000 (23:52 +0000)]
copied 0.1.2 bonus levels to HEAD branch
removed duplicate castle.stl, which is already in "world2" directory
SVN-Revision: 1787
Marek Moeckel [Mon, 16 Aug 2004 17:09:28 +0000 (17:09 +0000)]
removed old unused waterfall tiles
SVN-Revision: 1786
Marek Moeckel [Mon, 16 Aug 2004 17:02:52 +0000 (17:02 +0000)]
added new waterfall and transparent water tiles by unDEFER, used it in levels 5,24,25
SVN-Revision: 1784
Ricardo Cruz [Mon, 16 Aug 2004 13:40:07 +0000 (13:40 +0000)]
Brick graphics improved by Florian Merz!
SVN-Revision: 1782
Benjamin P. Jung [Mon, 16 Aug 2004 13:09:08 +0000 (13:09 +0000)]
To make the animation of the protagonist easier I've separated the steps of the large Tux's animation into different parts.
(Added directory data/images/shared/tux/)
'Tux in action' can be put together by using the following layers:
- extra (such as invincibility stars or a cape maybe)
- arms
- feet
- head
- body
The names of the images I've provided might be confusing at first sight, but they may (or may not) make pretty much sense:
<character-name>-<body-part>-<modification>-<action>-<direction>-<no.>.png
SVN-Revision: 1781
Ricardo Cruz [Mon, 16 Aug 2004 12:13:00 +0000 (12:13 +0000)]
Just added more info to warning.
SVN-Revision: 1780
Ricardo Cruz [Mon, 16 Aug 2004 11:53:34 +0000 (11:53 +0000)]
Changed variable name and fixed reverse animation.
SVN-Revision: 1779
Ricardo Cruz [Sat, 14 Aug 2004 18:45:25 +0000 (18:45 +0000)]
We could been losting frames. Fixed.
SVN-Revision: 1778
Ricardo Cruz [Sat, 14 Aug 2004 12:00:58 +0000 (12:00 +0000)]
Trampoline image was not yet working cause:
- forgot to disable animation;
- made a mistake in the supertux.strt entries.
:(
SVN-Revision: 1777
Ricardo Cruz [Sat, 14 Aug 2004 11:50:58 +0000 (11:50 +0000)]
Changed Walking Tree direction change behavior.
SVN-Revision: 1776
Ricardo Cruz [Sat, 14 Aug 2004 11:50:24 +0000 (11:50 +0000)]
Improvements.
SVN-Revision: 1775
Ricardo Cruz [Sat, 14 Aug 2004 11:33:53 +0000 (11:33 +0000)]
Removed trampoline sprites hack.
SVN-Revision: 1774
Ricardo Cruz [Sat, 14 Aug 2004 11:32:51 +0000 (11:32 +0000)]
Improved Sprites animations.
SVN-Revision: 1773
Ricardo Cruz [Fri, 13 Aug 2004 22:32:42 +0000 (22:32 +0000)]
Added support for one time animations to Sprite.
I'll port the one-time animations hacks - if nobody else does - later.
SVN-Revision: 1770
Ricardo Cruz [Fri, 13 Aug 2004 22:22:47 +0000 (22:22 +0000)]
Should fix arm crash.
SVN-Revision: 1769
Ricardo Cruz [Fri, 13 Aug 2004 14:03:32 +0000 (14:03 +0000)]
Commented unncessary sprites - there might be others.
Don't add entries of not used sprites, since they will be loaded into memory!
SVN-Revision: 1768
Ricardo Cruz [Fri, 13 Aug 2004 14:02:20 +0000 (14:02 +0000)]
Using wrong name for sprite.
SVN-Revision: 1767
Ricardo Cruz [Fri, 13 Aug 2004 13:39:18 +0000 (13:39 +0000)]
Check if this fixes the jamming.
SVN-Revision: 1766
Ricardo Cruz [Fri, 13 Aug 2004 11:43:15 +0000 (11:43 +0000)]
File not being closed.
SVN-Revision: 1765
Ricardo Cruz [Thu, 12 Aug 2004 22:06:13 +0000 (22:06 +0000)]
Changed player stuff to use actions.
This was hard work!
SVN-Revision: 1760
Ricardo Cruz [Thu, 12 Aug 2004 22:05:24 +0000 (22:05 +0000)]
Changed player stuff to use action. Bad guys should also be changed.
It was really time consuming to change all the entries from supertux.strf. There might be problems, especially with the arm. Anyway, since arm, body, head... will be all changed, this will be then fixed.
SVN-Revision: 1759
Ricardo Cruz [Thu, 12 Aug 2004 22:03:05 +0000 (22:03 +0000)]
Changed parameter from set_action().
SVN-Revision: 1758
Ricardo Cruz [Thu, 12 Aug 2004 20:55:05 +0000 (20:55 +0000)]
Added what I called of actions to Sprite.
Instead of putting "left", "right", "jump-right"... as different sprites, we can now put them as one, and name them with different actions. To change to an action, just do set_action("jump-left"); , for instance.
Suggested by Ryan.
SVN-Revision: 1757
Tobias Gläßer [Wed, 11 Aug 2004 15:32:21 +0000 (15:32 +0000)]
Reverted last commit of Ricardo. The change led to unavoidable crashs in many X configurations including mine. The old behaviour should work correctly under a wide varity of platforms.
SVN-Revision: 1749
Ricardo Cruz [Tue, 10 Aug 2004 16:07:28 +0000 (16:07 +0000)]
Use SDL toggle call in non-windows systems.
This should be faster and more X11 friendly.
SVN-Revision: 1732
Ricardo Cruz [Tue, 10 Aug 2004 11:43:57 +0000 (11:43 +0000)]
There is no point in making a Y inferior to scroll_y checking, since bullets accel is down.
Fixes bug reported by unDEFER in the mailing list.
SVN-Revision: 1731
Ricardo Cruz [Tue, 10 Aug 2004 11:34:54 +0000 (11:34 +0000)]
Added a space on --version.
SVN-Revision: 1730
Ricardo Cruz [Tue, 10 Aug 2004 11:32:54 +0000 (11:32 +0000)]
Changed 0.1.1 version to 0.2-cvs in HEAD.
SVN-Revision: 1727
Tobias Gläßer [Sun, 8 Aug 2004 15:46:21 +0000 (15:46 +0000)]
Merged the bitmask code with a newer version (1.3) of the bitmask library.
SVN-Revision: 1726
Tobias Gläßer [Sun, 8 Aug 2004 13:07:22 +0000 (13:07 +0000)]
Finally tested and implemented the bitmask_create_SDL function right. It should actually work now and is a good option for an advanced collision detection implementation.
SVN-Revision: 1725
Marek Moeckel [Sun, 8 Aug 2004 10:34:33 +0000 (10:34 +0000)]
added waterfall tiles
SVN-Revision: 1722
Marek Moeckel [Sun, 8 Aug 2004 09:42:50 +0000 (09:42 +0000)]
fixed some visible blank tiles in the levels
There are more invalid tile id's; does anyone know where they come from??
SVN-Revision: 1721
Tobias Gläßer [Sat, 7 Aug 2004 11:34:41 +0000 (11:34 +0000)]
Empty menus shouldn't lead to crashs anymore.
SVN-Revision: 1719
Ricardo Cruz [Fri, 6 Aug 2004 17:37:56 +0000 (17:37 +0000)]
Replaced insert() by this cleaner way to add entries.
SVN-Revision: 1717
Tobias Gläßer [Fri, 6 Aug 2004 12:10:54 +0000 (12:10 +0000)]
The right (source) data directory should now be found whether you use libtool to link your application against the SuperTux library or not.
SVN-Revision: 1716
Tobias Gläßer [Fri, 6 Aug 2004 11:43:10 +0000 (11:43 +0000)]
Converted many char*s to std::strings. This is providing more safety from buffer overflows and anyway more straightforward string handling.
SVN-Revision: 1715
Ryan Flegel [Fri, 6 Aug 2004 01:36:47 +0000 (01:36 +0000)]
- fixed search path for datadir
SVN-Revision: 1714
Tobias Gläßer [Thu, 5 Aug 2004 20:11:30 +0000 (20:11 +0000)]
Fixed #include introduced by the last commit.
In the library all includes have to be in "#include ../libsubdir/foo.h" style, so that the relations between the includes work correctly inside your /usr/(local)/include/ directory as well.
SVN-Revision: 1713
Ricardo Cruz [Thu, 5 Aug 2004 19:29:02 +0000 (19:29 +0000)]
Removed commented code.
SVN-Revision: 1712
Ricardo Cruz [Thu, 5 Aug 2004 18:58:08 +0000 (18:58 +0000)]
Replaced the use of a vector for the tiles placement by a map one.
This way, empty tiles are not created, and so, we can now have the organization I posted on the ml.
SVN-Revision: 1711
Ricardo Cruz [Thu, 5 Aug 2004 14:09:12 +0000 (14:09 +0000)]
When there is no entries in a menu, there is a crash. This delays the crash until an event is triggered. Select a level from Contrib Levels for testing.
I dunno what changes Tobias made to menu, but I don't think that ugly checking for horizontal lines was in there.
SVN-Revision: 1707
Ricardo Cruz [Thu, 5 Aug 2004 13:49:20 +0000 (13:49 +0000)]
Just tweaked the stomp cloud values a little.
A destroying animation would fit nicely, if anyone is willing to do it.
SVN-Revision: 1706
Ricardo Cruz [Thu, 5 Aug 2004 10:10:19 +0000 (10:10 +0000)]
Made the stomp cloud to have an independent movement from Tux by making it a GameObject.
Next time, please don't implement it, unless you do it properly.
SVN-Revision: 1705
Ricardo Cruz [Thu, 5 Aug 2004 10:08:43 +0000 (10:08 +0000)]
Added base_type to vector constructor.
This way it is possible to just pass the object's base to draw() and other functions that want Vectors.
SVN-Revision: 1704
Marek Moeckel [Thu, 5 Aug 2004 08:02:46 +0000 (08:02 +0000)]
forgot one image :)
SVN-Revision: 1702
Marek Moeckel [Thu, 5 Aug 2004 07:58:54 +0000 (07:58 +0000)]
gave the coins another paint job, according to Ingo's suggestions
minor fix in level3
SVN-Revision: 1701
Marek Moeckel [Wed, 4 Aug 2004 17:59:54 +0000 (17:59 +0000)]
added Ingo's new coin
please have a look and decide if you like it :)
SVN-Revision: 1700
Benjamin P. Jung [Mon, 2 Aug 2004 10:21:09 +0000 (10:21 +0000)]
- Added new Tornado enemy
SVN-Revision: 1693
Ricardo Cruz [Sun, 1 Aug 2004 21:56:49 +0000 (21:56 +0000)]
Growing Tux animation without stars by Benjamin!! Thx!
I believe the stars are odd for the players.
SVN-Revision: 1692
Marek Moeckel [Sun, 1 Aug 2004 18:37:10 +0000 (18:37 +0000)]
added lava tiles
SVN-Revision: 1689
Benjamin P. Jung [Sun, 1 Aug 2004 16:21:46 +0000 (16:21 +0000)]
- Added mrflame-left-{1..4}.png and mrflame-right-{1..4}.png
SVN-Revision: 1688
Marek Moeckel [Sun, 1 Aug 2004 12:11:10 +0000 (12:11 +0000)]
updated music here, too
SVN-Revision: 1687
Marek Moeckel [Sat, 31 Jul 2004 22:20:42 +0000 (22:20 +0000)]
created world2 directory and put Iceberg Fortress in there
SVN-Revision: 1683
Tobias Gläßer [Thu, 29 Jul 2004 23:11:03 +0000 (23:11 +0000)]
the last change didn't work portable
SVN-Revision: 1669
Tobias Gläßer [Thu, 29 Jul 2004 12:54:25 +0000 (12:54 +0000)]
Debugging and testing SuperTux from within the source directory should be easier now.
SVN-Revision: 1668
Ricardo Cruz [Thu, 29 Jul 2004 11:24:41 +0000 (11:24 +0000)]
Added support for break lines for get_text_width() - returns the size of the largest paragraph.
Also added a get_text_height() that also supports break lines - returns the size of all the paragraphs.
SVN-Revision: 1667
Ricardo Cruz [Thu, 29 Jul 2004 11:23:21 +0000 (11:23 +0000)]
Removed unnecessary (?) FIXME comment.
SVN-Revision: 1666
Tobias Gläßer [Thu, 29 Jul 2004 11:05:28 +0000 (11:05 +0000)]
- FrameRate class is more flexible
- All "game-loops" use the FrameRate class now
SVN-Revision: 1665
Tobias Gläßer [Wed, 28 Jul 2004 23:47:54 +0000 (23:47 +0000)]
fixed compilation problem
SVN-Revision: 1664
Tobias Gläßer [Wed, 28 Jul 2004 23:33:23 +0000 (23:33 +0000)]
fix for the compilation problem of many pre gcc3.4.x users.
SVN-Revision: 1663
Tobias Gläßer [Wed, 28 Jul 2004 23:06:12 +0000 (23:06 +0000)]
- Various fixes and cleanups.
- Added FrameRate class to SuperTux library
- More menu code C++ing.
SVN-Revision: 1662
Ricardo Cruz [Wed, 28 Jul 2004 22:23:23 +0000 (22:23 +0000)]
- Fixed gradient not working when cached (SDL mode);
- Fixed and enabled draw_stretched() that allows zooming.
SVN-Revision: 1661
Ricardo Cruz [Wed, 28 Jul 2004 21:47:43 +0000 (21:47 +0000)]
Added a --flip-levels argument, I guess it doesn't need any description of what it does. :)
SVN-Revision: 1660
Ricardo Cruz [Wed, 28 Jul 2004 20:41:59 +0000 (20:41 +0000)]
Improved passive messages code. Fixed bug of showing a previous passive message when a new one should be being displayed now.
A bug still to fix is that when going from a passive message to a map one, both will be displayed. Anyway, first we need to test if this all code of passive/map messages is working.
SVN-Revision: 1659
Ricardo Cruz [Wed, 28 Jul 2004 16:08:13 +0000 (16:08 +0000)]
Added an ugly message flag. Any artists there?
Also removed depricated levelmarker.png image.
SVN-Revision: 1656
Ricardo Cruz [Wed, 28 Jul 2004 16:07:08 +0000 (16:07 +0000)]
Bug fix: When using map-message field and there is a level there, don't draw message flag.
For the record, I haven't testes the last two commits to head. I guess I've an excuse this time, since It's not pretty to test stuff when you have to work with data files on /usr/../supertux/ folder.
SVN-Revision: 1655
Ricardo Cruz [Wed, 28 Jul 2004 16:04:25 +0000 (16:04 +0000)]
New field: (passive-message "blabla") . This will show blabla in a passive way. ie. when a player passed throught it, it will be shown for almost 3 seconds.
As I said in my previous commit to 0_1_1_branch that �When you go from a message to another, you might notice that only a random of those will be displayed, not necessarly the last one. Will be fixed.�.
Also, if you use (map-message "blabla"), a message flag will be shown in that field.
SVN-Revision: 1654
Ricardo Cruz [Wed, 28 Jul 2004 14:57:24 +0000 (14:57 +0000)]
Added support for break lines in centered text.
The code is pretty hacky, but seems to work fine, and such a feature was really needed to avoid hacks (for instance, the one found in display_text_file()).
In the future, it would be a good idea to add break lines support for get_text_width() and get_text_height().
SVN-Revision: 1652
Ricardo Cruz [Wed, 28 Jul 2004 10:59:00 +0000 (10:59 +0000)]
Fixed the not saving bug.
It's odd, there was this code in savegame():
if(filename != "")
return;
?!?!?!? :O
SVN-Revision: 1651
Ricardo Cruz [Wed, 28 Jul 2004 10:48:49 +0000 (10:48 +0000)]
Tux growing animation and door opening alpha was not being applied. Fixed.
Why haven't anyone noticed it yet?!
SVN-Revision: 1650
Ricardo Cruz [Wed, 28 Jul 2004 10:47:49 +0000 (10:47 +0000)]
Changes in worldmap:
- Fixed bugs created by myself due to the Level SpecialTile replacement variable names.
- Changed movement code a bit - could use a deeper look. Now possible to change direction during movement. Also movement stops when the Menu is called.
Saving (and loading?) doesn't seem to work. Not sure who faults it is, but I prefer to blaim the new library path code. :)
SVN-Revision: 1649
Ricardo Cruz [Tue, 27 Jul 2004 22:46:13 +0000 (22:46 +0000)]
Fixed bug to let the player go through messages with no levels on it.
SVN-Revision: 1645
Ricardo Cruz [Tue, 27 Jul 2004 22:31:30 +0000 (22:31 +0000)]
Renamed Level by SpecialTile.
Fixed bug that was causing every special tiles to be saved, not just levels.
SVN-Revision: 1642
Tobias Gläßer [Tue, 27 Jul 2004 20:07:35 +0000 (20:07 +0000)]
removed special/stringlist.cpp/h
SVN-Revision: 1641
Tobias Gläßer [Tue, 27 Jul 2004 19:31:39 +0000 (19:31 +0000)]
- Cleanups
- Got rid of string_list_type (caution! Bugs with the replacement solutions are likely to happen, that will be fixed)
SVN-Revision: 1640