Matt McCutchen [Sat, 17 Apr 2010 01:44:50 +0000 (01:44 +0000)]
Switch to boost::format for non-trivial substitution of values into
user-visible strings.
This makes it easier to translate the patterns. See the comment added
to src/util/gettext.hpp .
SVN-Revision: 6634
Mathnerd314 [Sun, 11 Apr 2010 23:12:58 +0000 (23:12 +0000)]
Fix license for remaxim's sounds
SVN-Revision: 6633
Mathnerd314 [Sat, 10 Apr 2010 13:34:27 +0000 (13:34 +0000)]
More sounds from remaxim
SVN-Revision: 6632
Mathnerd314 [Fri, 9 Apr 2010 22:49:45 +0000 (22:49 +0000)]
Bell sound from remaxim (plays on torch/firefly too)
SVN-Revision: 6631
Mathnerd314 [Sun, 4 Apr 2010 18:14:40 +0000 (18:14 +0000)]
Fill in hit properly for slopes (bouncing snowballs look slightly weird)
SVN-Revision: 6630
Mathnerd314 [Sun, 4 Apr 2010 18:12:31 +0000 (18:12 +0000)]
Remove impossible-to-reach coins
SVN-Revision: 6629
Florian Forster [Fri, 26 Mar 2010 19:51:26 +0000 (19:51 +0000)]
Level 1-16 "Living in a Fridge": Add Krosh, the large icecrusher.
SVN-Revision: 6628
Florian Forster [Fri, 26 Mar 2010 19:50:39 +0000 (19:50 +0000)]
Krosh: Add large (4x4) icecrusher sprite and code.
When a big icecrusher is used, the camera shakes more, the up movement is
slower and the timeouts are longer.
SVN-Revision: 6627
Wolfgang Becker [Fri, 26 Mar 2010 19:36:57 +0000 (19:36 +0000)]
Cleanup:
* use constants to describe Tux's collision rectangle
* no more output on moving unmapped joystick axis
SVN-Revision: 6626
Wolfgang Becker [Fri, 26 Mar 2010 19:29:03 +0000 (19:29 +0000)]
Don't copy width and height because collision_static might change them. This
caused the "floating Tux effect" (bug 612) when jumping on a frozen Spiky.
SVN-Revision: 6625
Mathnerd314 [Tue, 23 Mar 2010 22:10:24 +0000 (22:10 +0000)]
Minor logic change to KamikazeSnowball
SVN-Revision: 6624
Mathnerd314 [Tue, 23 Mar 2010 22:09:49 +0000 (22:09 +0000)]
Clean up Tile a bit
SVN-Revision: 6623
Matt McCutchen [Mon, 22 Mar 2010 17:07:26 +0000 (17:07 +0000)]
Add tooling for running under Valgrind.
SVN-Revision: 6622
Florian Forster [Sat, 20 Mar 2010 17:30:07 +0000 (17:30 +0000)]
Level "The not so long way": Move the cannon one to the left end remove Mr. Bomb.
Also, the unisolid platform is two tiles less wide now.
SVN-Revision: 6621
Florian Forster [Sat, 20 Mar 2010 17:13:27 +0000 (17:13 +0000)]
Level "The not so long way": Add an unisolid platform to a tricky part.
The two spikies and the snowshots can now easily be avoided.
SVN-Revision: 6620
Florian Forster [Sat, 20 Mar 2010 15:58:16 +0000 (15:58 +0000)]
Incubator Island: Add "A Snowy Hill" by Wolfs.
SVN-Revision: 6619
Ingo Ruhnke [Sat, 20 Mar 2010 15:23:10 +0000 (15:23 +0000)]
-Weffc++ fix
SVN-Revision: 6618
Mathnerd314 [Sat, 20 Mar 2010 15:20:58 +0000 (15:20 +0000)]
Rename ACTIVATION_DISTANCE to get compile_amalgation to work again
SVN-Revision: 6617
Mathnerd314 [Fri, 19 Mar 2010 23:14:02 +0000 (23:14 +0000)]
Revert camera until I come up with a better idea
SVN-Revision: 6616
Florian Forster [Mon, 15 Mar 2010 20:59:54 +0000 (20:59 +0000)]
Level 1-12 "Into the Stars": Fix some "tile abuse".
SVN-Revision: 6613
Florian Forster [Mon, 15 Mar 2010 20:21:03 +0000 (20:21 +0000)]
Unstable tile: Implement a "slow fall" phase for sprites without "shake" and "dissolve" actions.
Sprites with neither a "shake" nor a "dissolve" action now start to fall down
immediately. For the first 0.5 seconds, the gravity modifier is set to 10%
though, so that the movement is *very* slow at first. It is noticable however
and hints at the instability of the tile. Hopefully, players won't be surprised
by a falling platform anymore now.
SVN-Revision: 6612
Florian Forster [Mon, 15 Mar 2010 19:55:24 +0000 (19:55 +0000)]
Incubator level "Cave run": Remove empty tilemap "Foreground".
SVN-Revision: 6611
Florian Forster [Sun, 14 Mar 2010 16:05:45 +0000 (16:05 +0000)]
Incubator Island: Added "Mad Ysonn Cube Garden" by octo.
That's me :)
SVN-Revision: 6610
Florian Forster [Sun, 14 Mar 2010 15:58:05 +0000 (15:58 +0000)]
Incubator Island: Added "Crystal Cataclysm" by Lazure.
SVN-Revision: 6609
Florian Forster [Sun, 14 Mar 2010 15:52:21 +0000 (15:52 +0000)]
Incubator Island: Add a "world" for "breeding" proposed new levels.
Currently present:
* "Cave Run" by Stuart Rynn
* "My Penny is over the ocean" by Wolfs
* "The not so long way" by Wolfs
SVN-Revision: 6608
Florian Forster [Sun, 14 Mar 2010 10:54:15 +0000 (10:54 +0000)]
Level 1-13 "Above the Arctic Skies": Add secret area trigger.
Thanks to MMlosh for pointing this out.
SVN-Revision: 6607
Florian Forster [Sun, 14 Mar 2010 10:47:56 +0000 (10:47 +0000)]
snow/unisolid2.png: Change the image so it tiles nicely with the other snow tiles.
SVN-Revision: 6606
Florian Forster [Sun, 14 Mar 2010 09:30:47 +0000 (09:30 +0000)]
Unstable tile: Add new "iceplatform" sprite.
It's based on the [[Image:Platform.png]] graphic.
SVN-Revision: 6605
Florian Forster [Fri, 12 Mar 2010 17:06:35 +0000 (17:06 +0000)]
Level 1-26 "The Castle of Nolok": Add a spike at the very end of the level.
This spike is never seen or reached but kills iceblocks that otherwise come
back and push Tux around.
Resolves: #599
SVN-Revision: 6604
Florian Forster [Fri, 12 Mar 2010 16:47:08 +0000 (16:47 +0000)]
Level 1-07 "Oh No More Snowballs": Added some background tiles.
SVN-Revision: 6603
Florian Forster [Fri, 12 Mar 2010 15:55:55 +0000 (15:55 +0000)]
Level 1-06 "The Frosted Fields": Fix some "tile abuse" and add some background tiles.
SVN-Revision: 6602
Florian Forster [Fri, 12 Mar 2010 15:32:56 +0000 (15:32 +0000)]
Level 1-04 "Tobgle Road": Added some background tiles.
SVN-Revision: 6601
Florian Forster [Fri, 12 Mar 2010 15:22:01 +0000 (15:22 +0000)]
Level 1-03 "Via Nostalgica": Remove some "tile abuse".
SVN-Revision: 6600
Florian Forster [Fri, 12 Mar 2010 14:58:43 +0000 (14:58 +0000)]
Level 1-21 "A Path in the Clouds": Make the background more random.
SVN-Revision: 6599
Florian Forster [Fri, 12 Mar 2010 10:07:37 +0000 (10:07 +0000)]
supertux/tile.[ch]pp: Move the unisolid solidity checks to the "Tile" object.
This really didn't belong into the sector code.
SVN-Revision: 6598
Florian Forster [Thu, 11 Mar 2010 19:14:28 +0000 (19:14 +0000)]
object/bonus_block.[ch]pp: Fix a NULL-pointer dereference.
Fixes a bug introduced in revision 6575: Since a player is not a badguy, the
Player* was NULL in the badguy code. Dereferencing it leads to a segmentation
fault.
SVN-Revision: 6597
Florian Forster [Thu, 11 Mar 2010 09:36:45 +0000 (09:36 +0000)]
Bug 567: Add invisible unisolid slopes.
These invisible tiles can be used on the interactive layer while the actual
graphics are placed on a background layer. This makes it possible to achieve
unisolid behavior with any tileset.
Resolves #567.
SVN-Revision: 6596
Florian Forster [Thu, 11 Mar 2010 09:33:59 +0000 (09:33 +0000)]
supertux/sector.cpp: Add support for "south", "west" and "east" unisolid tiles.
I.e. "south" meaning "can go down, not up", and "west" and "east" for left and
right as appropriate.
SVN-Revision: 6595
Florian Forster [Thu, 11 Mar 2010 08:47:06 +0000 (08:47 +0000)]
supertux/tile.hpp: Implement Tile::is_unisolid().
SVN-Revision: 6594
Florian Forster [Thu, 11 Mar 2010 08:42:03 +0000 (08:42 +0000)]
supertux/tile.hpp: Implement Tile::is_slope().
SVN-Revision: 6593
Florian Forster [Thu, 11 Mar 2010 08:11:10 +0000 (08:11 +0000)]
Rename "AATriangle::DEFORM[1234]" to more meaningfull names.
They are named now:
AATriangle::DEFORM_TOP
AATriangle::DEFORM_BOTTOM
AATriangle::DEFORM_LEFT
AATriangle::DEFORM_RIGHT
SVN-Revision: 6592
Ingo Ruhnke [Wed, 10 Mar 2010 08:25:20 +0000 (08:25 +0000)]
Reduced spawn distance for enemies to screen size (experimental change, if something breaks, complain)
SVN-Revision: 6591
Mathnerd314 [Wed, 10 Mar 2010 04:33:52 +0000 (04:33 +0000)]
New minimalist intro.
SVN-Revision: 6590
Mathnerd314 [Wed, 10 Mar 2010 04:30:25 +0000 (04:30 +0000)]
Update end sequence controller and stop backflipping immediately in end equence.
SVN-Revision: 6589
Florian Forster [Tue, 9 Mar 2010 13:05:45 +0000 (13:05 +0000)]
Owl badguy: Fix turn-around behavior.
Turning back to the initial direction was broken.
SVN-Revision: 6588
Florian Forster [Tue, 9 Mar 2010 12:42:56 +0000 (12:42 +0000)]
levels/test/owl.stl: Rename "bombfish" to "skydive".
SVN-Revision: 6585
Florian Forster [Tue, 9 Mar 2010 12:40:07 +0000 (12:40 +0000)]
Renamed the "bombfish" sprite to "skydive".
SVN-Revision: 6584
Florian Forster [Tue, 9 Mar 2010 12:38:29 +0000 (12:38 +0000)]
Rename the "BombFish" class to "SkyDive". The factory now uses the string "skydive".
SVN-Revision: 6583
Florian Forster [Tue, 9 Mar 2010 12:35:06 +0000 (12:35 +0000)]
Move "badguy/bombfish.[ch]pp" to "badguy/skydive.[ch]pp".
SVN-Revision: 6582
Ingo Ruhnke [Mon, 8 Mar 2010 21:37:32 +0000 (21:37 +0000)]
Patch for multiple joysticks from const86 <const@mimas.ru>
SVN-Revision: 6581
Florian Forster [Mon, 8 Mar 2010 13:33:44 +0000 (13:33 +0000)]
Bombfish: Create the explosion at the bottom of the bombfish.
Otherwise Tux won't be hurt when the bombfish falls onto him.
Resolves: #593
SVN-Revision: 6579
Ingo Ruhnke [Mon, 8 Mar 2010 11:37:52 +0000 (11:37 +0000)]
Added missing '('
SVN-Revision: 6578
Ingo Ruhnke [Mon, 8 Mar 2010 07:20:55 +0000 (07:20 +0000)]
Reverted r6576, Menus don't belong into JoystickKeyboardController
SVN-Revision: 6577
Mathnerd314 [Sun, 7 Mar 2010 23:47:14 +0000 (23:47 +0000)]
make joystick_options_menu and key_options_menu part of joystickkeyboardcontroller, so they can be freed properly.
SVN-Revision: 6576
Mathnerd314 [Sun, 7 Mar 2010 23:44:35 +0000 (23:44 +0000)]
Pass player object in to BonusBlock rather than using Sector's global one.
SVN-Revision: 6575
Mathnerd314 [Sun, 7 Mar 2010 23:43:26 +0000 (23:43 +0000)]
Some notes about co-op mode
SVN-Revision: 6574
Mathnerd314 [Sun, 7 Mar 2010 23:38:41 +0000 (23:38 +0000)]
Placeholder for player_id
SVN-Revision: 6573
Mathnerd314 [Sun, 7 Mar 2010 23:34:11 +0000 (23:34 +0000)]
More svn:eol-style
SVN-Revision: 6572
Mathnerd314 [Sun, 7 Mar 2010 22:58:54 +0000 (22:58 +0000)]
New kamikaze snowball collision image from Some_Person
SVN-Revision: 6571
Mathnerd314 [Sun, 7 Mar 2010 22:06:38 +0000 (22:06 +0000)]
svn:eol-style=native
SVN-Revision: 6570
Florian Forster [Sun, 7 Mar 2010 10:00:25 +0000 (10:00 +0000)]
"whereami()" function: Print coordinates as integers.
The floating point part of the coordinates are distracting and not relevant.
SVN-Revision: 6568
Ingo Ruhnke [Sat, 6 Mar 2010 21:06:46 +0000 (21:06 +0000)]
Switched to bluish owl
SVN-Revision: 6567
Florian Forster [Sat, 6 Mar 2010 19:51:15 +0000 (19:51 +0000)]
Owl: Drop "Bombfishes" by default.
The position where the carried object is being held has been improved. The Owl
has been moved one layer up (to "LAYER_OBJECTS + 1") so it is in front of the
objects it holds.
SVN-Revision: 6566
Ingo Ruhnke [Sat, 6 Mar 2010 19:50:47 +0000 (19:50 +0000)]
Compiler warning fix
SVN-Revision: 6565
Florian Forster [Sat, 6 Mar 2010 19:47:36 +0000 (19:47 +0000)]
BombFish: Add an enemy that can be dropped by "Owl".
SVN-Revision: 6564
Florian Forster [Sat, 6 Mar 2010 17:16:38 +0000 (17:16 +0000)]
Owl: Add an offset to the "is_above_player()" method.
This way it is more likely that the thrown object will hit Tux. Also, the
standard "collision_player()" method from BadGuy will be used. There's no need
for the hack copied from the "Kamikaze Snowball".
SVN-Revision: 6563
Florian Forster [Sat, 6 Mar 2010 17:02:19 +0000 (17:02 +0000)]
Owl: Let go of the carried object when above Tux.
SVN-Revision: 6562
Florian Forster [Sat, 6 Mar 2010 16:49:53 +0000 (16:49 +0000)]
Owl: Implement carrying around of "Portable" objects.
Owls now bring a "rock" by default.
SVN-Revision: 6561
Florian Forster [Sat, 6 Mar 2010 16:21:05 +0000 (16:21 +0000)]
Owl: Turn around when hitting a wall.
SVN-Revision: 6560
Ingo Ruhnke [Sat, 6 Mar 2010 16:14:20 +0000 (16:14 +0000)]
Removed some tile abuse
SVN-Revision: 6559
Florian Forster [Sat, 6 Mar 2010 16:14:02 +0000 (16:14 +0000)]
Owl: Added initial code for an "Owl" badguy.
Graphics are based on a drawing by Grumbel. The badguy simply flies from right
to left for now.
SVN-Revision: 6558
Ingo Ruhnke [Sat, 6 Mar 2010 15:24:48 +0000 (15:24 +0000)]
Added owl graphics
SVN-Revision: 6557
Ingo Ruhnke [Sat, 6 Mar 2010 12:12:26 +0000 (12:12 +0000)]
Removed coin-cost for reset points
SVN-Revision: 6556
Florian Forster [Sat, 6 Mar 2010 09:29:58 +0000 (09:29 +0000)]
Level 1-01 "Welcome to Antarctica": Added billboard explaining the run-jump.
SVN-Revision: 6555
Florian Forster [Fri, 5 Mar 2010 16:09:15 +0000 (16:09 +0000)]
badguy.cpp: Badguys don't squish other badguys.
They still turn around when walking into one another, but Bouncy, Jumpy and
friends no longer squish their coworkers.
Badguys that madly wish to be squished by other badguys, should check if they
were hit from above in "collision_badguy" which is now called instead.
Some exception *might* be necessary for stalactites.
SVN-Revision: 6554
Florian Forster [Fri, 5 Mar 2010 09:00:50 +0000 (09:00 +0000)]
addon_manager.cpp: Changed add-on URL to supertux.lethargik.org/addons/index.nfo.
The old URL is a redirect to there.
SVN-Revision: 6553
Florian Forster [Fri, 5 Mar 2010 08:37:28 +0000 (08:37 +0000)]
badguy/haywire.cpp: Use the x-acceleration to follow the player.
This is a lot smoother and generally nicer than the previous (proof of concept)
code.
SVN-Revision: 6552
Florian Forster [Fri, 5 Mar 2010 08:36:26 +0000 (08:36 +0000)]
badguy/walking_badguy.cpp: Turn the badguy around when his speed doesn't match the direction he's facing.
SVN-Revision: 6551
Florian Forster [Fri, 5 Mar 2010 08:27:35 +0000 (08:27 +0000)]
badguy/walking_badguy.[ch]pp: Make it possible to specify the target x velocity.
This will be use by "Haywire" eventually to get a more smooth "follow the
player" effect.
SVN-Revision: 6550
Florian Forster [Fri, 5 Mar 2010 07:45:29 +0000 (07:45 +0000)]
badguy/walking_badguy.cpp: Don't set "walk_speed" to zero when frozen.
Otherwise the badguy doesn't start walking after being un-frozen.
SVN-Revision: 6549
Florian Forster [Fri, 5 Mar 2010 07:42:10 +0000 (07:42 +0000)]
badguy/walking_badguy.cpp: Fix the acceleration code.
It should now be able to handle all situations, even when the badguy is thrown
backwards faster than he would normally walk forward (was broken before) and
frozen badguys are no longer sliding along without a move animation.
SVN-Revision: 6548
Mathnerd314 [Thu, 4 Mar 2010 23:25:26 +0000 (23:25 +0000)]
First crack at a new camera, before my plane flight leaves.
SVN-Revision: 6547
Florian Forster [Thu, 4 Mar 2010 20:08:03 +0000 (20:08 +0000)]
Level 1-01 "Welcome to Antarctica": Added a note about statistics to the reset point infoblock.
SVN-Revision: 6546
Florian Forster [Thu, 4 Mar 2010 18:38:59 +0000 (18:38 +0000)]
supertux/game_session.[ch]pp: Fix a segmantation fault when loading an invalid level file.
SVN-Revision: 6545
Florian Forster [Thu, 4 Mar 2010 18:10:53 +0000 (18:10 +0000)]
supertux/man/man6/supertux2.6: Fix a syntax error.
Thanks to Christoph Egger for the fix.
SVN-Revision: 6544
Florian Forster [Thu, 4 Mar 2010 13:37:38 +0000 (13:37 +0000)]
Level 1-22 "A Mysterious House of Ice": Replace some forgotten "ice" background tiles.
SVN-Revision: 6543
Florian Forster [Thu, 4 Mar 2010 13:13:53 +0000 (13:13 +0000)]
Cannon: Use the cannon's and badguy's bounding boxes to calculate the starting position.
The previous code assumed width of no more than 32 pixels to work correctly.
mathnerd314's change in revision 6530 widened that a bit, but could only be
considered a dirty hack. This change should work for arbitrary badguy widths,
moving narrow badguys (Short Fuse, for example) closer to the Cannon when shot
to the left.
SVN-Revision: 6542
Florian Forster [Thu, 4 Mar 2010 13:06:41 +0000 (13:06 +0000)]
Snowshot: Call ->set_action() in the constructor.
Otherwise the bounding box will be initialized to "collision-left" which is
only 15 pixels wide. This will be corrected by ->initialize() eventually, but
by then it's too late for the "Cannon" code.
SVN-Revision: 6541
Ingo Ruhnke [Thu, 4 Mar 2010 10:13:26 +0000 (10:13 +0000)]
Removed speed limit when grabbing normal objects
SVN-Revision: 6540
Mathnerd314 [Thu, 4 Mar 2010 02:42:48 +0000 (02:42 +0000)]
Minor cleanup in SoundManager
SVN-Revision: 6539
Mathnerd314 [Thu, 4 Mar 2010 02:41:22 +0000 (02:41 +0000)]
Use static casts in GL::Renderer
SVN-Revision: 6538
Mathnerd314 [Thu, 4 Mar 2010 02:39:19 +0000 (02:39 +0000)]
Small cleanup of Sector::get_nearest_player
SVN-Revision: 6537
Mathnerd314 [Thu, 4 Mar 2010 02:37:48 +0000 (02:37 +0000)]
Remove walk key
SVN-Revision: 6536
Mathnerd314 [Wed, 3 Mar 2010 08:18:04 +0000 (08:18 +0000)]
Tweak offsets a bit so kamikazesnowball doesn't die.
SVN-Revision: 6530
Mathnerd314 [Wed, 3 Mar 2010 07:11:24 +0000 (07:11 +0000)]
Don't save state of initial worldmap before loading it
SVN-Revision: 6529
Mathnerd314 [Wed, 3 Mar 2010 07:07:41 +0000 (07:07 +0000)]
Apparently C++ doesn't automatically convert from std::string to const char*...
SVN-Revision: 6528
Mathnerd314 [Wed, 3 Mar 2010 06:54:58 +0000 (06:54 +0000)]
Check that savegame exists before trying to load it.
SVN-Revision: 6527
Mathnerd314 [Wed, 3 Mar 2010 06:50:54 +0000 (06:50 +0000)]
someone forgot a ! in world.cpp...
SVN-Revision: 6526
Mathnerd314 [Wed, 3 Mar 2010 06:22:36 +0000 (06:22 +0000)]
Change Mysterious House of Ice to use dark bg tiles.
SVN-Revision: 6525
Ingo Ruhnke [Tue, 2 Mar 2010 19:36:22 +0000 (19:36 +0000)]
Removed unused TileSet member variable from Tile
SVN-Revision: 6522
projects / supertux.git / log