supertux.git
18 years agofix for my last committ
Matthias Braun [Wed, 2 Aug 2006 22:36:35 +0000 (22:36 +0000)]
fix for my last committ

SVN-Revision: 4115

18 years agoReverted bigger parts of tuxdev patch:
Matthias Braun [Wed, 2 Aug 2006 22:23:22 +0000 (22:23 +0000)]
Reverted bigger parts of tuxdev patch:
  - Don't push convenience functions into MovingObject/GameObject
  - Don't allow modification of position/size of gameobjects, that's not safe
  - solid flag is removed now
  - Reverted AmbientSound changes
  - don't add fields to Portable interface

SVN-Revision: 4114

18 years agoMoving solids without physic-enabled are in COLGROUP_STATIC now.
Wolfgang Becker [Wed, 2 Aug 2006 22:23:11 +0000 (22:23 +0000)]
Moving solids without physic-enabled are in COLGROUP_STATIC now.

SVN-Revision: 4113

18 years agopipe tops should be solid
Matthias Braun [Wed, 2 Aug 2006 21:25:35 +0000 (21:25 +0000)]
pipe tops should be solid

SVN-Revision: 4112

18 years agoHope this takes care of the problems with scripted objects caused by r4076.
Wolfgang Becker [Tue, 1 Aug 2006 21:45:40 +0000 (21:45 +0000)]
Hope this takes care of the problems with scripted objects caused by r4076.

SVN-Revision: 4110

18 years agoInfobox about Portable Rocks.
Wolfgang Becker [Tue, 1 Aug 2006 21:24:22 +0000 (21:24 +0000)]
Infobox about Portable Rocks.
Fixed AmbientSound to have a size again.

SVN-Revision: 4109

18 years agoFixed bug in tools/levelconverter-0.1.3_0.2.0.scm that made guile refuse to run it...
Arvid Norlander [Tue, 1 Aug 2006 14:46:40 +0000 (14:46 +0000)]
Fixed bug in tools/levelconverter-0.1.3_0.2.0.scm that made guile refuse to run it and added note about bugs in the conversion, added warning for rocket dispenser with dir = auto and fixed some tiles in world2/level2.stl

SVN-Revision: 4108

18 years agoAdded fading tilemap to data/levels/world2/christoph5.stl and fixed some tilegroups...
Arvid Norlander [Sun, 30 Jul 2006 15:22:36 +0000 (15:22 +0000)]
Added fading tilemap to data/levels/world2/christoph5.stl and fixed some tilegroups in data/images/tiles.strf

SVN-Revision: 4107

18 years agoFixed edge tiles and other minor issues in some world2 levels
Arvid Norlander [Sun, 30 Jul 2006 13:12:49 +0000 (13:12 +0000)]
Fixed edge tiles and other minor issues in some world2 levels

SVN-Revision: 4106

18 years agoFixed ending in data/levels/world2/christoph2.stl
Arvid Norlander [Sun, 30 Jul 2006 12:30:05 +0000 (12:30 +0000)]
Fixed ending in data/levels/world2/christoph2.stl

SVN-Revision: 4105

18 years agoUpdated airkey.stl again
Arvid Norlander [Sun, 30 Jul 2006 10:58:09 +0000 (10:58 +0000)]
Updated airkey.stl again

SVN-Revision: 4104

18 years agoUpdated airkey.stl
Arvid Norlander [Sun, 30 Jul 2006 10:38:49 +0000 (10:38 +0000)]
Updated airkey.stl

SVN-Revision: 4103

18 years agoFixed world1/21 - A Path in the Clouds.stl
Arvid Norlander [Sat, 29 Jul 2006 14:02:35 +0000 (14:02 +0000)]
Fixed world1/21 - A Path in the Clouds.stl

SVN-Revision: 4102

18 years agoAdded fading secret-area covers to some levels
Christoph Sommer [Sat, 29 Jul 2006 13:33:57 +0000 (13:33 +0000)]
Added fading secret-area covers to some levels

SVN-Revision: 4101

18 years agoMerged -nogl update by gnomino
Christoph Sommer [Sat, 29 Jul 2006 13:32:49 +0000 (13:32 +0000)]
Merged -nogl update by gnomino

SVN-Revision: 4100

