supertux.git
14 years agoLevel 1-04 "Tobgle Road": Resize level to height 25 tiles.
florianf [Sun, 21 Feb 2010 14:45:13 +0000 (14:45 +0000)]
Level 1-04 "Tobgle Road": Resize level to height 25 tiles.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6364 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-02 "The Journey Begins": Resize level to height 25 tiles.
florianf [Sun, 21 Feb 2010 14:33:56 +0000 (14:33 +0000)]
Level 1-02 "The Journey Begins": Resize level to height 25 tiles.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6363 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoAdded crystal cave tiles, not very useful at this point
grumbel [Sun, 21 Feb 2010 14:32:57 +0000 (14:32 +0000)]
Added crystal cave tiles, not very useful at this point

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6362 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-03 "Via Nostalgica": Resize level to height 25 tiles.
florianf [Sun, 21 Feb 2010 14:30:33 +0000 (14:30 +0000)]
Level 1-03 "Via Nostalgica": Resize level to height 25 tiles.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6361 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-21 "A Path in the Clouds": Resize level to height 25 tiles.
florianf [Sun, 21 Feb 2010 14:25:50 +0000 (14:25 +0000)]
Level 1-21 "A Path in the Clouds": Resize level to height 25 tiles.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6360 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoRemoved some confusing tiles at the end of the level
grumbel [Sun, 21 Feb 2010 11:48:51 +0000 (11:48 +0000)]
Removed some confusing tiles at the end of the level

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6359 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoAddded some basic decal
grumbel [Sun, 21 Feb 2010 11:42:43 +0000 (11:42 +0000)]
Addded some basic decal

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6358 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-17 "Or is it just me": Resize level to height 25 tiles.
florianf [Sun, 21 Feb 2010 11:16:32 +0000 (11:16 +0000)]
Level 1-17 "Or is it just me": Resize level to height 25 tiles.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6357 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-26 "The Castle of Nolok": Resize level to height 25 tiles.
florianf [Sun, 21 Feb 2010 10:55:15 +0000 (10:55 +0000)]
Level 1-26 "The Castle of Nolok": Resize level to height 25 tiles.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6356 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-24 "The Shattered Bridge": Resize level to height 25 tiles.
florianf [Sun, 21 Feb 2010 10:18:21 +0000 (10:18 +0000)]
Level 1-24 "The Shattered Bridge": Resize level to height 25 tiles.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6355 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoFixes issues in tilespec
grumbel [Sun, 21 Feb 2010 10:07:01 +0000 (10:07 +0000)]
Fixes issues in tilespec

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6354 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoAdded some more slope documentation
grumbel [Sun, 21 Feb 2010 10:06:32 +0000 (10:06 +0000)]
Added some more slope documentation

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6353 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-15 "Under the Ice": Resize level to height 25 tiles.
florianf [Sun, 21 Feb 2010 10:05:06 +0000 (10:05 +0000)]
Level 1-15 "Under the Ice": Resize level to height 25 tiles.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6352 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-14 "Entrance to the Cave": Resize level to height 25 tiles.
florianf [Sun, 21 Feb 2010 09:59:42 +0000 (09:59 +0000)]
Level 1-14 "Entrance to the Cave": Resize level to height 25 tiles.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6351 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-12 "Into the Stars": Resize level to height 25 tiles.
florianf [Sun, 21 Feb 2010 09:47:31 +0000 (09:47 +0000)]
Level 1-12 "Into the Stars": Resize level to height 25 tiles.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6350 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-11 "Night Chill": Resize level to height 25 tiles.
florianf [Sun, 21 Feb 2010 09:36:04 +0000 (09:36 +0000)]
Level 1-11 "Night Chill": Resize level to height 25 tiles.

Also added a fading tilemap for one of the secret areas.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6349 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-09 "Grumbels Sense of Snow": Remove auxiliary limiting blocks.
florianf [Sun, 21 Feb 2010 09:22:00 +0000 (09:22 +0000)]
Level 1-09 "Grumbels Sense of Snow": Remove auxiliary limiting blocks.

