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

SVN-Revision: 6325

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

SVN-Revision: 6324

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

SVN-Revision: 6323

14 years agoBug 574: Check whether the Console instance still exists before accessing it.
Florian Forster [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.

SVN-Revision: 6322

14 years agoVarious objects: Use "reader_get_layer" to parse the "z-pos" and "layer" options.
Florian Forster [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.

SVN-Revision: 6321

14 years agosrc/util/reader.[ch]pp: Add "reader_get_layer" ...
Florian Forster [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.

SVN-Revision: 6320

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

SVN-Revision: 6319

14 years agoBug 527: Limit tilemap and background layers to (LAYER_GUI - 100).
Florian Forster [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.

SVN-Revision: 6318

14 years agoLevel 1-13 "Above the Arctic Skies": Fix unreasonable z-position.
Florian Forster [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.

SVN-Revision: 6317

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

SVN-Revision: 6316

14 years agoBug 568: Level 2-"Crumbling Path": Remove "ugly" slope combination.
Florian Forster [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.

SVN-Revision: 6315

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

Resolves #568.

SVN-Revision: 6314

14 years agoBug 576: Level 1-22 "A Mysterious House of Ice": Use different background tiles.
Florian Forster [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.

SVN-Revision: 6313

14 years agoBug 577: (Re)allow Player to low-jump from a stopped position.
Florian Forster [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.

SVN-Revision: 6312

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)

SVN-Revision: 6311

14 years agoLevel 1-21 "A Path in the Clouds": Make edges between snow and ice nicer.
Florian Forster [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.

SVN-Revision: 6310

14 years agoBug 570: Level 1-07 "Oh no! More Snowballs!": Add fading secret area tilemap.
Florian Forster [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.

SVN-Revision: 6309

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

SVN-Revision: 6308

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

SVN-Revision: 6307

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

SVN-Revision: 6305

14 years agosupertux/collision.[ch]pp: Use "contrain_*" rather than "min_*" and "max_*".
Florian Forster [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.

SVN-Revision: 6304

14 years agoBug 571: Take tilemap movement into account when handling unisolid tiles for collisio...
Florian Forster [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.

SVN-Revision: 6303

14 years agosrc/supertux/sector.cpp: Use shift delta when checking the position of non-sloped...
Florian Forster [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.

SVN-Revision: 6302

14 years agoBug 566: Implement handling of unisolid slopes.
Florian Forster [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.

SVN-Revision: 6301

14 years agoBug 563: Reset backflipping when Tux spawns.
Florian Forster [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.

SVN-Revision: 6300

14 years agoBug 562: Collision detection for unisolid tiles doesn't handle tilemap offset
Florian Forster [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.

SVN-Revision: 6299

14 years agoBug 474: Flip bonus-block flowers and partial-size tilemaps properly.
Florian Forster [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.

SVN-Revision: 6298

14 years agoCleanups related to tilemap positions:
Florian Forster [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.

SVN-Revision: 6297

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

Resolves #565.

SVN-Revision: 6295

14 years agoFurther cleanups to texture caching, from bug 523:
Florian Forster [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.

SVN-Revision: 6294

14 years agoBug 557: config.h misses INSTALL_SUBDIR_* variables on first cmake run
Florian Forster [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.

SVN-Revision: 6293

14 years agoBug 560: Fix 1-pixel gaps between tiles near hidden areas.
Florian Forster [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.

SVN-Revision: 6292

14 years agoBug 541: Version-sort the level filenames.
Florian Forster [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.

SVN-Revision: 6291

14 years agoBug 507: Reset stuff upon player death
Florian Forster [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.

SVN-Revision: 6290

14 years agoBug 509: Omit "Best" stats in end sequence for non-worldmap level
Florian Forster [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.

SVN-Revision: 6289

14 years agoBug 508: Make PlayerStatus::reset reset displayed_coins.
Florian Forster [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.

SVN-Revision: 6288

14 years agosrc/math/aatriangle.cpp: Added forgotten new file.
Florian Forster [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.

SVN-Revision: 6287

14 years agoBug 100: Flip slopes properly.
Florian Forster [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.

SVN-Revision: 6286

14 years agoBug 471: Fix upward release of ice block, and grabbing cleanups.
Florian Forster [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.

SVN-Revision: 6285

14 years agoBug 456: Avoid hurting Tux in a ravine.
Florian Forster [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.

SVN-Revision: 6284

14 years agosrc/video/sdl_renderer.cpp: Work around a segmentation fault in SDL.
Florian Forster [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.

SVN-Revision: 6283

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"

SVN-Revision: 6275

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

SVN-Revision: 6274

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.

SVN-Revision: 6273

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.

SVN-Revision: 6272

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.

SVN-Revision: 6271

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

SVN-Revision: 6270

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

SVN-Revision: 6269

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)

SVN-Revision: 6268

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)

SVN-Revision: 6267

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.

SVN-Revision: 6266

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

SVN-Revision: 6265

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.

SVN-Revision: 6264

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

SVN-Revision: 6263

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)

SVN-Revision: 6262

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.

SVN-Revision: 6261

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...)

SVN-Revision: 6260

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

SVN-Revision: 6259

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

SVN-Revision: 6258

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

SVN-Revision: 6257

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.

SVN-Revision: 6256

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

SVN-Revision: 6255

14 years agoFix for bug 544 and it's duplicates.
Miloš Klouček [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

SVN-Revision: 6254

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

SVN-Revision: 6249

14 years agoMake Cmake rerun svnversion even when just building and not configuring. Unknown...
Arvid Norlander [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.

SVN-Revision: 6248

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

SVN-Revision: 6246

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

SVN-Revision: 6245

14 years agoMake data/levels/world2/castle.stl completable (used wrong type of invisible solid...
Arvid Norlander [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.

SVN-Revision: 6244

14 years agoFix up broken tiles in christoph5 somewhat. It now looks passable at least. Seems...
Arvid Norlander [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.

SVN-Revision: 6243

14 years agoFix some visible feets due to missing tiles in fg near the end of the level
Arvid Norlander [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

SVN-Revision: 6238

14 years agoSmall cosmetic fixes to world2/level1.stl (hardly really matters for that level though).
Arvid Norlander [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).

SVN-Revision: 6237

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

SVN-Revision: 6236

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

SVN-Revision: 6235

14 years agoAdd some tiles in the FG layer in light+magic to prevent feets showing through.
Arvid Norlander [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.

SVN-Revision: 6234

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

SVN-Revision: 6233

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

SVN-Revision: 6232

14 years agoAdded cast around GLEW_ARB_texture_non_power_of_two, as it might be a char and screw...
Ingo Ruhnke [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

SVN-Revision: 6231

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

SVN-Revision: 6230

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.

SVN-Revision: 6229

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

SVN-Revision: 6226

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)

SVN-Revision: 6225

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.

SVN-Revision: 6224

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)

SVN-Revision: 6223

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

SVN-Revision: 6222

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

SVN-Revision: 6221

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

SVN-Revision: 6220

14 years agoPlay kill.wav when Tux is killed, hurt.wav when he can keep on playing.
Wolfgang Becker [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.

SVN-Revision: 6219

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

SVN-Revision: 6218

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

SVN-Revision: 6217

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

SVN-Revision: 6216

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

SVN-Revision: 6215

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

SVN-Revision: 6214

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

SVN-Revision: 6213

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

SVN-Revision: 6212

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

SVN-Revision: 6211

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

SVN-Revision: 6210

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

SVN-Revision: 6209

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

SVN-Revision: 6208

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

SVN-Revision: 6207

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

SVN-Revision: 6206