18 years agoUpdated Swedish translations
Arvid Norlander [Wed, 26 Jul 2006 23:20:15 +0000 (23:20 +0000)]
Updated Swedish translations

SVN-Revision: 4099

18 years agoAdded some fading tilemaps
Arvid Norlander [Wed, 26 Jul 2006 23:10:53 +0000 (23:10 +0000)]
Added some fading tilemaps

SVN-Revision: 4098

18 years agoReverted "Down The Rabbit Hole" at groundwater's request
Arvid Norlander [Wed, 26 Jul 2006 19:49:18 +0000 (19:49 +0000)]
Reverted "Down The Rabbit Hole" at groundwater's request

SVN-Revision: 4097

18 years agoAdded a fading tilemap to the level "15 - Under the Ice.stl"
Arvid Norlander [Wed, 26 Jul 2006 18:57:40 +0000 (18:57 +0000)]
Added a fading tilemap to the level "15 - Under the Ice.stl"

SVN-Revision: 4096

18 years agoFixed a bug: Empty fade_tilemap attribute faded out all tilemaps with empty name...
Christoph Sommer [Wed, 26 Jul 2006 17:43:28 +0000 (17:43 +0000)]
Fixed a bug: Empty fade_tilemap attribute faded out all tilemaps with empty name attribute

SVN-Revision: 4095

18 years agoEquipped levels with fade-away tilemaps
Christoph Sommer [Wed, 26 Jul 2006 15:43:44 +0000 (15:43 +0000)]
Equipped levels with fade-away tilemaps

SVN-Revision: 4094

18 years agoSecretArea triggers can make tilemaps fade away. See test level.
Christoph Sommer [Wed, 26 Jul 2006 15:19:58 +0000 (15:19 +0000)]
SecretArea triggers can make tilemaps fade away. See test level.

SVN-Revision: 4093

18 years agoCommitted some code beautification patches by Tron
Christoph Sommer [Tue, 25 Jul 2006 19:48:09 +0000 (19:48 +0000)]
Committed some code beautification patches by Tron

SVN-Revision: 4091

18 years agoAdded placeholder tiles for horizontal-end-of-hole pieces
Christoph Sommer [Tue, 25 Jul 2006 19:23:17 +0000 (19:23 +0000)]
Added placeholder tiles for horizontal-end-of-hole pieces

SVN-Revision: 4090

18 years agoChanged some tiles
Christoph Sommer [Tue, 25 Jul 2006 17:45:48 +0000 (17:45 +0000)]
Changed some tiles

SVN-Revision: 4089

18 years agoAdded T-intersection for poles
Christoph Sommer [Tue, 25 Jul 2006 17:44:38 +0000 (17:44 +0000)]
Added T-intersection for poles

SVN-Revision: 4088

18 years agoAdding the base/start of Grumbel's spikevine.
Stephen Groundwater [Tue, 25 Jul 2006 12:14:11 +0000 (12:14 +0000)]
Adding the base/start of Grumbel's spikevine.

SVN-Revision: 4087

18 years agoLevel stats are only declared invalid if a reset-point is actually used
Christoph Sommer [Tue, 25 Jul 2006 00:38:44 +0000 (00:38 +0000)]
Level stats are only declared invalid if a reset-point is actually used

SVN-Revision: 4086

18 years agoIn-game HUD now uses icons instead of text /
Christoph Sommer [Tue, 25 Jul 2006 00:30:30 +0000 (00:30 +0000)]
In-game HUD now uses icons instead of text /
Number of coins smoothly "counts" up- and downward

SVN-Revision: 4085

18 years agoNew Level: 'Tux the Builder'. A forest level with some rocks.
Wolfgang Becker [Mon, 24 Jul 2006 22:52:35 +0000 (22:52 +0000)]
New Level: 'Tux the Builder'. A forest level with some rocks.

SVN-Revision: 4084

18 years agoPhysics class can have its gravity altered
Christoph Sommer [Mon, 24 Jul 2006 19:27:22 +0000 (19:27 +0000)]
Physics class can have its gravity altered

SVN-Revision: 4082

18 years agoExperimental commit:
Christoph Sommer [Mon, 24 Jul 2006 19:26:05 +0000 (19:26 +0000)]
Experimental commit:
Water affects Tux' y-velocity /
Tux can accelerate upwards in water

