Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 579 for code/branches


Ignore:
Timestamp:
Dec 17, 2007, 4:23:41 PM (17 years ago)
Author:
nicolasc
Message:

removed "conflict"

File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/FICN/bin/levels/sample.oxw

    r578 r579  
    1 <<<<<<< .mine
    21<?xml version="1.0"?>
    32<orxonoxworld name="Orxonox sample level" image="textures/menu/moonstation_512x512.jpg">
    … …  
    5857        </scripts>
    5958</orxonoxworld>
    60 =======
    61 <?xml version="1.0"?>
    62 <orxonoxworld name="Orxonox sample level" image="textures/menu/moonstation_512x512.jpg">
    63   <description>
    64     This is an orxonox sample level.
    65   </description>
    66 
    67   <loading>
    68     <background color="000000" image="textures/load_screens/ambush.png" />
    69     <bar top="200" left="50" width="300" height="20" image="textures/load_screens/ambush-loadbar.png" />
    70   </loading>
    71 
    72   <audio>
    73   </audio>
    74 
    75   <!-- Keep a minimum distance of >100 to the object, otherwise the camara thinks it's in the object -->
    76   <!-- the value has to negative, as we want the camara behind the object -->
    77   <world>
    78     <SceneNode name="OgreHeadNode" pos="0,0,0" />
    79     <Camera name="Camera" pos="0,0,-150" lookat="0,0,0" node="OgreHeadNode" />
    80     <Ambient colourvalue="1,1,1" />
    81     <Skybox src="Orxonox/StarfieldSkyBox" />
    82 
    83     <BaseEntity name="ASSF" src="assf2.mesh" node="OgreHeadNode" />
    84 
    85     <SceneNode name="node1" pos="0,200,0" />
    86     <Entity name="asteroid1" src="ast1.mesh" node="node1" />
    87 
    88     <SceneNode name="node2" pos="200,0,0" />
    89     <Entity name="asteroid2" src="ast2.mesh" node="node2" />
    90 
    91     <SceneNode name="node3" pos="0,0,200" />
    92     <Entity name="aststeroid3" src="ast3.mesh" node="node3" />
    93 
    94     <SceneNode name="node4" pos="0,-200,0" />
    95     <Entity name="asteroid4" src="ast4.mesh" node="node4" />
    96 
    97     <SceneNode name="node5" pos="-200,0,0" />
    98     <Entity name="asteroid5" src="ast5.mesh" node="node5" />
    99 
    100     <SceneNode name="node6" pos="0,0,-200" />
    101     <Entity name="asteroid6" src="ast6.mesh" node="node6" />
    102   </world>
    103 
    104 <!-- Unused at the moment -->
    105   <SpaceshipSteeringObject node="OgreHeadNode" forward="500" rotateupdown="200" rotaterightleft="200" looprightleft="200" />
    106 
    107   <scripts>
    108     <script file="intro.lua" />
    109   </scripts>
    110 </orxonoxworld>
    111 >>>>>>> .r577
Note: See TracChangeset for help on using the changeset viewer.