Mrs. Snowball is used instead.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6348 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-08 "Stone Cold": Resize level to height 25 tiles.
florianf [Sun, 21 Feb 2010 09:18:02 +0000 (09:18 +0000)]
Level 1-08 "Stone Cold": Resize level to height 25 tiles.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6347 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-03 "Via Nostalgica": Create unisolid platform for Mr. Bomb.
florianf [Sun, 21 Feb 2010 09:11:50 +0000 (09:11 +0000)]
Level 1-03 "Via Nostalgica": Create unisolid platform for Mr. Bomb.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6346 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-13 "Above the Arctic Skies": Remove auxiliary limiting blocks.
florianf [Sun, 21 Feb 2010 09:00:01 +0000 (09:00 +0000)]
Level 1-13 "Above the Arctic Skies": Remove auxiliary limiting blocks.

Mrs. Snowball is used instead.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6345 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agodata/images/tiles.strf: Added slope data for the nightcave tiles.
florianf [Sun, 21 Feb 2010 08:43:07 +0000 (08:43 +0000)]
data/images/tiles.strf: Added slope data for the nightcave tiles.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6344 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoNightCave test level: Added level name.
florianf [Sun, 21 Feb 2010 08:21:32 +0000 (08:21 +0000)]
NightCave test level: Added level name.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6343 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 524: Fading TileMaps may change solidity of the TileMap.
florianf [Sun, 21 Feb 2010 08:15:57 +0000 (08:15 +0000)]
Bug 524: Fading TileMaps may change solidity of the TileMap.

When the alpha value of a layer is changed to > .75, the solid flag will be
set. When the alpha value of a layer is changed to < .25, the solid flag is
cleared. This prevents hiding background / foreground layers at the beginning
of the level and display them as a result to some action of the player.

Resolves #524.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6342 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoAdded some more slopes for nightcave
grumbel [Sat, 20 Feb 2010 19:12:08 +0000 (19:12 +0000)]
Added some more slopes for nightcave

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6341 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agomakedist.sh: Include the external/ subdirectory in the distribution.
florianf [Sat, 20 Feb 2010 18:22:10 +0000 (18:22 +0000)]
makedist.sh: Include the external/ subdirectory in the distribution.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6340 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agomakedist.sh: Updated to current build system and available files.
florianf [Sat, 20 Feb 2010 18:07:35 +0000 (18:07 +0000)]
makedist.sh: Updated to current build system and available files.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6339 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoAdded some basic slopes and a test level for nightcave
grumbel [Sat, 20 Feb 2010 14:38:28 +0000 (14:38 +0000)]
Added some basic slopes and a test level for nightcave

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6338 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoAdded some new tiles (unfinished work in progress)
grumbel [Sat, 20 Feb 2010 11:49:04 +0000 (11:49 +0000)]
Added some new tiles (unfinished work in progress)

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6337 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoMinor cleanup
grumbel [Wed, 17 Feb 2010 13:16:48 +0000 (13:16 +0000)]
Minor cleanup

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6335 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoAdjust music definition files.
mmccutchen [Mon, 15 Feb 2010 05:41:35 +0000 (05:41 +0000)]
Adjust music definition files.