SVN-Revision: 4081

18 years agoIf player is at illegal position on worldmap, "action" respawns at "main".
Wolfgang Becker [Mon, 24 Jul 2006 15:32:29 +0000 (15:32 +0000)]
If player is at illegal position on worldmap, "action" respawns at "main".

SVN-Revision: 4080

18 years agoLevel time decreases only when game is not paused, i.e. when update() is called /
Christoph Sommer [Mon, 24 Jul 2006 13:12:51 +0000 (13:12 +0000)]
Level time decreases only when game is not paused, i.e. when update() is called /
Timeout not only shrinks Tux, but kills him. /
Prepared time display for planned migration towards icons.

SVN-Revision: 4079

18 years agoMore work on the newer worldmap concept. Fixed so new map launces as default for...
Stephen Groundwater [Mon, 24 Jul 2006 12:09:05 +0000 (12:09 +0000)]
More work on the newer worldmap concept. Fixed so new map launces as default for world 2.

SVN-Revision: 4078

18 years agoFixed some edge tile issues and some trees in christoph6.stl
Arvid Norlander [Sun, 23 Jul 2006 23:20:30 +0000 (23:20 +0000)]
Fixed some edge tile issues and some trees in christoph6.stl

SVN-Revision: 4077

18 years agoTentative checkin of tuxdev's "Object improvement patch, part 1"
Christoph Sommer [Sun, 23 Jul 2006 22:33:17 +0000 (22:33 +0000)]
Tentative checkin of tuxdev's "Object improvement patch, part 1"

SVN-Revision: 4076

18 years agoMade statistics panel a little wider
Christoph Sommer [Sun, 23 Jul 2006 21:49:59 +0000 (21:49 +0000)]
Made statistics panel a little wider

SVN-Revision: 4075

18 years agoCreated the start of an underground tile set, with roots. Entered the start of a...
Stephen Groundwater [Sun, 23 Jul 2006 16:54:34 +0000 (16:54 +0000)]
Created the start of an underground tile set, with roots. Entered the start of a single image worldmap with ladders.

SVN-Revision: 4074

18 years agoExtended leaves.stl. Fixed some levels for tiles 1723-1726 being no longer solid.
Wolfgang Becker [Sun, 23 Jul 2006 16:36:06 +0000 (16:36 +0000)]
Extended leaves.stl. Fixed some levels for tiles 1723-1726 being no longer solid.

SVN-Revision: 4073

18 years agoFixed earth tiles in levels/world2/level5.stl
Arvid Norlander [Sun, 23 Jul 2006 15:56:55 +0000 (15:56 +0000)]
Fixed earth tiles in levels/world2/level5.stl

SVN-Revision: 4072

18 years agoCleaned up 200% slope in images/tiles/snow/convex.png a bit, (partly) fixed earth...
Arvid Norlander [Sun, 23 Jul 2006 15:21:03 +0000 (15:21 +0000)]
Cleaned up 200% slope in images/tiles/snow/convex.png a bit, (partly) fixed earth tiles in levels/world2/airkey.stl and levels/world2/updown.stl

SVN-Revision: 4071

18 years agoNew Level: leaves.stl
Wolfgang Becker [Sun, 23 Jul 2006 14:15:41 +0000 (14:15 +0000)]
New Level: leaves.stl

SVN-Revision: 4070

18 years agoDumbed down levels a bit
Christoph Sommer [Sun, 23 Jul 2006 10:33:30 +0000 (10:33 +0000)]
Dumbed down levels a bit

SVN-Revision: 4069

18 years agoputting mr.bomb back a version.
Stephen Groundwater [Sat, 22 Jul 2006 13:57:37 +0000 (13:57 +0000)]
putting mr.bomb back a version.

SVN-Revision: 4067

18 years agoputting mr.bomb back a version.
Stephen Groundwater [Sat, 22 Jul 2006 13:55:24 +0000 (13:55 +0000)]
putting mr.bomb back a version.

SVN-Revision: 4066

18 years agoputting mr.bomb back a version.
Stephen Groundwater [Sat, 22 Jul 2006 13:54:46 +0000 (13:54 +0000)]
putting mr.bomb back a version.

SVN-Revision: 4065

