supertux.git
17 years agoFixed a bug in the png_recompress.sh script
Arvid Norlander [Sat, 19 May 2007 16:47:52 +0000 (16:47 +0000)]
Fixed a bug in the png_recompress.sh script

SVN-Revision: 5004

17 years agoInserted more Information Blocks, in favour of shorter text
Christoph Sommer [Thu, 17 May 2007 18:05:43 +0000 (18:05 +0000)]
Inserted more Information Blocks, in favour of shorter text

SVN-Revision: 5000

17 years agoFix jam dist. Some hpp files were missing
Tim Goya [Wed, 16 May 2007 14:20:52 +0000 (14:20 +0000)]
Fix jam dist.  Some hpp files were missing

SVN-Revision: 4999

17 years agoImproved Add-on Manager's error handling
Christoph Sommer [Wed, 18 Apr 2007 16:46:51 +0000 (16:46 +0000)]
Improved Add-on Manager's error handling

SVN-Revision: 4996

17 years agoFixed Tux picking up dead BadGuys: Will no longer pick up objects in collision group...
Christoph Sommer [Tue, 17 Apr 2007 18:34:40 +0000 (18:34 +0000)]
Fixed Tux picking up dead BadGuys: Will no longer pick up objects in collision group COLGROUP_DISABLED

SVN-Revision: 4995

17 years agoTried fixing squirrel utils for 64bit: SQInteger is a long, which is longer than...
Christoph Sommer [Tue, 17 Apr 2007 17:01:49 +0000 (17:01 +0000)]
Tried fixing squirrel utils for 64bit: SQInteger is a long, which is longer than an int on 64 bit

SVN-Revision: 4994

17 years agoOdd Bug
Christoph Sommer [Mon, 16 Apr 2007 20:15:25 +0000 (20:15 +0000)]
Odd Bug

SVN-Revision: 4993

17 years agoInvisible block solidity now applies to all objects, not only Tux
Christoph Sommer [Mon, 16 Apr 2007 20:01:25 +0000 (20:01 +0000)]
Invisible block solidity now applies to all objects, not only Tux

SVN-Revision: 4992

17 years agoWalking Badguys that get dizzy fall off the screen
Christoph Sommer [Mon, 16 Apr 2007 19:28:20 +0000 (19:28 +0000)]
Walking Badguys that get dizzy fall off the screen

SVN-Revision: 4990

17 years agomake game_session do main_loop->set_speed(0) on pause, reverted TimeScheduler changes
Matthias Braun [Mon, 16 Apr 2007 18:39:00 +0000 (18:39 +0000)]
make game_session do main_loop->set_speed(0) on pause, reverted TimeScheduler changes

SVN-Revision: 4989

17 years agoSprites animation slows down together with the rest of the game: Now based on game_ti...
Christoph Sommer [Mon, 16 Apr 2007 18:18:40 +0000 (18:18 +0000)]
Sprites animation slows down together with the rest of the game: Now based on game_time instead of real_time

SVN-Revision: 4988

17 years agoFixed strange error with saved Tux' state getting reset when quitting to the title...
Christoph Sommer [Mon, 16 Apr 2007 17:54:15 +0000 (17:54 +0000)]
Fixed strange error with saved Tux' state getting reset when quitting to the title screen: Worldmaps dumped the (global) player state when they were destroyed, but the screen manager delayed their destruction.

SVN-Revision: 4987

17 years agodon't adjust aspect-ratio in non-fullscreen modes, removed a few unneeded headers
Matthias Braun [Mon, 16 Apr 2007 17:48:28 +0000 (17:48 +0000)]
don't adjust aspect-ratio in non-fullscreen modes, removed a few unneeded headers

SVN-Revision: 4986

17 years agoScripting scheduler is now paused while pause menu is shown
Christoph Sommer [Mon, 16 Apr 2007 17:17:53 +0000 (17:17 +0000)]
Scripting scheduler is now paused while pause menu is shown

SVN-Revision: 4985

17 years agoStatistics are now saved to disk
Christoph Sommer [Sun, 15 Apr 2007 22:06:08 +0000 (22:06 +0000)]
Statistics are now saved to disk

SVN-Revision: 4983

17 years agoIncreased precision when saving configuration.
Wolfgang Becker [Sun, 15 Apr 2007 21:35:52 +0000 (21:35 +0000)]
Increased precision when saving configuration.
Fixed "-a auto".