http://lists.lethargik.org/pipermail/supertux-devel-lethargik.org/2009-November/002508.html

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6334 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoReplace data README with AUTHORS file. (based heavily off of [[DataFiles]])
mathnerd314 [Mon, 15 Feb 2010 00:12:55 +0000 (00:12 +0000)]
Replace data README with AUTHORS file. (based heavily off of [[DataFiles]])

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6333 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoNot everything is dual licensed. See [DataFiles] and svn log.
wolfgangb [Sat, 13 Feb 2010 12:54:44 +0000 (12:54 +0000)]
Not everything is dual licensed. See [DataFiles] and svn log.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6331 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoSlope is essential for badguys to reach Tux when he respawns.
wolfgangb [Sat, 13 Feb 2010 12:34:54 +0000 (12:34 +0000)]
Slope is essential for badguys to reach Tux when he respawns.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6330 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoAlign stalactites more precisely in Yeti level.
mathnerd314 [Sat, 13 Feb 2010 04:06:42 +0000 (04:06 +0000)]
Align stalactites more precisely in Yeti level.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6329 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoSome Yeti boss work. Yes, you *can* beat it as small tux. (And the secret area *is...
mathnerd314 [Sat, 13 Feb 2010 03:43:44 +0000 (03:43 +0000)]
Some Yeti boss work. Yes, you *can* beat it as small tux. (And the secret area *is* also reachable if you're inhumanly precise)

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6328 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years ago{,data/}README: Document license of data files.
florianf [Fri, 12 Feb 2010 07:15:50 +0000 (07:15 +0000)]
{,data/}README: Document license of data files.

Thanks to ohnobinki for the patch.
Resolves: #578.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6327 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoRemove SCons build system.
mathnerd314 [Fri, 12 Feb 2010 05:38:12 +0000 (05:38 +0000)]
Remove SCons build system.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6326 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoPass Vector by value
mathnerd314 [Fri, 12 Feb 2010 05:33:20 +0000 (05:33 +0000)]
Pass Vector by value

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6325 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoCometParticleSystem include fix
mathnerd314 [Fri, 12 Feb 2010 05:29:50 +0000 (05:29 +0000)]
CometParticleSystem include fix

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6324 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoUpdate install file a bit.
mathnerd314 [Thu, 11 Feb 2010 20:31:49 +0000 (20:31 +0000)]
Update install file a bit.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6323 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 574: Check whether the Console instance still exists before accessing it.
florianf [Thu, 11 Feb 2010 16:07:56 +0000 (16:07 +0000)]
Bug 574: Check whether the Console instance still exists before accessing it.

If the global Console instance doesn't exist anymore (or not yet), "std::cerr"
will be used instead.

Resolves: #574.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6322 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoVarious objects: Use "reader_get_layer" to parse the "z-pos" and "layer" options.
florianf [Thu, 11 Feb 2010 14:55:39 +0000 (14:55 +0000)]
Various objects: Use "reader_get_layer" to parse the "z-pos" and "layer" options.

This should be a much more thorough fix for the bug described in #527 "Text and
backgrounds can overlap the menu".

References: #527.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6321 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agosrc/util/reader.[ch]pp: Add "reader_get_layer" ...
florianf [Thu, 11 Feb 2010 14:54:15 +0000 (14:54 +0000)]
src/util/reader.[ch]pp: Add "reader_get_layer" ...

... a utility function to read and sanitize the "layer" and "z-pos" options.

References: #527.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6320 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-23 "The Escape": Use "ice" background add unisolid tiles.
florianf [Thu, 11 Feb 2010 10:27:18 +0000 (10:27 +0000)]
Level 1-23 "The Escape": Use "ice" background add unisolid tiles.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6319 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 527: Limit tilemap and background layers to (LAYER_GUI - 100).
florianf [Thu, 11 Feb 2010 09:25:36 +0000 (09:25 +0000)]
Bug 527: Limit tilemap and background layers to (LAYER_GUI - 100).

This way tilemaps and backgrounds can no longer overlap the menu.
Resolves #527.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6318 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-13 "Above the Arctic Skies": Fix unreasonable z-position.
florianf [Thu, 11 Feb 2010 08:57:20 +0000 (08:57 +0000)]
Level 1-13 "Above the Arctic Skies": Fix unreasonable z-position.

Thanks to Matt McCutchen for the fix.
Related to #527.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6317 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 568: Level 2-builder "Tux the Builder": Remove "ugly" slope combination.
florianf [Thu, 11 Feb 2010 08:51:40 +0000 (08:51 +0000)]
Bug 568: Level 2-builder "Tux the Builder": Remove "ugly" slope combination.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6316 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 568: Level 2-"Crumbling Path": Remove "ugly" slope combination.
florianf [Thu, 11 Feb 2010 08:43:40 +0000 (08:43 +0000)]
Bug 568: Level 2-"Crumbling Path": Remove "ugly" slope combination.

Also added a fading secret area tilemap.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6315 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 568: Level 2-leaves "Walking Leaves": Remove "ugly" slope combination.
florianf [Thu, 11 Feb 2010 08:17:16 +0000 (08:17 +0000)]
Bug 568: Level 2-leaves "Walking Leaves": Remove "ugly" slope combination.

Resolves #568.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6314 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 576: Level 1-22 "A Mysterious House of Ice": Use different background tiles.
florianf [Thu, 11 Feb 2010 08:03:42 +0000 (08:03 +0000)]
Bug 576: Level 1-22 "A Mysterious House of Ice": Use different background tiles.

Use the "ice" tiles rather than the "snow" tiles for the background. The
"interactive" layer uses the "snow" tiles, which made it hard to see which
tiles one could stand on and which were background.
Resolves #576.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6313 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 577: (Re)allow Player to low-jump from a stopped position.
florianf [Thu, 11 Feb 2010 07:51:49 +0000 (07:51 +0000)]
Bug 577: (Re)allow Player to low-jump from a stopped position.

Reverts the player controls change from r6272 (bug 577).
Thanks to Matt McCutchen for this patch.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6312 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoUpdate squirrel to 2.2.4 (keeping const-correctness of sqstdstream)
mathnerd314 [Tue, 9 Feb 2010 22:06:41 +0000 (22:06 +0000)]
Update squirrel to 2.2.4 (keeping const-correctness of sqstdstream)

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6311 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoLevel 1-21 "A Path in the Clouds": Make edges between snow and ice nicer.
florianf [Tue, 9 Feb 2010 20:05:13 +0000 (20:05 +0000)]
Level 1-21 "A Path in the Clouds": Make edges between snow and ice nicer.

Since there are no special tiles for this edge, make do with interactive and
background layer.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6310 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 570: Level 1-07 "Oh no! More Snowballs!": Add fading secret area tilemap.
florianf [Tue, 9 Feb 2010 09:54:21 +0000 (09:54 +0000)]
Bug 570: Level 1-07 "Oh no! More Snowballs!": Add fading secret area tilemap.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6309 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 570: Level 1-06 "The Frosted Fields": Add fading secret area tilemap.
florianf [Tue, 9 Feb 2010 09:52:37 +0000 (09:52 +0000)]
Bug 570: Level 1-06 "The Frosted Fields": Add fading secret area tilemap.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6308 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 570: Level 1-04 "Tobgle Road": Add fading secret area tilemap.
florianf [Tue, 9 Feb 2010 09:50:40 +0000 (09:50 +0000)]
Bug 570: Level 1-04 "Tobgle Road": Add fading secret area tilemap.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6307 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoAdded missing variable initialisation and replaced some str != "" with !str.empty()
grumbel [Sat, 6 Feb 2010 20:19:53 +0000 (20:19 +0000)]
Added missing variable initialisation and replaced some str != "" with !str.empty()

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6305 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agosupertux/collision.[ch]pp: Use "contrain_*" rather than "min_*" and "max_*".
florianf [Mon, 1 Feb 2010 13:28:38 +0000 (13:28 +0000)]
supertux/collision.[ch]pp: Use "contrain_*" rather than "min_*" and "max_*".

See Matt's comments on bug #456.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6304 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 571: Take tilemap movement into account when handling unisolid tiles for collisio...
florianf [Sun, 31 Jan 2010 22:50:40 +0000 (22:50 +0000)]
Bug 571: Take tilemap movement into account when handling unisolid tiles for collision detection.

As Mathnerd314 has pointed out on IRC, checking (movement.y >= 0) is not
correct when the tilemap containing the unisolid tile is moving. In this case,
the relative speed should be considered.

Resolves #571.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6303 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agosrc/supertux/sector.cpp: Use shift delta when checking the position of non-sloped...
florianf [Sun, 31 Jan 2010 22:44:17 +0000 (22:44 +0000)]
src/supertux/sector.cpp: Use shift delta when checking the position of non-sloped unisolid tiles.

This solves the "Tux falls through unisolid moving platforms" bug observed by
Mathnerd314.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6302 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 566: Implement handling of unisolid slopes.
florianf [Sun, 31 Jan 2010 22:20:16 +0000 (22:20 +0000)]
Bug 566: Implement handling of unisolid slopes.

The current code handling unisolid tiles only works correctly with normal,
quadratic tiles. The attached patch implements correct handling of unisolid
slopes.

Whether or not an unisolid tile is solid depends on two factors: The movement
of the player and the position of the player.

Checking the movement of the player is simple with quadratic tiles: If the
y-component is positive, the player is moving "down" and the tile should be
solid. Otherwise, the tile is non-solid. With slopes the check is more complex:
A player may move "up" and still move "against" a slope tile which should then
be solid. The patch introduces a new function "check_movement_unisolid" which
compares the tangent / gradient of the slope and the movement and decides based
on that.

Again, checking the position of the player is easy with quadratic tiles. If
(tile.top > player.bottom), the player is above the tile. Otherwise, the player
is below of in the tile (for example when the player jumped up through the tile
but not enough to reach the surface). With slopes, the check is more
complicated because the player may be already within the tile but still above
the surface. Especially with DEFORM1 the player may be more than 16 pixels into
the tile without reaching the surface. The new "check_position_unisolid"
function introduced by the patch handles these cases correctly.

Last but not least: With north-west and north-east slopes there are unisolid
tiles which can be passed from top to bottom but which are solid when moving
from the bottom up. The functions introduced by the patch handle these slopes
correctly, too.

Resolves: #566.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6301 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 563: Reset backflipping when Tux spawns.
florianf [Sat, 30 Jan 2010 17:40:25 +0000 (17:40 +0000)]
Bug 563: Reset backflipping when Tux spawns.

There is one player object per sector. If Tux backflips into a script trigger
and spawns in another sector, the player object in the first sector will still
have "backflipping = true", and Tux will be backflipping when he returns to the
first sector. This looks wrong and can get the user stuck in "Find the Bigger
Fish". The flag needs to be reset when Tux spawns.

Resolves #563. Thanks to Matt McCutchen for this patch.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6300 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 562: Collision detection for unisolid tiles doesn't handle tilemap offset
florianf [Sat, 30 Jan 2010 17:36:43 +0000 (17:36 +0000)]
Bug 562: Collision detection for unisolid tiles doesn't handle tilemap offset

- Use the new TileMap::get_tile_bbox function, which handles offset.

Cleanups:

- Get the bottom from the original MovingObject rather than subtracting
  movement from dest (an ugly kludge).

- Apply De Morgan's law so the test more clearly corresponds to the
  comment.

Resolves #562. Thanks to Matt McCutchen for updating the patch.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6299 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 474: Flip bonus-block flowers and partial-size tilemaps properly.
florianf [Sat, 30 Jan 2010 13:01:38 +0000 (13:01 +0000)]
Bug 474: Flip bonus-block flowers and partial-size tilemaps properly.

Resolves #474. Thanks to Matt McCutchen for this patch.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6298 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoCleanups related to tilemap positions:
florianf [Sat, 30 Jan 2010 12:44:05 +0000 (12:44 +0000)]
Cleanups related to tilemap positions:

- Combine TileMap::{x,y}_offset into a vector TileMap::offset.

- Factor out some widely duplicated code into new TileMap methods
  get_tile_position, get_bbox, get_tile_bbox, get_tiles_overlapping.

- AATriangle contains a Rectf instead of two vectors.

- Some simplification to Sector::is_free_of_tiles.

- BadGuy::might_fall passed a zero-width rectangle to
  Sector::is_free_of_tiles.  With the new code, such a rectangle can slip
  between two tiles without overlapping either one, giving an incorrect
  result.  So change the BadGuy::might_fall rectangle to have width 1.

Thanks to Matt McCutchen for this patch.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6297 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 565: Support "editor-images" within "tiles".
florianf [Sat, 30 Jan 2010 11:53:43 +0000 (11:53 +0000)]
Bug 565: Support "editor-images" within "tiles".

Resolves #565.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6295 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoFurther cleanups to texture caching, from bug 523:
florianf [Sat, 30 Jan 2010 11:13:25 +0000 (11:13 +0000)]
Further cleanups to texture caching, from bug 523:

- Texture::filename was used for only one purpose, so we might as well
  make that clear.

- Set the filename in just one place: before a texture is added to the
  cache.  This is intended to be obviously correct.

- Other minor adjustments.

Thanks to Matt McCutchen for this patch.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6294 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 557: config.h misses INSTALL_SUBDIR_* variables on first cmake run
florianf [Sat, 30 Jan 2010 11:08:04 +0000 (11:08 +0000)]
Bug 557: config.h misses INSTALL_SUBDIR_* variables on first cmake run

The first time cmake runs in a new supertux build tree, config.h is generated
before the INSTALL_SUBDIR_{BIN,SHARE} variables are set and thus contains empty
values for these variables. If the executable is built right away and run, it
crashes because it cannot find the data files.

Resolves #557. Thanks to Matt McCutchen for this patch.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6293 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 560: Fix 1-pixel gaps between tiles near hidden areas.
florianf [Sat, 30 Jan 2010 10:52:11 +0000 (10:52 +0000)]
Bug 560: Fix 1-pixel gaps between tiles near hidden areas.

Resolves #560. Thanks to Matt McCutchen for this patch.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6292 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 541: Version-sort the level filenames.
florianf [Sat, 30 Jan 2010 10:48:19 +0000 (10:48 +0000)]
Bug 541: Version-sort the level filenames.

Resolves #541. Thanks to Matt McCutchen for this patch.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6291 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 507: Reset stuff upon player death
florianf [Sat, 30 Jan 2010 10:43:02 +0000 (10:43 +0000)]
Bug 507: Reset stuff upon player death

If Tux dies while he is subject to increased gravity (jump_early_apex), he
retains this attribute during the dying sequence, which looks weird.

I will attach a patch that resets the safe_timer and gravity and, for
consistency, resets the invincibility upon death instead of checking !dying
when creating sparkles.

Resolves #507. Thanks to Matt McCutchen for this patch.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6290 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 509: Omit "Best" stats in end sequence for non-worldmap level
florianf [Sat, 30 Jan 2010 10:33:53 +0000 (10:33 +0000)]
Bug 509: Omit "Best" stats in end sequence for non-worldmap level

Resolves #509. Thanks to Matt McCutchen for this patch.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6289 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 508: Make PlayerStatus::reset reset displayed_coins.
florianf [Sat, 30 Jan 2010 10:21:26 +0000 (10:21 +0000)]
Bug 508: Make PlayerStatus::reset reset displayed_coins.

Resolves #508. Thanks to Matt McCutchen for this patch.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6288 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agosrc/math/aatriangle.cpp: Added forgotten new file.
florianf [Sat, 30 Jan 2010 10:13:20 +0000 (10:13 +0000)]
src/math/aatriangle.cpp: Added forgotten new file.

This file should have been part of the previous commit, but I forgot to add it.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6287 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 100: Flip slopes properly.
florianf [Sat, 30 Jan 2010 10:08:30 +0000 (10:08 +0000)]
Bug 100: Flip slopes properly.

Resolves #100. Thanks to Matt McCutchen for this patch.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6286 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 471: Fix upward release of ice block, and grabbing cleanups.
florianf [Sat, 30 Jan 2010 09:36:44 +0000 (09:36 +0000)]
Bug 471: Fix upward release of ice block, and grabbing cleanups.

Resolves #471. Thanks to Matt McCutchen for this patch.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6285 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBug 456: Avoid hurting Tux in a ravine.
florianf [Sat, 30 Jan 2010 09:23:14 +0000 (09:23 +0000)]
Bug 456: Avoid hurting Tux in a ravine.

- Fix blooper where slope constraints overwrote previously calculated
  constraints.
- Make static collision detection symmetrical left-right.

There are still a lot of things wrong with static collision detection,
which I hope to fix later.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6284 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agosrc/video/sdl_renderer.cpp: Work around a segmentation fault in SDL.
florianf [Sat, 30 Jan 2010 09:17:20 +0000 (09:17 +0000)]
src/video/sdl_renderer.cpp: Work around a segmentation fault in SDL.

This closes bug #512.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6283 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoFix spawnpoint in "Down the rabbit hole"
mathnerd314 [Thu, 28 Jan 2010 05:07:28 +0000 (05:07 +0000)]
Fix spawnpoint in "Down the rabbit hole"

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6275 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoShake camera on buttjump.
mathnerd314 [Tue, 26 Jan 2010 02:42:10 +0000 (02:42 +0000)]
Shake camera on buttjump.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6274 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoUse supertux2 on Windows, zeekling squish animation fix.
mathnerd314 [Mon, 25 Jan 2010 23:35:02 +0000 (23:35 +0000)]
Use supertux2 on Windows, zeekling squish animation fix.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6273 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoMrIceBlock stops after bouncing a lot.
mathnerd314 [Mon, 25 Jan 2010 22:55:44 +0000 (22:55 +0000)]
MrIceBlock stops after bouncing a lot.
Snail can be kicked.
Player backflip/duck jump behavior change.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6272 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoConsole logging is now identical in all builds; warning and error show the console...
mathnerd314 [Mon, 25 Jan 2010 02:01:14 +0000 (02:01 +0000)]
Console logging is now identical in all builds; warning and error show the console for 1.5-3 seconds.
Tile editor images are now scripted by debug_draw_editor_images
Change contrib_menu level subset warning to info.
Ignore "release" directory that holds release builds.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6271 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoUse NDEBUG a bit less.
mathnerd314 [Sun, 24 Jan 2010 20:04:45 +0000 (20:04 +0000)]
Use NDEBUG a bit less.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6270 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoTile fixes.
mathnerd314 [Sun, 24 Jan 2010 01:42:21 +0000 (01:42 +0000)]
Tile fixes.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6269 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBadguy activation/deactivation (Matt's patch from bug 540)
mathnerd314 [Thu, 21 Jan 2010 00:23:58 +0000 (00:23 +0000)]
Badguy activation/deactivation (Matt's patch from bug 540)

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6268 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoMatt's patch for Stalactite shaking (bug 543)
mathnerd314 [Thu, 21 Jan 2010 00:09:05 +0000 (00:09 +0000)]
Matt's patch for Stalactite shaking (bug 543)

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6267 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoOcto's patch from bug 523.
mathnerd314 [Wed, 20 Jan 2010 23:35:46 +0000 (23:35 +0000)]
Octo's patch from bug 523.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6266 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoBugs 454 (ice attribute) + 553 (Knee-deep in the Depth secret area) fixes
mathnerd314 [Wed, 20 Jan 2010 23:24:05 +0000 (23:24 +0000)]
Bugs 454 (ice attribute) + 553 (Knee-deep in the Depth secret area) fixes

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6265 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoRemove bonus-grow.png and make lava tiles hurt.
mathnerd314 [Wed, 20 Jan 2010 23:02:18 +0000 (23:02 +0000)]
Remove bonus-grow.png and make lava tiles hurt.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6264 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoUpdated editor images from Some_Person/bug 481
mathnerd314 [Tue, 19 Jan 2010 04:04:20 +0000 (04:04 +0000)]
Updated editor images from Some_Person/bug 481

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6263 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoMrBomb, MrIceBlock, and Snail now die on invincibility rather than just being kicked...
mathnerd314 [Tue, 19 Jan 2010 03:06:25 +0000 (03:06 +0000)]
MrBomb, MrIceBlock, and Snail now die on invincibility rather than just being kicked. (Also incorporates Matt's patch for bug 468)

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6262 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoSnow ADSR (bug 221)
mathnerd314 [Mon, 18 Jan 2010 23:27:55 +0000 (23:27 +0000)]
Snow ADSR (bug 221)

This has the same ideas as the patch but is implemented slightly differently. Tweaks to various constants/timings welcome.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6261 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoChange DELTA to .002 (wait for bugs...)
mathnerd314 [Mon, 18 Jan 2010 22:41:35 +0000 (22:41 +0000)]
Change DELTA to .002 (wait for bugs...)

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6260 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoMark "auto" as translatable
mathnerd314 [Mon, 18 Jan 2010 16:06:51 +0000 (16:06 +0000)]
Mark "auto" as translatable

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6259 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoTurkish translation from meczup
mathnerd314 [Mon, 18 Jan 2010 15:01:39 +0000 (15:01 +0000)]
Turkish translation from meczup

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6258 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoDoors can run scripts now.
mathnerd314 [Mon, 18 Jan 2010 00:15:08 +0000 (00:15 +0000)]
Doors can run scripts now.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6257 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoUnstableTile and WeakBlock are affected by Explosions.
mathnerd314 [Sun, 17 Jan 2010 21:11:16 +0000 (21:11 +0000)]
UnstableTile and WeakBlock are affected by Explosions.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6256 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoReplace igel with snail in dan_morial.stl + small nit in CMakeLists.txt
mathnerd314 [Sun, 17 Jan 2010 19:53:26 +0000 (19:53 +0000)]
Replace igel with snail in dan_morial.stl + small nit in CMakeLists.txt

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6255 837edb03-e0f3-0310-88ca-d4d4e8b29345

14 years agoFix for bug 544 and it's duplicates.
mmlosh [Wed, 13 Jan 2010 18:46:25 +0000 (18:46 +0000)]
Fix for bug 544 and it's duplicates.
There are some minor chagnes to the patch to make it more readable, but the credit still belongs to octo

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6254 837edb03-e0f3-0310-88ca-d4d4e8b29345