florianf [Tue, 11 Jan 2011 09:59:17 +0000 (09:59 +0000)]
crystallo: Add new shattered graphics.
Based on an image uploaded to the wiki by user "Hume".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6663
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 11 Jan 2011 09:55:35 +0000 (09:55 +0000)]
icecrusher.cpp: Remove debug message.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6662
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 11 Jan 2011 09:51:12 +0000 (09:51 +0000)]
Level "Crystal Beauty": Remove empty tilemap "Background".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6661
837edb03-e0f3-0310-88ca-
d4d4e8b29345
sommer [Mon, 10 Jan 2011 18:51:20 +0000 (18:51 +0000)]
committed stpatch20110110.diff by Jonas Kümmerlin
* Viewport is restored properly after drawing lightmap (was set to 0,0,SCREEN_WIDTH,SCREEN_HEIGHT before)
* Menu size calculation now minds size of current selected string in STRINGSELECT items -> overlapping bugs disappear
* Magnification is saved in configuration file
* default magnification is auto (maybe talk about that again)
* auto magnification does now downscaling on resolutions smaller than 640x480
* magnification, aspect ratio and fullscreen resolution controls in options menu now display the current value
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6660
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sun, 9 Jan 2011 13:48:51 +0000 (13:48 +0000)]
src/badguy/dispenser.cpp: Remove debug messages.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6658
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Wed, 29 Dec 2010 01:08:36 +0000 (01:08 +0000)]
Ice in the hole: Fix secret area tiles + move ceiling up one tile to allow access to platform
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6656
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Thu, 16 Sep 2010 00:13:01 +0000 (00:13 +0000)]
Patch from ApOsTrOpHe to fix compile errors
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6654
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sat, 28 Aug 2010 19:49:13 +0000 (19:49 +0000)]
Coins follow tilemaps or can be given paths
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6653
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sat, 28 Aug 2010 19:27:54 +0000 (19:27 +0000)]
Minor MrIceBlock physics tweak
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6651
837edb03-e0f3-0310-88ca-
d4d4e8b29345
wolfgangb [Tue, 24 Aug 2010 17:39:17 +0000 (17:39 +0000)]
Set collision group according to block's solidity. (Fix for 684)
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6650
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 15 Aug 2010 16:38:22 +0000 (16:38 +0000)]
Revised backflip graphics from cardboard
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6649
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Thu, 5 Aug 2010 19:39:28 +0000 (19:39 +0000)]
Fix some mime types - ogg, jpg, png, rg, mid, mod
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6648
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Thu, 5 Aug 2010 16:53:53 +0000 (16:53 +0000)]
Add an ignore
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6646
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sat, 10 Jul 2010 16:31:10 +0000 (16:31 +0000)]
Update Danish translations (bug 666)
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6643
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sat, 10 Jul 2010 15:50:46 +0000 (15:50 +0000)]
Update and run normalize-po-files.sh
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6642
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sat, 3 Jul 2010 21:15:56 +0000 (21:15 +0000)]
Fix makepot.sh
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6641
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Mon, 31 May 2010 18:12:50 +0000 (18:12 +0000)]
Fix warning
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6640
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Mon, 31 May 2010 16:46:36 +0000 (16:46 +0000)]
Remove some obsolete tilegroups
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6639
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sun, 2 May 2010 09:58:59 +0000 (09:58 +0000)]
Incubator Island: Add "Crystal Beauty" by "niso".
See also: Bug #633
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6638
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sun, 2 May 2010 09:43:32 +0000 (09:43 +0000)]
Level "Something Fishy": Change level height to 25 tiles.
Also removed useless invisible blocks and made spawning at the bell safer for
Tux. The badguys used to walk into him immediately, now they always walk left
(away from the bell) when spawning.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6637
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Sun, 18 Apr 2010 13:55:55 +0000 (13:55 +0000)]
Added script to lower volume of sounds by 6db as requested by remaxim (might need some further discussion if we really want to do this)
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6636
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mmccutchen [Sat, 17 Apr 2010 01:48:31 +0000 (01:48 +0000)]
Recognize a SUPERTUX2_USER_DIR environment variable to set the user data
directory (PhysFS write directory).
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6635
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mmccutchen [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 .
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6634
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 11 Apr 2010 23:12:58 +0000 (23:12 +0000)]
Fix license for remaxim's sounds
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6633
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sat, 10 Apr 2010 13:34:27 +0000 (13:34 +0000)]
More sounds from remaxim
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6632
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Fri, 9 Apr 2010 22:49:45 +0000 (22:49 +0000)]
Bell sound from remaxim (plays on torch/firefly too)
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6631
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 4 Apr 2010 18:14:40 +0000 (18:14 +0000)]
Fill in hit properly for slopes (bouncing snowballs look slightly weird)
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6630
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 4 Apr 2010 18:12:31 +0000 (18:12 +0000)]
Remove impossible-to-reach coins
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6629
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 26 Mar 2010 19:51:26 +0000 (19:51 +0000)]
Level 1-16 "Living in a Fridge": Add Krosh, the large icecrusher.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6628
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6627
837edb03-e0f3-0310-88ca-
d4d4e8b29345
wolfgangb [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
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6626
837edb03-e0f3-0310-88ca-
d4d4e8b29345
wolfgangb [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6625
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Tue, 23 Mar 2010 22:10:24 +0000 (22:10 +0000)]
Minor logic change to KamikazeSnowball
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6624
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Tue, 23 Mar 2010 22:09:49 +0000 (22:09 +0000)]
Clean up Tile a bit
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6623
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mmccutchen [Mon, 22 Mar 2010 17:07:26 +0000 (17:07 +0000)]
Add tooling for running under Valgrind.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6622
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6621
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6620
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sat, 20 Mar 2010 15:58:16 +0000 (15:58 +0000)]
Incubator Island: Add "A Snowy Hill" by Wolfs.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6619
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Sat, 20 Mar 2010 15:23:10 +0000 (15:23 +0000)]
-Weffc++ fix
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6618
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sat, 20 Mar 2010 15:20:58 +0000 (15:20 +0000)]
Rename ACTIVATION_DISTANCE to get compile_amalgation to work again
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6617
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Fri, 19 Mar 2010 23:14:02 +0000 (23:14 +0000)]
Revert camera until I come up with a better idea
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6616
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Mon, 15 Mar 2010 20:59:54 +0000 (20:59 +0000)]
Level 1-12 "Into the Stars": Fix some "tile abuse".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6613
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6612
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Mon, 15 Mar 2010 19:55:24 +0000 (19:55 +0000)]
Incubator level "Cave run": Remove empty tilemap "Foreground".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6611
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sun, 14 Mar 2010 16:05:45 +0000 (16:05 +0000)]
Incubator Island: Added "Mad Ysonn Cube Garden" by octo.
That's me :)
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6610
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sun, 14 Mar 2010 15:58:05 +0000 (15:58 +0000)]
Incubator Island: Added "Crystal Cataclysm" by Lazure.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6609
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6608
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6607
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6606
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6605
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6604
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 12 Mar 2010 16:47:08 +0000 (16:47 +0000)]
Level 1-07 "Oh No More Snowballs": Added some background tiles.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6603
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6602
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 12 Mar 2010 15:32:56 +0000 (15:32 +0000)]
Level 1-04 "Tobgle Road": Added some background tiles.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6601
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 12 Mar 2010 15:22:01 +0000 (15:22 +0000)]
Level 1-03 "Via Nostalgica": Remove some "tile abuse".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6600
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Fri, 12 Mar 2010 14:58:43 +0000 (14:58 +0000)]
Level 1-21 "A Path in the Clouds": Make the background more random.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6599
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6598
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6597
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6596
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6595
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Thu, 11 Mar 2010 08:47:06 +0000 (08:47 +0000)]
supertux/tile.hpp: Implement Tile::is_unisolid().
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6594
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Thu, 11 Mar 2010 08:42:03 +0000 (08:42 +0000)]
supertux/tile.hpp: Implement Tile::is_slope().
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6593
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6592
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [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)
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6591
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Wed, 10 Mar 2010 04:33:52 +0000 (04:33 +0000)]
New minimalist intro.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6590
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Wed, 10 Mar 2010 04:30:25 +0000 (04:30 +0000)]
Update end sequence controller and stop backflipping immediately in end equence.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6589
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6588
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 9 Mar 2010 12:42:56 +0000 (12:42 +0000)]
levels/test/owl.stl: Rename "bombfish" to "skydive".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6585
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 9 Mar 2010 12:40:07 +0000 (12:40 +0000)]
Renamed the "bombfish" sprite to "skydive".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6584
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 9 Mar 2010 12:38:29 +0000 (12:38 +0000)]
Rename the "BombFish" class to "SkyDive". The factory now uses the string "skydive".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6583
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Tue, 9 Mar 2010 12:35:06 +0000 (12:35 +0000)]
Move "badguy/bombfish.[ch]pp" to "badguy/skydive.[ch]pp".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6582
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Mon, 8 Mar 2010 21:37:32 +0000 (21:37 +0000)]
Patch for multiple joysticks from const86 <const@mimas.ru>
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6581
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6579
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Mon, 8 Mar 2010 11:37:52 +0000 (11:37 +0000)]
Added missing '('
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6578
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Mon, 8 Mar 2010 07:20:55 +0000 (07:20 +0000)]
Reverted r6576, Menus don't belong into JoystickKeyboardController
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6577
837edb03-e0f3-0310-88ca-
d4d4e8b29345
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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6576
837edb03-e0f3-0310-88ca-
d4d4e8b29345
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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6575
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 7 Mar 2010 23:43:26 +0000 (23:43 +0000)]
Some notes about co-op mode
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6574
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 7 Mar 2010 23:38:41 +0000 (23:38 +0000)]
Placeholder for player_id
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6573
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 7 Mar 2010 23:34:11 +0000 (23:34 +0000)]
More svn:eol-style
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6572
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 7 Mar 2010 22:58:54 +0000 (22:58 +0000)]
New kamikaze snowball collision image from Some_Person
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6571
837edb03-e0f3-0310-88ca-
d4d4e8b29345
mathnerd314 [Sun, 7 Mar 2010 22:06:38 +0000 (22:06 +0000)]
svn:eol-style=native
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6570
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6568
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Sat, 6 Mar 2010 21:06:46 +0000 (21:06 +0000)]
Switched to bluish owl
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6567
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6566
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Sat, 6 Mar 2010 19:50:47 +0000 (19:50 +0000)]
Compiler warning fix
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6565
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sat, 6 Mar 2010 19:47:36 +0000 (19:47 +0000)]
BombFish: Add an enemy that can be dropped by "Owl".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6564
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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".
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6563
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sat, 6 Mar 2010 17:02:19 +0000 (17:02 +0000)]
Owl: Let go of the carried object when above Tux.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6562
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6561
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sat, 6 Mar 2010 16:21:05 +0000 (16:21 +0000)]
Owl: Turn around when hitting a wall.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6560
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Sat, 6 Mar 2010 16:14:20 +0000 (16:14 +0000)]
Removed some tile abuse
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6559
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6558
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Sat, 6 Mar 2010 15:24:48 +0000 (15:24 +0000)]
Added owl graphics
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6557
837edb03-e0f3-0310-88ca-
d4d4e8b29345
grumbel [Sat, 6 Mar 2010 12:12:26 +0000 (12:12 +0000)]
Removed coin-cost for reset points
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6556
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [Sat, 6 Mar 2010 09:29:58 +0000 (09:29 +0000)]
Level 1-01 "Welcome to Antarctica": Added billboard explaining the run-jump.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6555
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6554
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6553
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6552
837edb03-e0f3-0310-88ca-
d4d4e8b29345
florianf [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.
git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6551
837edb03-e0f3-0310-88ca-
d4d4e8b29345