SVN-Revision: 4982

17 years agoText wrapping in TextScroller, InfoBox and InfoBlock respects variable-width fonts.
Christoph Sommer [Sun, 15 Apr 2007 15:41:27 +0000 (15:41 +0000)]
Text wrapping in TextScroller, InfoBox and InfoBlock respects variable-width fonts.
InfoBlock objects' height adapts to text height.

SVN-Revision: 4981

17 years agoUpdated Hungarian translation
Christoph Sommer [Sun, 15 Apr 2007 13:34:23 +0000 (13:34 +0000)]
Updated Hungarian translation

SVN-Revision: 4980

17 years agoUpdated Dutch translation
Christoph Sommer [Sun, 15 Apr 2007 13:31:37 +0000 (13:31 +0000)]
Updated Dutch translation

SVN-Revision: 4979

17 years agoUpdated Slovenian translation
Christoph Sommer [Sun, 15 Apr 2007 13:28:49 +0000 (13:28 +0000)]
Updated Slovenian translation

SVN-Revision: 4978

17 years agotry to force vsyncing for opengl, the desktop resolution detection and vsyncing only...
Matthias Braun [Sat, 14 Apr 2007 21:23:33 +0000 (21:23 +0000)]
try to force vsyncing for opengl, the desktop resolution detection and vsyncing only works for SDL >= 1.2.10, so add an #ifdef around the code

SVN-Revision: 4977

17 years agoauto detect aspect ratio of monitor, so that you don't have to know/use the cryptic...
Matthias Braun [Sat, 14 Apr 2007 21:09:02 +0000 (21:09 +0000)]
auto detect aspect ratio of monitor, so that you don't have to know/use the cryptic commandline switches if you own a widescreen monitor

SVN-Revision: 4976

17 years agoScroll nonblocking infoblock by moving half a block away.
Wolfgang Becker [Tue, 10 Apr 2007 21:10:53 +0000 (21:10 +0000)]
Scroll nonblocking infoblock by moving half a block away.

SVN-Revision: 4975

17 years agoExperiments with InfoBlock no longer pausing the game
Christoph Sommer [Tue, 10 Apr 2007 20:06:14 +0000 (20:06 +0000)]
Experiments with InfoBlock no longer pausing the game

SVN-Revision: 4974

17 years agoInfoBox only displays scroll arrows if there is actually more text to display
Christoph Sommer [Tue, 10 Apr 2007 20:05:22 +0000 (20:05 +0000)]
InfoBox only displays scroll arrows if there is actually more text to display

SVN-Revision: 4973

17 years ago"Print Screen"-Key takes screenshots
Christoph Sommer [Mon, 9 Apr 2007 00:24:45 +0000 (00:24 +0000)]
"Print Screen"-Key takes screenshots

SVN-Revision: 4972

17 years agoAdded "Invisible Wall" area by tjcarter (GPL2+/CC-by-sa)
Christoph Sommer [Mon, 9 Apr 2007 00:00:06 +0000 (00:00 +0000)]
Added "Invisible Wall" area by tjcarter (GPL2+/CC-by-sa)

SVN-Revision: 4970

17 years agoInvisible unisolid tile by tjcarter (GPL2+/CC-by-sa)
Christoph Sommer [Sun, 8 Apr 2007 23:54:33 +0000 (23:54 +0000)]
Invisible unisolid tile by tjcarter (GPL2+/CC-by-sa)

SVN-Revision: 4969

17 years agoGraceful handling of situations when downloading the Add-on list fails
Christoph Sommer [Sun, 8 Apr 2007 12:02:51 +0000 (12:02 +0000)]
Graceful handling of situations when downloading the Add-on list fails

SVN-Revision: 4968

17 years agoFixed auto-opening of Console when adding lines that get wrapped
Christoph Sommer [Sun, 8 Apr 2007 12:01:42 +0000 (12:01 +0000)]
Fixed auto-opening of Console when adding lines that get wrapped

SVN-Revision: 4967

17 years agoAdd-on Manager now uses .nfo files for meta information
Christoph Sommer [Wed, 4 Apr 2007 20:01:53 +0000 (20:01 +0000)]
Add-on Manager now uses .nfo files for meta information

SVN-Revision: 4966