18 years agoAdded the snow slopes to tiles.strf
Arvid Norlander [Sat, 22 Jul 2006 13:50:03 +0000 (13:50 +0000)]
Added the snow slopes to tiles.strf

SVN-Revision: 4064

18 years agoFixed svn:eol-style on some files
Arvid Norlander [Fri, 21 Jul 2006 21:05:23 +0000 (21:05 +0000)]
Fixed svn:eol-style on some files

SVN-Revision: 4063

18 years agoReverted change in game_session.cpp and game_session.hpp from 4059 to fix bug.
Arvid Norlander [Fri, 21 Jul 2006 20:56:10 +0000 (20:56 +0000)]
Reverted change in game_session.cpp and game_session.hpp from 4059 to fix bug.

SVN-Revision: 4062

18 years agoSign draft: "You need a rock"
Christoph Sommer [Fri, 21 Jul 2006 16:31:26 +0000 (16:31 +0000)]
Sign draft: "You need a rock"

SVN-Revision: 4061

18 years agoAdded a worldmap sprite for the worldmap so Tux can climb ladders.
Stephen Groundwater [Fri, 21 Jul 2006 11:56:29 +0000 (11:56 +0000)]
Added a worldmap sprite for the worldmap so Tux can climb ladders.

SVN-Revision: 4060

18 years agofix cr/lfs and remove trailing whitespaces...
Matthias Braun [Fri, 21 Jul 2006 11:45:14 +0000 (11:45 +0000)]
fix cr/lfs and remove trailing whitespaces...

SVN-Revision: 4059

18 years agoInstalled some elevators
Christoph Sommer [Thu, 20 Jul 2006 21:36:35 +0000 (21:36 +0000)]
Installed some elevators

SVN-Revision: 4058

18 years agoMade some tilegroups in worldmap.strf a little easier to use.
Arvid Norlander [Thu, 20 Jul 2006 18:57:47 +0000 (18:57 +0000)]
Made some tilegroups in worldmap.strf a little easier to use.

SVN-Revision: 4056

18 years agocrack animation
Ingo Ruhnke [Thu, 20 Jul 2006 18:31:36 +0000 (18:31 +0000)]
crack animation

SVN-Revision: 4055

18 years agoAdded a missing tile to tiles.strf and reorganized the "Forest (Foreground)" tilegroup
Arvid Norlander [Thu, 20 Jul 2006 18:00:21 +0000 (18:00 +0000)]
Added a missing tile to tiles.strf and reorganized the "Forest (Foreground)" tilegroup

SVN-Revision: 4054

18 years ago- added slopes
Ingo Ruhnke [Thu, 20 Jul 2006 17:48:53 +0000 (17:48 +0000)]
- added slopes

SVN-Revision: 4053

18 years agoTux no longer hovers above earth floor tiles. Now more in line with existing tiles.
Christoph Sommer [Thu, 20 Jul 2006 17:03:41 +0000 (17:03 +0000)]
Tux no longer hovers above earth floor tiles. Now more in line with existing tiles.

SVN-Revision: 4052

18 years agoAn alternative approach to menus
Christoph Sommer [Wed, 19 Jul 2006 02:17:01 +0000 (02:17 +0000)]
An alternative approach to menus

SVN-Revision: 4051

18 years agoFixed trampoline. Looks like FLAG_SOLID is no good idea any more. (was it ever?)
Wolfgang Becker [Wed, 19 Jul 2006 00:13:01 +0000 (00:13 +0000)]
Fixed trampoline. Looks like FLAG_SOLID is no good idea any more. (was it ever?)

SVN-Revision: 4050

18 years agoLava smoke no longer hurts
Christoph Sommer [Tue, 18 Jul 2006 22:09:52 +0000 (22:09 +0000)]
Lava smoke no longer hurts

SVN-Revision: 4049

18 years agoFun stuff
Christoph Sommer [Tue, 18 Jul 2006 21:27:45 +0000 (21:27 +0000)]
Fun stuff

SVN-Revision: 4048

18 years agoSplash sound on entering water
Wolfgang Becker [Tue, 18 Jul 2006 19:37:09 +0000 (19:37 +0000)]
Splash sound on entering water

SVN-Revision: 4046

