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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Mathnerd314 [Thu, 28 Jan 2010 05:07:28 +0000 (05:07 +0000)]
Fix spawnpoint in "Down the rabbit hole"
SVN-Revision: 6275
Mathnerd314 [Tue, 26 Jan 2010 02:42:10 +0000 (02:42 +0000)]
Shake camera on buttjump.
SVN-Revision: 6274
Mathnerd314 [Mon, 25 Jan 2010 23:35:02 +0000 (23:35 +0000)]
Use supertux2 on Windows, zeekling squish animation fix.
SVN-Revision: 6273
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
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
Mathnerd314 [Sun, 24 Jan 2010 20:04:45 +0000 (20:04 +0000)]
Use NDEBUG a bit less.
SVN-Revision: 6270
Mathnerd314 [Sun, 24 Jan 2010 01:42:21 +0000 (01:42 +0000)]
Tile fixes.
SVN-Revision: 6269
Mathnerd314 [Thu, 21 Jan 2010 00:23:58 +0000 (00:23 +0000)]
Badguy activation/deactivation (Matt's patch from bug 540)
SVN-Revision: 6268
Mathnerd314 [Thu, 21 Jan 2010 00:09:05 +0000 (00:09 +0000)]
Matt's patch for Stalactite shaking (bug 543)
SVN-Revision: 6267
Mathnerd314 [Wed, 20 Jan 2010 23:35:46 +0000 (23:35 +0000)]
Octo's patch from bug 523.
SVN-Revision: 6266
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
Mathnerd314 [Wed, 20 Jan 2010 23:02:18 +0000 (23:02 +0000)]
Remove bonus-grow.png and make lava tiles hurt.
SVN-Revision: 6264
Mathnerd314 [Tue, 19 Jan 2010 04:04:20 +0000 (04:04 +0000)]
Updated editor images from Some_Person/bug 481
SVN-Revision: 6263
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
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
Mathnerd314 [Mon, 18 Jan 2010 22:41:35 +0000 (22:41 +0000)]
Change DELTA to .002 (wait for bugs...)
SVN-Revision: 6260
Mathnerd314 [Mon, 18 Jan 2010 16:06:51 +0000 (16:06 +0000)]
Mark "auto" as translatable
SVN-Revision: 6259
Mathnerd314 [Mon, 18 Jan 2010 15:01:39 +0000 (15:01 +0000)]
Turkish translation from meczup
SVN-Revision: 6258
Mathnerd314 [Mon, 18 Jan 2010 00:15:08 +0000 (00:15 +0000)]
Doors can run scripts now.
SVN-Revision: 6257
Mathnerd314 [Sun, 17 Jan 2010 21:11:16 +0000 (21:11 +0000)]
UnstableTile and WeakBlock are affected by Explosions.
SVN-Revision: 6256
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
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
Arvid Norlander [Fri, 1 Jan 2010 22:52:49 +0000 (22:52 +0000)]
Fix right files to depend on version.h.
SVN-Revision: 6249
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
Arvid Norlander [Fri, 1 Jan 2010 18:29:41 +0000 (18:29 +0000)]
Minor cosmetic fixes: data/levels/world2/christoph3.stl
SVN-Revision: 6246
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
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
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
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
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
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
Arvid Norlander [Thu, 31 Dec 2009 03:02:27 +0000 (03:02 +0000)]
Fix broken dart traps in "Little Venice"
SVN-Revision: 6235
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
Arvid Norlander [Thu, 31 Dec 2009 02:32:11 +0000 (02:32 +0000)]
Update Swedish translations for world1 and world2.
SVN-Revision: 6233
Arvid Norlander [Thu, 31 Dec 2009 01:53:44 +0000 (01:53 +0000)]
Update Swedish translation.
SVN-Revision: 6232
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
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
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
Mathnerd314 [Fri, 25 Dec 2009 22:10:39 +0000 (22:10 +0000)]
Add a constant for how long electrify lasts
SVN-Revision: 6226
Mathnerd314 [Fri, 25 Dec 2009 18:11:43 +0000 (18:11 +0000)]
Thunderstorm sounds (from Auria and Some_Person)
SVN-Revision: 6225
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
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
Mathnerd314 [Wed, 23 Dec 2009 19:35:43 +0000 (19:35 +0000)]
svn:eol-style native + comment fixes
SVN-Revision: 6222
Mathnerd314 [Wed, 23 Dec 2009 18:46:28 +0000 (18:46 +0000)]
Some more sounds from Some_Person
SVN-Revision: 6221
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
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
Wolfgang Becker [Wed, 16 Dec 2009 21:00:50 +0000 (21:00 +0000)]
typo
SVN-Revision: 6218
Ingo Ruhnke [Mon, 14 Dec 2009 10:26:09 +0000 (10:26 +0000)]
Added TexturePtr
SVN-Revision: 6217
Ingo Ruhnke [Mon, 14 Dec 2009 09:05:15 +0000 (09:05 +0000)]
Added FontPtr
SVN-Revision: 6216
Ingo Ruhnke [Mon, 14 Dec 2009 05:59:31 +0000 (05:59 +0000)]
Added SpritePtr
SVN-Revision: 6215
Ingo Ruhnke [Mon, 14 Dec 2009 05:01:53 +0000 (05:01 +0000)]
Added Surface::clone() method
SVN-Revision: 6214
Ingo Ruhnke [Mon, 14 Dec 2009 04:50:24 +0000 (04:50 +0000)]
Removed some unused code
SVN-Revision: 6213
Ingo Ruhnke [Mon, 14 Dec 2009 04:45:06 +0000 (04:45 +0000)]
TODO updates
SVN-Revision: 6212
Ingo Ruhnke [Sun, 13 Dec 2009 23:51:40 +0000 (23:51 +0000)]
More use of SurfacePtr
SVN-Revision: 6211
Tim Goya [Sun, 13 Dec 2009 23:38:28 +0000 (23:38 +0000)]
add Boost to CMake
SVN-Revision: 6210
Ingo Ruhnke [Sun, 13 Dec 2009 23:30:55 +0000 (23:30 +0000)]
Added SurfacePtr
SVN-Revision: 6209
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
Ingo Ruhnke [Sun, 13 Dec 2009 22:20:32 +0000 (22:20 +0000)]
More use of SurfacePtr
SVN-Revision: 6207
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
Ingo Ruhnke [Mon, 7 Dec 2009 20:18:22 +0000 (20:18 +0000)]
Removed Unicode byte-order mark, which confuses the parser
SVN-Revision: 6199
Ingo Ruhnke [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
SVN-Revision: 6198
Ingo Ruhnke [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
SVN-Revision: 6197
Ingo Ruhnke [Mon, 7 Dec 2009 18:10:10 +0000 (18:10 +0000)]
TODO updates
SVN-Revision: 6196
Ingo Ruhnke [Mon, 7 Dec 2009 18:01:55 +0000 (18:01 +0000)]
Added reset() and empty constructor to SDLSurfacePtr
SVN-Revision: 6195
Ingo Ruhnke [Mon, 7 Dec 2009 18:01:07 +0000 (18:01 +0000)]
Disabled debugging output on video mode switch
SVN-Revision: 6194
Tim Goya [Mon, 7 Dec 2009 16:00:10 +0000 (16:00 +0000)]
minor tweaks for the extra warnings so the giant list isn't repeated
SVN-Revision: 6193
Tim Goya [Mon, 7 Dec 2009 05:43:32 +0000 (05:43 +0000)]
make SDL texture optimization less aggressive and generally stupider
SVN-Revision: 6192
Ingo Ruhnke [Mon, 7 Dec 2009 04:36:29 +0000 (04:36 +0000)]
Added some notes about supported resolutions
SVN-Revision: 6191
Ingo Ruhnke [Mon, 7 Dec 2009 01:39:22 +0000 (01:39 +0000)]
TODO updates
SVN-Revision: 6190
Ingo Ruhnke [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
SVN-Revision: 6189
Ingo Ruhnke [Sun, 6 Dec 2009 22:35:11 +0000 (22:35 +0000)]
Added mipmapping, but disabled it, as it leads to some unwanted blurriness
SVN-Revision: 6188
Ingo Ruhnke [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
SVN-Revision: 6187
Ingo Ruhnke [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)
SVN-Revision: 6186
Ingo Ruhnke [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
SVN-Revision: 6185
Ingo Ruhnke [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
SVN-Revision: 6184
Ingo Ruhnke [Sun, 6 Dec 2009 09:11:12 +0000 (09:11 +0000)]
Turned functions in video_systems.?pp into class VideoSystem
SVN-Revision: 6183
Ingo Ruhnke [Sun, 6 Dec 2009 08:45:57 +0000 (08:45 +0000)]
Fixed Rect a bit and started to use Rect in Surface class
SVN-Revision: 6182
Ingo Ruhnke [Sun, 6 Dec 2009 05:38:03 +0000 (05:38 +0000)]
Added basic integer rectangle class
SVN-Revision: 6181
Ingo Ruhnke [Sun, 6 Dec 2009 05:26:23 +0000 (05:26 +0000)]
Renamed Rect to Rectf
SVN-Revision: 6180
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
SVN-Revision: 6179
Ingo Ruhnke [Sun, 6 Dec 2009 02:49:12 +0000 (02:49 +0000)]
Removed friendship between TileSetParser and Tile, use proper constructor instead
SVN-Revision: 6178
Ingo Ruhnke [Sun, 6 Dec 2009 01:51:58 +0000 (01:51 +0000)]
Moved parsing of "tiles" section into separate function
SVN-Revision: 6177
Ingo Ruhnke [Sun, 6 Dec 2009 01:51:31 +0000 (01:51 +0000)]
Small const cleanup
SVN-Revision: 6176
Ingo Ruhnke [Sun, 6 Dec 2009 01:32:11 +0000 (01:32 +0000)]
Removed tile_path from tileset, instead give fully qualified path to the Tile
SVN-Revision: 6175
projects / supertux.git / log