17 years agoFixed incorrect svn:executable on some po files, odd that they would have svn:executa...
Arvid Norlander [Wed, 4 Apr 2007 09:02:31 +0000 (09:02 +0000)]
Fixed incorrect svn:executable on some po files, odd that they would have svn:executable set....

SVN-Revision: 4965

17 years agoRemoved one and added another secret area in airkey.stl
Arvid Norlander [Wed, 4 Apr 2007 08:59:22 +0000 (08:59 +0000)]
Removed one and added another secret area in airkey.stl

SVN-Revision: 4964

17 years agoSome cosmetic fixes to bonus2/level2.stl
Arvid Norlander [Wed, 4 Apr 2007 08:19:38 +0000 (08:19 +0000)]
Some cosmetic fixes to bonus2/level2.stl

SVN-Revision: 4963

17 years agoAdded secret path to world2. Type "worldmap.secret1.fade(1, 2)" in the console to...
Christoph Sommer [Tue, 3 Apr 2007 21:17:49 +0000 (21:17 +0000)]
Added secret path to world2. Type "worldmap.secret1.fade(1, 2)" in the console to reveal it.

SVN-Revision: 4962

17 years agoAllowed multiple solid Tilemaps on a Worldmap
Christoph Sommer [Tue, 3 Apr 2007 21:12:55 +0000 (21:12 +0000)]
Allowed multiple solid Tilemaps on a Worldmap

SVN-Revision: 4961

17 years agofixed walk directions of plain grass tile
Christoph Sommer [Tue, 3 Apr 2007 21:12:04 +0000 (21:12 +0000)]
fixed walk directions of plain grass tile

SVN-Revision: 4960

17 years agoExpose Objects on Worldmap in squirrel table "worldmap"
Christoph Sommer [Tue, 3 Apr 2007 19:41:49 +0000 (19:41 +0000)]
Expose Objects on Worldmap in squirrel table "worldmap"

SVN-Revision: 4959

17 years agoAdded Add-ons for Add-on manager, so online checks are voluntary
Christoph Sommer [Sun, 1 Apr 2007 22:39:30 +0000 (22:39 +0000)]
Added Add-ons for Add-on manager, so online checks are voluntary

SVN-Revision: 4958

17 years agoAdded script that normalizes all .po files in the current directory, i.e. keeps them...
Christoph Sommer [Sun, 1 Apr 2007 22:34:56 +0000 (22:34 +0000)]
Added script that normalizes all .po files in the current directory, i.e. keeps them in sync with messages.pot and enforces a constant sort order for easier diffs

SVN-Revision: 4957

17 years agoExposed Tilemap alpha manipulation to squirrel and lisp
Christoph Sommer [Sun, 1 Apr 2007 15:10:23 +0000 (15:10 +0000)]
Exposed Tilemap alpha manipulation to squirrel and lisp

SVN-Revision: 4956

17 years agoPipe bends
Christoph Sommer [Sun, 1 Apr 2007 14:23:16 +0000 (14:23 +0000)]
Pipe bends

SVN-Revision: 4955

17 years agofix strange looping reported by tjcarter on IRC
Tim Goya [Fri, 23 Mar 2007 17:37:27 +0000 (17:37 +0000)]
fix strange looping reported by tjcarter on IRC

SVN-Revision: 4952

17 years agoMerged blueh.diff from tjcarter. It provides a horizontal blue pipe
Arvid Norlander [Thu, 22 Mar 2007 08:21:04 +0000 (08:21 +0000)]
Merged blueh.diff from tjcarter. It provides a horizontal blue pipe

SVN-Revision: 4951

17 years agoNew version of png_recompress.sh, fixed some bugs. Thanks to znx in #freenode-social...
Arvid Norlander [Thu, 22 Mar 2007 08:11:26 +0000 (08:11 +0000)]
New version of png_recompress.sh, fixed some bugs. Thanks to znx in #freenode-social for fixing the "non-working-directory" bug.

SVN-Revision: 4950

17 years agoExplicitly added license tag to all Forest World levels (except airkey.stl)
Christoph Sommer [Tue, 20 Mar 2007 21:39:13 +0000 (21:39 +0000)]
Explicitly added license tag to all Forest World levels (except airkey.stl)

SVN-Revision: 4949

