florianf [Fri, 12 Mar 2010 16:47:08 +0000 (16:47 +0000)]
Level 1-07 "Oh No More Snowballs": Added some background tiles.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6603
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 12 Mar 2010 15:55:55 +0000 (15:55 +0000)]
Level 1-06 "The Frosted Fields": Fix some "tile abuse" and add some background tiles.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6602
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 12 Mar 2010 15:32:56 +0000 (15:32 +0000)]
Level 1-04 "Tobgle Road": Added some background tiles.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6601
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 12 Mar 2010 15:22:01 +0000 (15:22 +0000)]
Level 1-03 "Via Nostalgica": Remove some "tile abuse".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6600
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 12 Mar 2010 14:58:43 +0000 (14:58 +0000)]
Level 1-21 "A Path in the Clouds": Make the background more random.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6599
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 12 Mar 2010 10:07:37 +0000 (10:07 +0000)]
supertux/tile.[ch]pp: Move the unisolid solidity checks to the "Tile" object.
This really didn't belong into the sector code.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6598
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Thu, 11 Mar 2010 19:14:28 +0000 (19:14 +0000)]
object/bonus_block.[ch]pp: Fix a NULL-pointer dereference.
Fixes a bug introduced in revision 6575: Since a player is not a badguy, the
Player* was NULL in the badguy code. Dereferencing it leads to a segmentation
fault.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6597
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Thu, 11 Mar 2010 09:36:45 +0000 (09:36 +0000)]
Bug 567: Add invisible unisolid slopes.
These invisible tiles can be used on the interactive layer while the actual
graphics are placed on a background layer. This makes it possible to achieve
unisolid behavior with any tileset.
Resolves #567.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6596
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Thu, 11 Mar 2010 09:33:59 +0000 (09:33 +0000)]
supertux/sector.cpp: Add support for "south", "west" and "east" unisolid tiles.
I.e. "south" meaning "can go down, not up", and "west" and "east" for left and
right as appropriate.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6595
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Thu, 11 Mar 2010 08:47:06 +0000 (08:47 +0000)]
supertux/tile.hpp: Implement Tile::is_unisolid().
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6594
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Thu, 11 Mar 2010 08:42:03 +0000 (08:42 +0000)]
supertux/tile.hpp: Implement Tile::is_slope().
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6593
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Thu, 11 Mar 2010 08:11:10 +0000 (08:11 +0000)]
Rename "AATriangle::DEFORM[1234]" to more meaningfull names.
They are named now:
AATriangle::DEFORM_TOP
AATriangle::DEFORM_BOTTOM
AATriangle::DEFORM_LEFT
AATriangle::DEFORM_RIGHT
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6592
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Wed, 10 Mar 2010 08:25:20 +0000 (08:25 +0000)]
Reduced spawn distance for enemies to screen size (experimental change, if something breaks, complain)
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6591
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Wed, 10 Mar 2010 04:33:52 +0000 (04:33 +0000)]
New minimalist intro.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6590
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Wed, 10 Mar 2010 04:30:25 +0000 (04:30 +0000)]
Update end sequence controller and stop backflipping immediately in end equence.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6589
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 9 Mar 2010 13:05:45 +0000 (13:05 +0000)]
Owl badguy: Fix turn-around behavior.
Turning back to the initial direction was broken.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6588
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 9 Mar 2010 12:42:56 +0000 (12:42 +0000)]
levels/test/owl.stl: Rename "bombfish" to "skydive".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6585
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 9 Mar 2010 12:40:07 +0000 (12:40 +0000)]
Renamed the "bombfish" sprite to "skydive".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6584
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 9 Mar 2010 12:38:29 +0000 (12:38 +0000)]
Rename the "BombFish" class to "SkyDive". The factory now uses the string "skydive".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6583
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 9 Mar 2010 12:35:06 +0000 (12:35 +0000)]
Move "badguy/bombfish.[ch]pp" to "badguy/skydive.[ch]pp".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6582
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Mon, 8 Mar 2010 21:37:32 +0000 (21:37 +0000)]
Patch for multiple joysticks from const86 <const@mimas.ru>
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6581
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Mon, 8 Mar 2010 13:33:44 +0000 (13:33 +0000)]
Bombfish: Create the explosion at the bottom of the bombfish.
Otherwise Tux won't be hurt when the bombfish falls onto him.
Resolves: #593
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6579
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Mon, 8 Mar 2010 11:37:52 +0000 (11:37 +0000)]
Added missing '('
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6578
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Mon, 8 Mar 2010 07:20:55 +0000 (07:20 +0000)]
Reverted r6576, Menus don't belong into JoystickKeyboardController
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6577
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 7 Mar 2010 23:47:14 +0000 (23:47 +0000)]
make joystick_options_menu and key_options_menu part of joystickkeyboardcontroller, so they can be freed properly.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6576
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 7 Mar 2010 23:44:35 +0000 (23:44 +0000)]
Pass player object in to BonusBlock rather than using Sector's global one.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6575
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 7 Mar 2010 23:43:26 +0000 (23:43 +0000)]
Some notes about co-op mode
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6574
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 7 Mar 2010 23:38:41 +0000 (23:38 +0000)]
Placeholder for player_id
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6573
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 7 Mar 2010 23:34:11 +0000 (23:34 +0000)]
More svn:eol-style
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6572
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 7 Mar 2010 22:58:54 +0000 (22:58 +0000)]
New kamikaze snowball collision image from Some_Person
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6571
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 7 Mar 2010 22:06:38 +0000 (22:06 +0000)]
svn:eol-style=native
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6570
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sun, 7 Mar 2010 10:00:25 +0000 (10:00 +0000)]
"whereami()" function: Print coordinates as integers.
The floating point part of the coordinates are distracting and not relevant.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6568
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Sat, 6 Mar 2010 21:06:46 +0000 (21:06 +0000)]
Switched to bluish owl
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6567
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sat, 6 Mar 2010 19:51:15 +0000 (19:51 +0000)]
Owl: Drop "Bombfishes" by default.
The position where the carried object is being held has been improved. The Owl
has been moved one layer up (to "LAYER_OBJECTS + 1") so it is in front of the
objects it holds.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6566
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Sat, 6 Mar 2010 19:50:47 +0000 (19:50 +0000)]
Compiler warning fix
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6565
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sat, 6 Mar 2010 19:47:36 +0000 (19:47 +0000)]
BombFish: Add an enemy that can be dropped by "Owl".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6564
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sat, 6 Mar 2010 17:16:38 +0000 (17:16 +0000)]
Owl: Add an offset to the "is_above_player()" method.
This way it is more likely that the thrown object will hit Tux. Also, the
standard "collision_player()" method from BadGuy will be used. There's no need
for the hack copied from the "Kamikaze Snowball".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6563
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sat, 6 Mar 2010 17:02:19 +0000 (17:02 +0000)]
Owl: Let go of the carried object when above Tux.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6562
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sat, 6 Mar 2010 16:49:53 +0000 (16:49 +0000)]
Owl: Implement carrying around of "Portable" objects.
Owls now bring a "rock" by default.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6561
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sat, 6 Mar 2010 16:21:05 +0000 (16:21 +0000)]
Owl: Turn around when hitting a wall.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6560
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Sat, 6 Mar 2010 16:14:20 +0000 (16:14 +0000)]
Removed some tile abuse
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6559
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sat, 6 Mar 2010 16:14:02 +0000 (16:14 +0000)]
Owl: Added initial code for an "Owl" badguy.
Graphics are based on a drawing by Grumbel. The badguy simply flies from right
to left for now.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6558
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Sat, 6 Mar 2010 15:24:48 +0000 (15:24 +0000)]
Added owl graphics
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6557
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Sat, 6 Mar 2010 12:12:26 +0000 (12:12 +0000)]
Removed coin-cost for reset points
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6556
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sat, 6 Mar 2010 09:29:58 +0000 (09:29 +0000)]
Level 1-01 "Welcome to Antarctica": Added billboard explaining the run-jump.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6555
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 5 Mar 2010 16:09:15 +0000 (16:09 +0000)]
badguy.cpp: Badguys don't squish other badguys.
They still turn around when walking into one another, but Bouncy, Jumpy and
friends no longer squish their coworkers.
Badguys that madly wish to be squished by other badguys, should check if they
were hit from above in "collision_badguy" which is now called instead.
Some exception *might* be necessary for stalactites.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6554
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 5 Mar 2010 09:00:50 +0000 (09:00 +0000)]
addon_manager.cpp: Changed add-on URL to supertux.lethargik.org/addons/index.nfo.
The old URL is a redirect to there.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6553
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 5 Mar 2010 08:37:28 +0000 (08:37 +0000)]
badguy/haywire.cpp: Use the x-acceleration to follow the player.
This is a lot smoother and generally nicer than the previous (proof of concept)
code.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6552
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 5 Mar 2010 08:36:26 +0000 (08:36 +0000)]
badguy/walking_badguy.cpp: Turn the badguy around when his speed doesn't match the direction he's facing.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6551
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 5 Mar 2010 08:27:35 +0000 (08:27 +0000)]
badguy/walking_badguy.[ch]pp: Make it possible to specify the target x velocity.
This will be use by "Haywire" eventually to get a more smooth "follow the
player" effect.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6550
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 5 Mar 2010 07:45:29 +0000 (07:45 +0000)]
badguy/walking_badguy.cpp: Don't set "walk_speed" to zero when frozen.
Otherwise the badguy doesn't start walking after being un-frozen.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6549
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 5 Mar 2010 07:42:10 +0000 (07:42 +0000)]
badguy/walking_badguy.cpp: Fix the acceleration code.
It should now be able to handle all situations, even when the badguy is thrown
backwards faster than he would normally walk forward (was broken before) and
frozen badguys are no longer sliding along without a move animation.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6548
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Thu, 4 Mar 2010 23:25:26 +0000 (23:25 +0000)]
First crack at a new camera, before my plane flight leaves.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6547
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Thu, 4 Mar 2010 20:08:03 +0000 (20:08 +0000)]
Level 1-01 "Welcome to Antarctica": Added a note about statistics to the reset point infoblock.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6546
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Thu, 4 Mar 2010 18:38:59 +0000 (18:38 +0000)]
supertux/game_session.[ch]pp: Fix a segmantation fault when loading an invalid level file.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6545
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Thu, 4 Mar 2010 18:10:53 +0000 (18:10 +0000)]
supertux/man/man6/supertux2.6: Fix a syntax error.
Thanks to Christoph Egger for the fix.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6544
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Thu, 4 Mar 2010 13:37:38 +0000 (13:37 +0000)]
Level 1-22 "A Mysterious House of Ice": Replace some forgotten "ice" background tiles.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6543
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Thu, 4 Mar 2010 13:13:53 +0000 (13:13 +0000)]
Cannon: Use the cannon's and badguy's bounding boxes to calculate the starting position.
The previous code assumed width of no more than 32 pixels to work correctly.
mathnerd314's change in revision 6530 widened that a bit, but could only be
considered a dirty hack. This change should work for arbitrary badguy widths,
moving narrow badguys (Short Fuse, for example) closer to the Cannon when shot
to the left.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6542
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Thu, 4 Mar 2010 13:06:41 +0000 (13:06 +0000)]
Snowshot: Call ->set_action() in the constructor.
Otherwise the bounding box will be initialized to "collision-left" which is
only 15 pixels wide. This will be corrected by ->initialize() eventually, but
by then it's too late for the "Cannon" code.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6541
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Thu, 4 Mar 2010 10:13:26 +0000 (10:13 +0000)]
Removed speed limit when grabbing normal objects
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6540
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Thu, 4 Mar 2010 02:42:48 +0000 (02:42 +0000)]
Minor cleanup in SoundManager
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6539
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Thu, 4 Mar 2010 02:41:22 +0000 (02:41 +0000)]
Use static casts in GL::Renderer
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6538
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Thu, 4 Mar 2010 02:39:19 +0000 (02:39 +0000)]
Small cleanup of Sector::get_nearest_player
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6537
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Thu, 4 Mar 2010 02:37:48 +0000 (02:37 +0000)]
Remove walk key
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6536
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Wed, 3 Mar 2010 08:18:04 +0000 (08:18 +0000)]
Tweak offsets a bit so kamikazesnowball doesn't die.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6530
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Wed, 3 Mar 2010 07:11:24 +0000 (07:11 +0000)]
Don't save state of initial worldmap before loading it
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6529
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Wed, 3 Mar 2010 07:07:41 +0000 (07:07 +0000)]
Apparently C++ doesn't automatically convert from std::string to const char*...
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6528
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Wed, 3 Mar 2010 06:54:58 +0000 (06:54 +0000)]
Check that savegame exists before trying to load it.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6527
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Wed, 3 Mar 2010 06:50:54 +0000 (06:50 +0000)]
someone forgot a ! in world.cpp...
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6526
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Wed, 3 Mar 2010 06:22:36 +0000 (06:22 +0000)]
Change Mysterious House of Ice to use dark bg tiles.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6525
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Tue, 2 Mar 2010 19:36:22 +0000 (19:36 +0000)]
Removed unused TileSet member variable from Tile
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6522
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 2 Mar 2010 19:02:32 +0000 (19:02 +0000)]
Haywire: Fix a null-pointer dereference when Haywire gets hit by an iceblock.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6520
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Tue, 2 Mar 2010 19:00:31 +0000 (19:00 +0000)]
Some install changes to CMakeLists.txt
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6519
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Tue, 2 Mar 2010 17:18:32 +0000 (17:18 +0000)]
Added background image, removed snow particles (visual overkill)
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6518
837edb03-e0f3-0310-88ca-
d4d4e8b29345
anmaster [Tue, 2 Mar 2010 16:46:29 +0000 (16:46 +0000)]
Update sv.po to match recent changes. Also reword some bits to work better.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6517
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 2 Mar 2010 16:35:34 +0000 (16:35 +0000)]
Level 1-12 "Into the Stars": Changed the level height to 60 tiles.
For a level with this name, I felt it was reasonable to make a level that
actually went up. A (somewhat hidden) passage with a moving platform has been
added to give the level some "verticality".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6516
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 2 Mar 2010 16:03:22 +0000 (16:03 +0000)]
Level 1-01: Fixed decal filenames.
Renamed them in SVN but forgot to adapt the level, sorry.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6515
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 2 Mar 2010 14:09:41 +0000 (14:09 +0000)]
Level 1-10 "23rd Airborne": Added a (somewhat hidden) low passage.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6514
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 2 Mar 2010 11:54:42 +0000 (11:54 +0000)]
Short Fuse: Make badguy shootable with the fireflower.
Seemed illogical not to.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6513
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 2 Mar 2010 11:34:03 +0000 (11:34 +0000)]
Short Fuse: Implemented the new minibomb from the Milestone 2 Design Document.
Short Fuse is a small version of Mr. Bomb, possibly his offspring. Like all
children, it runs around faster than his big relatives do but can't do any
harm.
Short Fuse will explode immediately on contact but without hurting anybody.
Instead, the explosion will throw Tux and other badguys about.
A short test level is included as well.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6511
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 2 Mar 2010 11:25:10 +0000 (11:25 +0000)]
object/explosion.[ch]pp: Added the "hurt" and "push" members.
If "hurt" is set (true by default), then the explosion will hurt Tux and nearby
badguys. If "push" is set (false by default), Tux and nearby walking badguys
will experience the force of the explosion, possibly throwing them in the air.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6510
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 2 Mar 2010 11:22:41 +0000 (11:22 +0000)]
supertux/sector.[ch]pp: Implemented the get_nearby_objects() method.
This method returns all moving objects close to a given point. Among other
things, this may be the player and walking badguys.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6509
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 2 Mar 2010 11:20:33 +0000 (11:20 +0000)]
badguy/walking_badguy.[ch]pp: Added the add_velocity() method.
The speed is simply added to the current velocity of the badguy. The walking
speed is regained using an acceleration of walk_speed/s, i.e. it takes one
second to get from zero to full speed again (or from twice the speed back to
normal).
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6508
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 2 Mar 2010 09:01:38 +0000 (09:01 +0000)]
Snowman: Created body-only animation and added it to the squished collision handler.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6507
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Tue, 2 Mar 2010 08:59:57 +0000 (08:59 +0000)]
Some TODO updates
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6506
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Mon, 1 Mar 2010 20:54:10 +0000 (20:54 +0000)]
Nightcave test level: Restore decals that have been broken by an editor bug in revision 6392.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6503
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Mon, 1 Mar 2010 20:49:42 +0000 (20:49 +0000)]
Level 1-01 "Welcome to Antarctica": Added billboards describing the egg, fireflower and reset points.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6502
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Mon, 1 Mar 2010 20:43:57 +0000 (20:43 +0000)]
Added test level for "unstable tiles".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6501
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Mon, 1 Mar 2010 17:07:53 +0000 (17:07 +0000)]
Use proper background tiles for secret area
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6495
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Mon, 1 Mar 2010 16:58:16 +0000 (16:58 +0000)]
Turned the run-blockade into a staircase, to allow backtracking
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6494
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Mon, 1 Mar 2010 16:49:43 +0000 (16:49 +0000)]
Fine tuned the enemy placement and removed lots of useless enemies
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6493
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Mon, 1 Mar 2010 16:07:21 +0000 (16:07 +0000)]
object/unstable_tile.[ch]pp: Implement third state, "shake".
The order of the states is now:
shake → dissolve → fall-down
Each state is optional. The tile will be made non-solid at the end of
"dissolve". If that action is missing in the sprite, the tile will be solid
when it falls down, making it possible to jump off of it.
Jumping off of a falling tile works better than I had expected. I've changed
the gravity modifier to 0.98 nonetheless, so that the tile falls slightly
slower than Tux does.
The "unstable_tile" and "castleblock" sprites now use the "shake" action and
not the "dissolve" action.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6492
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Mon, 1 Mar 2010 11:31:30 +0000 (11:31 +0000)]
Resized background to 800x600 to work around bug drawing bug seen in data/levels/bonus2/level20.stl, current background code requires background images of the same size
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6486
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Mon, 1 Mar 2010 11:26:20 +0000 (11:26 +0000)]
sdl_texture.cpp: Rewrite the optimize() function.
The changes made by tuxdev in revision 6192 broke alpha handling in the SDL
renderer for me (SDL 1.2.7). This commit fixes handling of semi-transparent
surfaces / pixels and improves the function towards readability.
It starts by categorizing pixels into three categories: transparent,
semi-transparent and opaque.
* If semi-transparent pixels are present, "SDL_DisplayFormatAlpha" is used.
* If only opaque pixels are present, "SDL_DisplayFormat" is used.
* If only opaque and transparent pixels are present, "SDL_SetColorKey" is used
for 1-bit alpha.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6485
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Mon, 1 Mar 2010 11:25:23 +0000 (11:25 +0000)]
Implemented proper clipping
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6484
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Mon, 1 Mar 2010 11:25:01 +0000 (11:25 +0000)]
Added DrawingContext::get_cliprect()
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6483
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Mon, 1 Mar 2010 11:24:30 +0000 (11:24 +0000)]
Added constructor te Rectf() that takes a Sizef
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6482
837edb03-e0f3-0310-88ca-
d4d4e8b29345
anmaster [Sun, 28 Feb 2010 22:32:23 +0000 (22:32 +0000)]
Try to fix level20 by adding a black image at top and bottom. Note a bug currently makes this render incorrectly for the top part.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6481
837edb03-e0f3-0310-88ca-
d4d4e8b29345
anmaster [Sun, 28 Feb 2010 21:15:40 +0000 (21:15 +0000)]
Expand bonus2/level20.stl to fill new max resolution. The background looks somewhat strange due to not being large enough to fill up the level height, but it doesn't look unacceptably bad.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6480
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sun, 28 Feb 2010 21:08:34 +0000 (21:08 +0000)]
Unstable tile: Dissolve, then disappear without falling down.
The new behavior is as follows: If the sprite has a "dissolve" action, it is
triggered on contact. If the "dissolve" animation ends, or if the sprite
doesn't have a "dissolve" action, the "fall-down" action is triggered. If that
animation is done, or if the sprite doesn't have a "fall-down" action, the
object is removed.
Possible future improvements:
- Make the tile non-solid at the end of "dissolve", rather than at the
beginning of "fall-down". This way falling only sprites would still be solid.
For this to be of use the collision detection needs to be improved, though.
- Also, remove the object after is has hit a solid object or has fallen out of
the screen. The "remove at end of animation" behavior is more of a dirty
hack.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6479
837edb03-e0f3-0310-88ca-
d4d4e8b29345
projects / supertux.git / log