18 years agoSectors support multiple solid tilemaps, tilemaps can have a name
Christoph Sommer [Tue, 18 Jul 2006 19:22:42 +0000 (19:22 +0000)]
Sectors support multiple solid tilemaps, tilemaps can have a name

SVN-Revision: 4045

18 years agomore details
Wolfgang Becker [Tue, 18 Jul 2006 18:40:51 +0000 (18:40 +0000)]
more details

SVN-Revision: 4044

18 years agoBonus block items' spawn direction depends on player position (again)
Christoph Sommer [Tue, 18 Jul 2006 16:34:09 +0000 (16:34 +0000)]
Bonus block items' spawn direction depends on player position (again)

SVN-Revision: 4043

18 years agofalling rock
Wolfgang Becker [Mon, 17 Jul 2006 23:53:23 +0000 (23:53 +0000)]
falling rock

SVN-Revision: 4042

18 years agoCrumbling_Path,a Level with Unstable Tiles.
Wolfgang Becker [Mon, 17 Jul 2006 18:31:06 +0000 (18:31 +0000)]
Crumbling_Path,a Level with Unstable Tiles.

SVN-Revision: 4041

18 years agoAdjust Exit.
Wolfgang Becker [Mon, 17 Jul 2006 16:34:48 +0000 (16:34 +0000)]
Adjust Exit.

SVN-Revision: 4040

18 years agotwo more signs to avoid dead end.
Wolfgang Becker [Mon, 17 Jul 2006 16:12:41 +0000 (16:12 +0000)]
two more signs to avoid dead end.

SVN-Revision: 4039

18 years agoMade fish.stl less difficult.
Wolfgang Becker [Mon, 17 Jul 2006 16:02:20 +0000 (16:02 +0000)]
Made fish.stl less difficult.

SVN-Revision: 4038

18 years agoFixed some world1 levels that use darksnow (again...) and made the level "The Escape...
Arvid Norlander [Mon, 17 Jul 2006 11:11:45 +0000 (11:11 +0000)]
Fixed some world1 levels that use darksnow (again...) and made the level "The Escape" look better by adding a second fg tilemap.

SVN-Revision: 4036

18 years agoAdded some missing "thin" dark snow tiles and fixed svn:mime-type on some images.
Arvid Norlander [Mon, 17 Jul 2006 10:49:33 +0000 (10:49 +0000)]
Added some missing "thin" dark snow tiles and fixed svn:mime-type on some images.

SVN-Revision: 4035

18 years agoSector::is_free_space knows about slope tiles
Christoph Sommer [Mon, 17 Jul 2006 00:36:19 +0000 (00:36 +0000)]
Sector::is_free_space knows about slope tiles

SVN-Revision: 4034

18 years ago- make script runable with guile
Ingo Ruhnke [Sun, 16 Jul 2006 21:25:13 +0000 (21:25 +0000)]
- make script runable with guile

SVN-Revision: 4033

18 years agoVariations for resetpoint.
Wolfgang Becker [Sun, 16 Jul 2006 13:46:54 +0000 (13:46 +0000)]
Variations for resetpoint.

SVN-Revision: 4032

18 years agoLevel conversion helper, brackety version
Christoph Sommer [Sun, 16 Jul 2006 02:53:59 +0000 (02:53 +0000)]
Level conversion helper, brackety version

SVN-Revision: 4031

18 years agoRock update
Wolfgang Becker [Sun, 16 Jul 2006 00:30:09 +0000 (00:30 +0000)]
Rock update

SVN-Revision: 4028

18 years agoLet's Rock
Wolfgang Becker [Sat, 15 Jul 2006 23:54:29 +0000 (23:54 +0000)]
Let's Rock

SVN-Revision: 4026

18 years agoFake solid for trampoline.
Wolfgang Becker [Sat, 15 Jul 2006 23:01:06 +0000 (23:01 +0000)]
Fake solid for trampoline.

SVN-Revision: 4025

18 years agoAdded some tiles to tilegroups in tiles.strf
Arvid Norlander [Sat, 15 Jul 2006 21:26:37 +0000 (21:26 +0000)]
Added some tiles to tilegroups in tiles.strf

SVN-Revision: 4024