17 years agoExplicitly added license tag to all Icyisland levels
Christoph Sommer [Tue, 20 Mar 2007 20:58:53 +0000 (20:58 +0000)]
Explicitly added license tag to all Icyisland levels

SVN-Revision: 4948

17 years agoAdded contact/license to worldmaps and menu level.
Arvid Norlander [Tue, 20 Mar 2007 20:06:31 +0000 (20:06 +0000)]
Added contact/license to worldmaps and menu level.

SVN-Revision: 4945

17 years agolicence update
Wolfgang Becker [Tue, 20 Mar 2007 20:02:56 +0000 (20:02 +0000)]
licence update

SVN-Revision: 4944

17 years agoRemoved quite a bit of unused space from christophC.stl, that is a lot of the sector...
Arvid Norlander [Sat, 17 Mar 2007 10:45:18 +0000 (10:45 +0000)]
Removed quite a bit of unused space from christophC.stl, that is a lot of the sector was not used (empty). The player couldn't see it or get there.

SVN-Revision: 4943

17 years agoMake a nice default gradient when there isn't already a background or gradient, issue...
Tim Goya [Thu, 8 Mar 2007 15:01:58 +0000 (15:01 +0000)]
Make a nice default gradient when there isn't already a background or gradient, issue 0000188

SVN-Revision: 4941

17 years agoRemoved unused level preview images from world2 as they were removed in world1 too.
Arvid Norlander [Thu, 8 Mar 2007 10:42:06 +0000 (10:42 +0000)]
Removed unused level preview images from world2 as they were removed in world1 too.

SVN-Revision: 4940

17 years agoMerged the rest waterfall tiles (except edgecloud)
Arvid Norlander [Thu, 8 Mar 2007 10:30:23 +0000 (10:30 +0000)]
Merged the rest waterfall tiles (except edgecloud)

SVN-Revision: 4939

17 years agoMerged transparent waterfall tiles.
Arvid Norlander [Thu, 8 Mar 2007 10:02:35 +0000 (10:02 +0000)]
Merged transparent waterfall tiles.

SVN-Revision: 4938

17 years agoMerged wood blocks
Arvid Norlander [Thu, 8 Mar 2007 09:23:34 +0000 (09:23 +0000)]
Merged wood blocks

SVN-Revision: 4937

17 years agoMerged rock_plate tiles
Arvid Norlander [Thu, 8 Mar 2007 09:11:42 +0000 (09:11 +0000)]
Merged rock_plate tiles

SVN-Revision: 4936

17 years agoStandardlized author names, so the same name is used everywhere.
Arvid Norlander [Wed, 7 Mar 2007 23:30:10 +0000 (23:30 +0000)]
Standardlized author names, so the same name is used everywhere.

SVN-Revision: 4935

17 years agosvn merge -c-4932 .
Christoph Sommer [Wed, 7 Mar 2007 23:27:32 +0000 (23:27 +0000)]
svn merge -c-4932 .

SVN-Revision: 4934

17 years agoAdded license to airkey.stl
Arvid Norlander [Wed, 7 Mar 2007 22:59:43 +0000 (22:59 +0000)]
Added license to airkey.stl

SVN-Revision: 4933

17 years agoExperimental modification of jumping behaviour
Christoph Sommer [Wed, 7 Mar 2007 22:40:42 +0000 (22:40 +0000)]
Experimental modification of jumping behaviour

SVN-Revision: 4932

17 years agoAdded level properties "contact" and "license"
Christoph Sommer [Wed, 7 Mar 2007 22:31:02 +0000 (22:31 +0000)]
Added level properties "contact" and "license"

SVN-Revision: 4931

17 years agoGot rid of a superfluous debug message
Christoph Sommer [Wed, 7 Mar 2007 22:27:28 +0000 (22:27 +0000)]
Got rid of a superfluous debug message

SVN-Revision: 4930

17 years agorevert earlier target_y changes
Matthias Braun [Sat, 3 Mar 2007 22:46:12 +0000 (22:46 +0000)]
revert earlier target_y changes

SVN-Revision: 4926

17 years agosuper metroid style camera
Matthias Braun [Sat, 3 Mar 2007 22:36:58 +0000 (22:36 +0000)]
super metroid style camera

SVN-Revision: 4925

17 years agooops, fix that
Matthias Braun [Sat, 3 Mar 2007 21:38:00 +0000 (21:38 +0000)]
oops, fix that

