supertux.git
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

14 years agoFix right files to depend on version.h.
anmaster [Fri, 1 Jan 2010 22:52:49 +0000 (22:52 +0000)]
Fix right files to depend on version.h.

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

14 years agoMake Cmake rerun svnversion even when just building and not configuring. Unknown...
anmaster [Fri, 1 Jan 2010 21:58:42 +0000 (21:58 +0000)]
Make Cmake rerun svnversion even when just building and not configuring. Unknown if it works with MSVC as target. If not (and anyone cares) there are more complex ways to make it work. Will not cause recompilation if not required.

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

14 years agoMinor cosmetic fixes: data/levels/world2/christoph3.stl
anmaster [Fri, 1 Jan 2010 18:29:41 +0000 (18:29 +0000)]
Minor cosmetic fixes: data/levels/world2/christoph3.stl

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

14 years agoFix door position in data/levels/world2/dfk-level3.stl.
anmaster [Fri, 1 Jan 2010 17:25:26 +0000 (17:25 +0000)]
Fix door position in data/levels/world2/dfk-level3.stl.

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

14 years agoMake data/levels/world2/castle.stl completable (used wrong type of invisible solid...
anmaster [Fri, 1 Jan 2010 17:20:53 +0000 (17:20 +0000)]
Make data/levels/world2/castle.stl completable (used wrong type of invisible solid tiles in a few places.

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

14 years agoFix up broken tiles in christoph5 somewhat. It now looks passable at least. Seems...
anmaster [Fri, 1 Jan 2010 17:02:08 +0000 (17:02 +0000)]
Fix up broken tiles in christoph5 somewhat. It now looks passable at least. Seems like someone overwrote some existing tile id with something completely different (wall -> window!) some time ago.

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

14 years agoFix some visible feets due to missing tiles in fg near the end of the level
anmaster [Fri, 1 Jan 2010 11:58:41 +0000 (11:58 +0000)]
Fix some visible feets due to missing tiles in fg near the end of the level

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

14 years agoSmall cosmetic fixes to world2/level1.stl (hardly really matters for that level though).
anmaster [Fri, 1 Jan 2010 10:48:31 +0000 (10:48 +0000)]
Small cosmetic fixes to world2/level1.stl (hardly really matters for that level though).

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

14 years agoMake it build with -DCOMPILE_AMALGATION=ON. Still not certain how intern_draw/next_po...
mathnerd314 [Fri, 1 Jan 2010 05:01:41 +0000 (05:01 +0000)]
Make it build with -DCOMPILE_AMALGATION=ON. Still not certain how intern_draw/next_po2 should be shared around the code.
Also remove loop for leveldone music

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

14 years agoFix broken dart traps in "Little Venice"
anmaster [Thu, 31 Dec 2009 03:02:27 +0000 (03:02 +0000)]
Fix broken dart traps in "Little Venice"

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

14 years agoAdd some tiles in the FG layer in light+magic to prevent feets showing through.
anmaster [Thu, 31 Dec 2009 02:43:33 +0000 (02:43 +0000)]
Add some tiles in the FG layer in light+magic to prevent feets showing through.

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

14 years agoUpdate Swedish translations for world1 and world2.
anmaster [Thu, 31 Dec 2009 02:32:11 +0000 (02:32 +0000)]
Update Swedish translations for world1 and world2.

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

14 years agoUpdate Swedish translation.
anmaster [Thu, 31 Dec 2009 01:53:44 +0000 (01:53 +0000)]
Update Swedish translation.

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

14 years agoAdded cast around GLEW_ARB_texture_non_power_of_two, as it might be a char and screw...
grumbel [Wed, 30 Dec 2009 13:46:13 +0000 (13:46 +0000)]
Added cast around GLEW_ARB_texture_non_power_of_two, as it might be a char and screw up output

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

14 years ago* Revert breaking changes from last revision
mathnerd314 [Tue, 29 Dec 2009 18:01:42 +0000 (18:01 +0000)]
* Revert breaking changes from last revision
* Update CMakeLists.txt with a new option COMPILE_AMALGATION (still needs some more work with magic constants)
* TODO updates to make it clearer/more informative

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

14 years agoinclude fixes from ohnobinki, video_systems.cpp should fall back to SDL now if GL...
mathnerd314 [Mon, 28 Dec 2009 05:19:55 +0000 (05:19 +0000)]
include fixes from ohnobinki, video_systems.cpp should fall back to SDL now if GL fails.

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

14 years agoAdd a constant for how long electrify lasts
mathnerd314 [Fri, 25 Dec 2009 22:10:39 +0000 (22:10 +0000)]
Add a constant for how long electrify lasts

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

14 years agoThunderstorm sounds (from Auria and Some_Person)
mathnerd314 [Fri, 25 Dec 2009 18:11:43 +0000 (18:11 +0000)]
Thunderstorm sounds (from Auria and Some_Person)

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

14 years agoChange anim_fps to fps in snail (fixes sprite; frames could use some work maybe)...
mathnerd314 [Thu, 24 Dec 2009 17:35:49 +0000 (17:35 +0000)]
Change anim_fps to fps in snail (fixes sprite; frames could use some work maybe) and tileset.

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

14 years ago- sounds are on both channels
mathnerd314 [Thu, 24 Dec 2009 16:26:47 +0000 (16:26 +0000)]
- sounds are on both channels
- break snail to make SpriteData::Action const
- player_status is local
- optimized tilemap::draw a bit (might do some more later)

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

14 years agosvn:eol-style native + comment fixes
mathnerd314 [Wed, 23 Dec 2009 19:35:43 +0000 (19:35 +0000)]
svn:eol-style native + comment fixes

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

14 years agoSome more sounds from Some_Person
mathnerd314 [Wed, 23 Dec 2009 18:46:28 +0000 (18:46 +0000)]
Some more sounds from Some_Person

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

14 years agoStuff from Some_Person.
mathnerd314 [Wed, 23 Dec 2009 05:30:16 +0000 (05:30 +0000)]
Stuff from Some_Person.
- new worldmap, key level, keys in existing levels
- revert sound changes from 6009 and copy hurt.wav to kill.wav until we get new sounds

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

14 years agoPlay kill.wav when Tux is killed, hurt.wav when he can keep on playing.
wolfgangb [Wed, 16 Dec 2009 21:03:21 +0000 (21:03 +0000)]
Play kill.wav when Tux is killed, hurt.wav when he can keep on playing.

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

14 years agotypo
wolfgangb [Wed, 16 Dec 2009 21:00:50 +0000 (21:00 +0000)]
typo

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

14 years agoAdded TexturePtr
grumbel [Mon, 14 Dec 2009 10:26:09 +0000 (10:26 +0000)]
Added TexturePtr

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

14 years agoAdded FontPtr
grumbel [Mon, 14 Dec 2009 09:05:15 +0000 (09:05 +0000)]
Added FontPtr

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

14 years agoAdded SpritePtr
grumbel [Mon, 14 Dec 2009 05:59:31 +0000 (05:59 +0000)]
Added SpritePtr

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

14 years agoAdded Surface::clone() method
grumbel [Mon, 14 Dec 2009 05:01:53 +0000 (05:01 +0000)]
Added Surface::clone() method

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

14 years agoRemoved some unused code
grumbel [Mon, 14 Dec 2009 04:50:24 +0000 (04:50 +0000)]
Removed some unused code

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

14 years agoTODO updates
grumbel [Mon, 14 Dec 2009 04:45:06 +0000 (04:45 +0000)]
TODO updates

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

14 years agoMore use of SurfacePtr
grumbel [Sun, 13 Dec 2009 23:51:40 +0000 (23:51 +0000)]
More use of SurfacePtr

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

14 years agoadd Boost to CMake
tuxdev [Sun, 13 Dec 2009 23:38:28 +0000 (23:38 +0000)]
add Boost to CMake

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

14 years agoAdded SurfacePtr
grumbel [Sun, 13 Dec 2009 23:30:55 +0000 (23:30 +0000)]
Added SurfacePtr

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

14 years agochange some LAYER_GUI to LAYER_HUD, update tinygettext, fix a warning in miniswig
mathnerd314 [Sun, 13 Dec 2009 23:23:21 +0000 (23:23 +0000)]
change some LAYER_GUI to LAYER_HUD, update tinygettext, fix a warning in miniswig

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

14 years agoMore use of SurfacePtr
grumbel [Sun, 13 Dec 2009 22:20:32 +0000 (22:20 +0000)]
More use of SurfacePtr

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

14 years agoUse boost::shared_ptr<Surface> instead of std::auto_ptr<Surface>
grumbel [Sun, 13 Dec 2009 22:11:09 +0000 (22:11 +0000)]
Use boost::shared_ptr<Surface> instead of std::auto_ptr<Surface>

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

14 years agoRemoved Unicode byte-order mark, which confuses the parser
grumbel [Mon, 7 Dec 2009 20:18:22 +0000 (20:18 +0000)]
Removed Unicode byte-order mark, which confuses the parser

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

14 years agoSwitched from GL_CLAMP to GL_CLAMP_TO_EDGE, fixes some blending artifacts on older...
grumbel [Mon, 7 Dec 2009 19:06:56 +0000 (19:06 +0000)]
Switched from GL_CLAMP to GL_CLAMP_TO_EDGE, fixes some blending artifacts on older graphics cards

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

14 years agoChanged Font code to use glyph.offset, instead of Rect() for variable width fonts...
grumbel [Mon, 7 Dec 2009 18:17:43 +0000 (18:17 +0000)]
Changed Font code to use glyph.offset, instead of Rect() for variable width fonts, as using Rect leads to shadows being cut off

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

14 years agoTODO updates
grumbel [Mon, 7 Dec 2009 18:10:10 +0000 (18:10 +0000)]
TODO updates

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

14 years agoAdded reset() and empty constructor to SDLSurfacePtr
grumbel [Mon, 7 Dec 2009 18:01:55 +0000 (18:01 +0000)]
Added reset() and empty constructor to SDLSurfacePtr

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

14 years agoDisabled debugging output on video mode switch
grumbel [Mon, 7 Dec 2009 18:01:07 +0000 (18:01 +0000)]
Disabled debugging output on video mode switch

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

14 years agominor tweaks for the extra warnings so the giant list isn't repeated
tuxdev [Mon, 7 Dec 2009 16:00:10 +0000 (16:00 +0000)]
minor tweaks for the extra warnings so the giant list isn't repeated

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

14 years agomake SDL texture optimization less aggressive and generally stupider
tuxdev [Mon, 7 Dec 2009 05:43:32 +0000 (05:43 +0000)]
make SDL texture optimization less aggressive and generally stupider

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

14 years agoAdded some notes about supported resolutions
grumbel [Mon, 7 Dec 2009 04:36:29 +0000 (04:36 +0000)]
Added some notes about supported resolutions

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

14 years agoTODO updates
grumbel [Mon, 7 Dec 2009 01:39:22 +0000 (01:39 +0000)]
TODO updates

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

14 years agoReplaced GL_ARB_texture_non_power_of_two with proper GLEW_ARB_texture_non_power_of_two
grumbel [Sun, 6 Dec 2009 22:44:50 +0000 (22:44 +0000)]
Replaced GL_ARB_texture_non_power_of_two with proper GLEW_ARB_texture_non_power_of_two

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

14 years agoAdded mipmapping, but disabled it, as it leads to some unwanted blurriness
grumbel [Sun, 6 Dec 2009 22:35:11 +0000 (22:35 +0000)]
Added mipmapping, but disabled it, as it leads to some unwanted blurriness

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

14 years agoCopy the palette of indexed images, fixes issue with the boats worldmap path which...
grumbel [Sun, 6 Dec 2009 21:40:01 +0000 (21:40 +0000)]
Copy the palette of indexed images, fixes issue with the boats worldmap path which didn't show up

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

14 years agoUse a new Texture for each Surface, this should fix blending artifacts caused by...
grumbel [Sun, 6 Dec 2009 12:44:11 +0000 (12:44 +0000)]
Use a new Texture for each Surface, this should fix blending artifacts caused by shared Textures (code is not bug free right now, the ship path on the Worldmap doesn't show up)

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

14 years agoSplitted TextureManager::create_image_texture() into multiple functions
grumbel [Sun, 6 Dec 2009 12:09:24 +0000 (12:09 +0000)]
Splitted TextureManager::create_image_texture() into multiple functions
Added SDLSurfacePtr class that handles the SDL_FreeSurface() call in an exception safe manner

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

14 years agoAdded empty SurfaceData class so we don't have to pass around void* pointers and...
grumbel [Sun, 6 Dec 2009 09:41:00 +0000 (09:41 +0000)]
Added empty SurfaceData class so we don't have to pass around void* pointers and break destruction

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

14 years agoTurned functions in video_systems.?pp into class VideoSystem
grumbel [Sun, 6 Dec 2009 09:11:12 +0000 (09:11 +0000)]
Turned functions in video_systems.?pp into class VideoSystem

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

14 years agoFixed Rect a bit and started to use Rect in Surface class
grumbel [Sun, 6 Dec 2009 08:45:57 +0000 (08:45 +0000)]
Fixed Rect a bit and started to use Rect in Surface class

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

14 years agoAdded basic integer rectangle class
grumbel [Sun, 6 Dec 2009 05:38:03 +0000 (05:38 +0000)]
Added basic integer rectangle class

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

14 years agoRenamed Rect to Rectf
grumbel [Sun, 6 Dec 2009 05:26:23 +0000 (05:26 +0000)]
Renamed Rect to Rectf

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

14 years agoUse data instead of throwaway_data for slope and short-circuit || instead of if(...
mathnerd314 [Sun, 6 Dec 2009 04:29:17 +0000 (04:29 +0000)]
Use data instead of throwaway_data for slope and short-circuit || instead of if(!) in TileSetParser

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

14 years agoRemoved friendship between TileSetParser and Tile, use proper constructor instead
grumbel [Sun, 6 Dec 2009 02:49:12 +0000 (02:49 +0000)]
Removed friendship between TileSetParser and Tile, use proper constructor instead

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