supertux.git
17 years ago- add a COLGROUP_MOVING_STATIC (in the future we should try to reduce the number...
Matthias Braun [Thu, 10 Aug 2006 19:56:20 +0000 (19:56 +0000)]
- add a COLGROUP_MOVING_STATIC (in the future we should try to reduce the number of groups, by changing the group to a bitfield...)
- this fixes block stacking nicely
- Changed the way grabbing is done

SVN-Revision: 4150

17 years agoUpdated test/light.stl for the correct alpha value
Arvid Norlander [Thu, 10 Aug 2006 19:05:30 +0000 (19:05 +0000)]
Updated test/light.stl for the correct alpha value

SVN-Revision: 4149

17 years agoUse standard color format for spotlight.
Wolfgang Becker [Thu, 10 Aug 2006 17:50:20 +0000 (17:50 +0000)]
Use standard color format for spotlight.

SVN-Revision: 4146

17 years agoAdded secret areas and/or fading tilemaps to some world1 and bonus1 levels.
Arvid Norlander [Thu, 10 Aug 2006 00:12:54 +0000 (00:12 +0000)]
Added secret areas and/or fading tilemaps to some world1 and bonus1 levels.

SVN-Revision: 4145

17 years agoGetting a rock on the head hurts.
Wolfgang Becker [Wed, 9 Aug 2006 22:55:40 +0000 (22:55 +0000)]
Getting a rock on the head hurts.

SVN-Revision: 4144

17 years agoOut the window, Sam. There's nothing but strangers out there.
Christoph Sommer [Wed, 9 Aug 2006 21:58:27 +0000 (21:58 +0000)]
Out the window, Sam. There's nothing but strangers out there.

SVN-Revision: 4143

17 years agoassert that the vector for Color constructor is long enough
Matthias Braun [Wed, 9 Aug 2006 16:28:09 +0000 (16:28 +0000)]
assert that the vector for Color constructor is long enough

SVN-Revision: 4140

17 years agoLAYER_HUD and above ignore lightmap
Wolfgang Becker [Wed, 9 Aug 2006 15:28:04 +0000 (15:28 +0000)]
LAYER_HUD and above ignore lightmap

SVN-Revision: 4139

17 years agoFixed edge tiles and missing tiles in some levels.
Arvid Norlander [Wed, 9 Aug 2006 15:00:40 +0000 (15:00 +0000)]
Fixed edge tiles and missing tiles in some levels.

SVN-Revision: 4138

17 years agoilluminated console
Wolfgang Becker [Wed, 9 Aug 2006 13:16:37 +0000 (13:16 +0000)]
illuminated console

SVN-Revision: 4137

17 years agoSome fixes
Christoph Sommer [Wed, 9 Aug 2006 11:36:21 +0000 (11:36 +0000)]
Some fixes

SVN-Revision: 4136

17 years agoNew sector attribute 'ambient-light'.
Wolfgang Becker [Wed, 9 Aug 2006 02:22:48 +0000 (02:22 +0000)]
New sector attribute 'ambient-light'.

SVN-Revision: 4133

17 years agoTechdemo
Christoph Sommer [Tue, 8 Aug 2006 19:42:49 +0000 (19:42 +0000)]
Techdemo

SVN-Revision: 4132

17 years agoForgot new files
Christoph Sommer [Tue, 8 Aug 2006 18:12:53 +0000 (18:12 +0000)]
Forgot new files

SVN-Revision: 4131

17 years agoTileMaps can now use paths
Christoph Sommer [Tue, 8 Aug 2006 18:10:00 +0000 (18:10 +0000)]
TileMaps can now use paths

SVN-Revision: 4130

17 years agoFixed a few edgetiles in christophA.stl
Arvid Norlander [Sat, 5 Aug 2006 16:08:40 +0000 (16:08 +0000)]
Fixed a few edgetiles in christophA.stl

SVN-Revision: 4128

17 years agomake it compile again
Wolfgang Becker [Sat, 5 Aug 2006 15:50:38 +0000 (15:50 +0000)]
make it compile again

SVN-Revision: 4127

17 years agoFixed a few water tiles and added some forground tiles for the lower edge of the...
Arvid Norlander [Sat, 5 Aug 2006 14:49:46 +0000 (14:49 +0000)]
Fixed a few water tiles and added some forground tiles for the lower edge of the water in fish.stl

SVN-Revision: 4126

17 years agoFixed a bug. Replaced switch with button.
Christoph Sommer [Sat, 5 Aug 2006 03:40:32 +0000 (03:40 +0000)]
Fixed a bug. Replaced switch with button.

SVN-Revision: 4125

17 years agoAdded code and placeholder graphics (selfmade, GPL/GFDL) of a pushbutton
Christoph Sommer [Sat, 5 Aug 2006 03:01:51 +0000 (03:01 +0000)]
Added code and placeholder graphics (selfmade, GPL/GFDL) of a pushbutton

SVN-Revision: 4123

17 years agothat one sounds better
Wolfgang Becker [Sat, 5 Aug 2006 00:06:07 +0000 (00:06 +0000)]
that one sounds better

SVN-Revision: 4122

17 years agoswitch noise
Wolfgang Becker [Fri, 4 Aug 2006 23:58:40 +0000 (23:58 +0000)]
switch noise

SVN-Revision: 4121

17 years agoLots of pipes
Christoph Sommer [Fri, 4 Aug 2006 22:49:21 +0000 (22:49 +0000)]
Lots of pipes

SVN-Revision: 4120

17 years agoupdown.stl: fixed edge tiles in water by adding an extra tilemap; leaves.stl: fixed...
Arvid Norlander [Fri, 4 Aug 2006 22:46:30 +0000 (22:46 +0000)]
updown.stl: fixed edge tiles in water by adding an extra tilemap; leaves.stl: fixed stray edge tile; airkey.stl: changed level name

SVN-Revision: 4119

17 years agoFixed a few edge tiles in data/levels/world2/detour.stl
Arvid Norlander [Fri, 4 Aug 2006 22:30:46 +0000 (22:30 +0000)]
Fixed a few edge tiles in data/levels/world2/detour.stl

SVN-Revision: 4118

17 years agoEditor: delete Badguys undoable, don't strip trailing decimal point
Wolfgang Becker [Thu, 3 Aug 2006 01:23:16 +0000 (01:23 +0000)]
Editor: delete Badguys undoable, don't strip trailing decimal point
when entering floats.

SVN-Revision: 4117

17 years agoimproved rockhowto a bit
Wolfgang Becker [Thu, 3 Aug 2006 00:54:48 +0000 (00:54 +0000)]
improved rockhowto a bit

SVN-Revision: 4116

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

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

SVN-Revision: 4103

17 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

17 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

17 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

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

SVN-Revision: 4099

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

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

SVN-Revision: 4089

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

17 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

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

SVN-Revision: 4058

17 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

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

SVN-Revision: 4055

17 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

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

SVN-Revision: 4053

17 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

17 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

17 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

17 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

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

SVN-Revision: 4048

17 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

17 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

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

SVN-Revision: 4044

17 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

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

SVN-Revision: 4042

17 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

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

SVN-Revision: 4040

17 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

17 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

17 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