SVN-Revision: 4924

17 years agostop camera if player is dying
Matthias Braun [Sat, 3 Mar 2007 21:35:33 +0000 (21:35 +0000)]
stop camera if player is dying

SVN-Revision: 4923

17 years agomake it possible to disable the no-scroll mode
Matthias Braun [Sat, 3 Mar 2007 21:31:20 +0000 (21:31 +0000)]
make it possible to disable the no-scroll mode

SVN-Revision: 4922

17 years agoat the left or right end, it's obvious which dir we will go next
Matthias Braun [Sat, 3 Mar 2007 21:09:25 +0000 (21:09 +0000)]
at the left or right end, it's obvious which dir we will go next

SVN-Revision: 4921

17 years agomore work on the camera
Matthias Braun [Sat, 3 Mar 2007 21:01:55 +0000 (21:01 +0000)]
more work on the camera

SVN-Revision: 4920

17 years agoconverted crack.png to a sprite
Matthias Braun [Sat, 3 Mar 2007 20:59:41 +0000 (20:59 +0000)]
converted crack.png to a sprite

SVN-Revision: 4919

17 years agofix clamping code, enable it in camera.cfg again
Matthias Braun [Sat, 3 Mar 2007 20:21:37 +0000 (20:21 +0000)]
fix clamping code, enable it in camera.cfg again

SVN-Revision: 4918

17 years agofix stupid bug in camera code, tweak camera settings a bit more
Matthias Braun [Sat, 3 Mar 2007 19:50:03 +0000 (19:50 +0000)]
fix stupid bug in camera code, tweak camera settings a bit more

SVN-Revision: 4917

17 years agoslow down camera again (this should cure sea-sickness...)
Matthias Braun [Sat, 3 Mar 2007 19:31:16 +0000 (19:31 +0000)]
slow down camera again (this should cure sea-sickness...)

SVN-Revision: 4916

17 years agothis should improve the YI mode, I plan more modifications though
Matthias Braun [Sat, 3 Mar 2007 19:08:32 +0000 (19:08 +0000)]
this should improve the YI mode, I plan more modifications though

SVN-Revision: 4915

17 years agofix another dependency problem
Matthias Braun [Sat, 3 Mar 2007 17:51:09 +0000 (17:51 +0000)]
fix another dependency problem

SVN-Revision: 4914

17 years agoexperimental code to influence camera, adjusted some parameters, tried to improve...
Matthias Braun [Sat, 3 Mar 2007 17:12:34 +0000 (17:12 +0000)]
experimental code to influence camera, adjusted some parameters, tried to improve camera parameters

SVN-Revision: 4913

17 years agofix jamfile to avoid having to rum jam twice when miniswig inputfiles changed
Matthias Braun [Sat, 3 Mar 2007 15:24:07 +0000 (15:24 +0000)]
fix jamfile to avoid having to rum jam twice when miniswig inputfiles changed

SVN-Revision: 4912

17 years ago- some transparence tweaking, separated water into proper tiles
Ingo Ruhnke [Sat, 3 Mar 2007 14:40:02 +0000 (14:40 +0000)]
- some transparence tweaking, separated water into proper tiles

SVN-Revision: 4911

17 years ago- fixed tiling, added lava to tiles.strf
Ingo Ruhnke [Sat, 3 Mar 2007 14:26:21 +0000 (14:26 +0000)]
- fixed tiling, added lava to tiles.strf

SVN-Revision: 4910

17 years ago- added check for 'region' symbol
Ingo Ruhnke [Sat, 3 Mar 2007 14:23:49 +0000 (14:23 +0000)]
- added check for 'region' symbol

SVN-Revision: 4909

17 years agoConvert cnames back to .h
Tim Goya [Sat, 3 Mar 2007 03:38:07 +0000 (03:38 +0000)]
Convert cnames back to .h

SVN-Revision: 4908

17 years ago- some experimental new tiles
Ingo Ruhnke [Sat, 3 Mar 2007 02:51:15 +0000 (02:51 +0000)]
- some experimental new tiles

SVN-Revision: 4907

17 years agoremove lots of glibc specific stuff from obstack
Matthias Braun [Fri, 2 Mar 2007 18:23:29 +0000 (18:23 +0000)]
remove lots of glibc specific stuff from obstack

SVN-Revision: 4906