18 years agoFixed multi hit bricks, adjust comments in trampoline
Wolfgang Becker [Sat, 15 Jul 2006 16:22:27 +0000 (16:22 +0000)]
Fixed multi hit bricks, adjust comments in trampoline

SVN-Revision: 4022

18 years agoMade trampolines less likely to interfere with level design:
Christoph Sommer [Sat, 15 Jul 2006 15:52:24 +0000 (15:52 +0000)]
Made trampolines less likely to interfere with level design:
Portables can (again) only be grabbed from the side, so taking a trampoline and using it at the same time is no longer possible.
Tux can no longer run while carrying a portable, so a gap that can only be jumped when running cannot be crossed with a trampoline.
Reduced level C1's difficulty and replaced level_flip with trampoline.

SVN-Revision: 4021

18 years agoPortable and fixed trampoline.
Wolfgang Becker [Sat, 15 Jul 2006 15:19:10 +0000 (15:19 +0000)]
Portable and fixed trampoline.

SVN-Revision: 4020

18 years agofixed trampoline animation and made behaviour a bit more mario like
Matthias Braun [Sat, 15 Jul 2006 07:53:39 +0000 (07:53 +0000)]
fixed trampoline animation and made behaviour a bit more mario like

SVN-Revision: 4017

18 years agoStart trampoline's animation after using it.
Wolfgang Becker [Sat, 15 Jul 2006 00:47:29 +0000 (00:47 +0000)]
Start trampoline's animation after using it.

SVN-Revision: 4013

18 years agoTrampoline.
Wolfgang Becker [Sat, 15 Jul 2006 00:06:34 +0000 (00:06 +0000)]
Trampoline.

SVN-Revision: 4012

18 years agoBadguys break bricks based on hitbox instead of position.
Wolfgang Becker [Fri, 14 Jul 2006 18:07:05 +0000 (18:07 +0000)]
Badguys break bricks based on hitbox instead of position.

SVN-Revision: 4005

18 years ago'hop' sound
Wolfgang Becker [Fri, 14 Jul 2006 17:01:26 +0000 (17:01 +0000)]
'hop' sound

SVN-Revision: 4004

18 years agoSound for connecting totems.
Wolfgang Becker [Fri, 14 Jul 2006 15:34:28 +0000 (15:34 +0000)]
Sound for connecting totems.

SVN-Revision: 4002

18 years ago- removed unneeded and incorrect extern
Ingo Ruhnke [Thu, 13 Jul 2006 22:07:29 +0000 (22:07 +0000)]
- removed unneeded and incorrect extern

SVN-Revision: 4000

18 years ago- fixed include guarts
Ingo Ruhnke [Thu, 13 Jul 2006 22:05:24 +0000 (22:05 +0000)]
- fixed include guarts

SVN-Revision: 3999

18 years ago- prettier grouping for castle
Ingo Ruhnke [Thu, 13 Jul 2006 21:36:12 +0000 (21:36 +0000)]
- prettier grouping for castle

SVN-Revision: 3998

18 years agomerged two levels
Christoph Sommer [Thu, 13 Jul 2006 21:24:29 +0000 (21:24 +0000)]
merged two levels

SVN-Revision: 3997

18 years agoSorry, missed a file
Christoph Sommer [Thu, 13 Jul 2006 01:15:24 +0000 (01:15 +0000)]
Sorry, missed a file

SVN-Revision: 3996

18 years agoReworked Thunderstorm scripting
Christoph Sommer [Thu, 13 Jul 2006 00:44:58 +0000 (00:44 +0000)]
Reworked Thunderstorm scripting

SVN-Revision: 3995

18 years agoThunderstorm
Christoph Sommer [Thu, 13 Jul 2006 00:08:15 +0000 (00:08 +0000)]
Thunderstorm

SVN-Revision: 3994

18 years agoBonusblock and Bricks now break themself when hit by MrIceblock or Snail.
Wolfgang Becker [Wed, 12 Jul 2006 23:04:09 +0000 (23:04 +0000)]
Bonusblock and Bricks now break themself when hit by MrIceblock or Snail.

SVN-Revision: 3993

18 years agoPlaying around with Ghost forest tiles
Christoph Sommer [Wed, 12 Jul 2006 20:00:34 +0000 (20:00 +0000)]
Playing around with Ghost forest tiles

SVN-Revision: 3992