Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 3, 2006, 11:36:02 PM (19 years ago)
Author:
bensch
Message:

orxonox/data/trunk: merged the terrain branche back. conflicts reverted.
merged with
svn merge -r455:HEAD https://svn.orxonox.net/data/branches/terrain .

File:
1 edited

Legend:

Unmodified
Added
Removed
  • data/trunk/worlds/developer_island.oxw

    r3783 r4074  
    1818      <Size>10000</Size>
    1919    </SkyBox>
    20     <Terrain>
    21       <name>HardCore</name>
    22       <model>worlds/environ.obj</model>
    23     </Terrain>
    2420    <MappedWater>
    2521       <waterHeight>50</waterHeight>
Note: See TracChangeset for help on using the changeset viewer.