17 years ago- removed obsolete thumbnails
Ingo Ruhnke [Fri, 2 Mar 2007 17:42:35 +0000 (17:42 +0000)]
- removed obsolete thumbnails

SVN-Revision: 4905

17 years agoFixed compile error by adding missing include (from tuxdev's instructions)
Arvid Norlander [Fri, 2 Mar 2007 17:00:25 +0000 (17:00 +0000)]
Fixed compile error by adding missing include (from tuxdev's instructions)

SVN-Revision: 4904

17 years agominimize some #includes and replace with forward decls
Tim Goya [Fri, 2 Mar 2007 14:13:41 +0000 (14:13 +0000)]
minimize some #includes and replace with forward decls

SVN-Revision: 4903

17 years agoMinor fixes to some bonus levels (changing to new lava, fixing of incorrect tiles...
Arvid Norlander [Thu, 1 Mar 2007 11:50:02 +0000 (11:50 +0000)]
Minor fixes to some bonus levels (changing to new lava, fixing of incorrect tiles, removing badguys outside map, ...)

SVN-Revision: 4891

17 years agoFixed positions of doors and other objects in level1.stl and level6.stl
Arvid Norlander [Thu, 1 Mar 2007 10:38:06 +0000 (10:38 +0000)]
Fixed positions of doors and other objects in level1.stl and level6.stl

SVN-Revision: 4889

17 years agoFixed position of doors and marked some secret areas in level5.stl
Arvid Norlander [Thu, 1 Mar 2007 10:20:16 +0000 (10:20 +0000)]
Fixed position of doors and marked some secret areas in level5.stl

SVN-Revision: 4888

17 years ago- Use obstacks for memory allocation for lispfiles and DrawingRequests,
Matthias Braun [Wed, 28 Feb 2007 18:16:37 +0000 (18:16 +0000)]
- Use obstacks for memory allocation for lispfiles and DrawingRequests,
  this should speedup the game a bit (esp. on windows where malloc is slow)
- fixed a bunch of memory leaks
- some experiments with the camera (disable and they didn't work out too well)

SVN-Revision: 4882

17 years agofix music
Matthias Braun [Wed, 28 Feb 2007 18:09:35 +0000 (18:09 +0000)]
fix music

SVN-Revision: 4881

17 years agomore experiments with menu levels
Matthias Braun [Wed, 28 Feb 2007 18:06:24 +0000 (18:06 +0000)]
more experiments with menu levels

SVN-Revision: 4880

17 years agoAdded Catalan translation by Marti Bosc
Ondřej Hošek [Tue, 27 Feb 2007 15:18:56 +0000 (15:18 +0000)]
Added Catalan translation by Marti Bosc

SVN-Revision: 4873

17 years ago- added development version logo, probably needs some more explaining text
Ingo Ruhnke [Sun, 25 Feb 2007 00:39:12 +0000 (00:39 +0000)]
- added development version logo, probably needs some more explaining text

SVN-Revision: 4872

17 years agoInfinite play and different color for Penny
Christoph Sommer [Thu, 22 Feb 2007 22:00:01 +0000 (22:00 +0000)]
Infinite play and different color for Penny

SVN-Revision: 4871

17 years ago- added fullscreen/window switch to F11 (gnome-like)
Ingo Ruhnke [Mon, 19 Feb 2007 16:44:59 +0000 (16:44 +0000)]
- added fullscreen/window switch to F11 (gnome-like)

SVN-Revision: 4868

17 years agoFix endsequence walking direction
Tim Goya [Mon, 19 Feb 2007 00:22:37 +0000 (00:22 +0000)]
Fix endsequence walking direction

SVN-Revision: 4865

17 years ago- added some notes on using the file
Ingo Ruhnke [Sun, 18 Feb 2007 22:54:14 +0000 (22:54 +0000)]
- added some notes on using the file

SVN-Revision: 4864

17 years ago- added some code to list free tile ids
Ingo Ruhnke [Sun, 18 Feb 2007 22:43:26 +0000 (22:43 +0000)]
- added some code to list free tile ids

SVN-Revision: 4863

17 years ago- cleaned up the remaining tile id collision
Ingo Ruhnke [Sun, 18 Feb 2007 22:39:53 +0000 (22:39 +0000)]
- cleaned up the remaining tile id collision

SVN-Revision: 4862