Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 593


Ignore:
Timestamp:
Dec 17, 2007, 9:06:17 PM (16 years ago)
Author:
nicolasc
Message:

fixed level

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/FICN/bin/levels/sample.oxw

    r592 r593  
    4040    <BaseEntity name="TheShip3" src="assf2.mesh" node="ShipNode3" />
    4141
    42 <<<<<<< .mine
    43 
    44     <SceneNode name="node1" pos="0,2000,0"  scale="40,40,40" />
    45     <Entity name="asteroid1" src="ast1.mesh" node="node1" />
    46 
    47     <SceneNode name="node2" pos="2000,0,0" scale="20,20,20"/>
    48     <Entity name="asteroid2" src="ast2.mesh" node="node2" />
    49 =======
    5042    <Model position="0,2000,0" scale="40" mesh="ast1.mesh" />
    5143    <Model position="2000,0,0" scale="20" mesh="ast2.mesh" />
     
    5547    <Model position="0,0,-2000" scale="20" mesh="ast6.mesh" />
    5648    <Model position="1000,1500,0" scale="50" mesh="ast1.mesh" />
    57 >>>>>>> .r591
    5849
    59 <<<<<<< .mine
    60     <SceneNode name="node3" pos="0,0,2000" scale="20,20,20"/>
    61     <Entity name="aststeroid3" src="ast3.mesh" node="node3"/>
    62 
    63     <SceneNode name="node4" pos="0,-2000,0" scale="20,20,20"/>
    64     <Entity name="asteroid4" src="ast4.mesh" node="node4" />
    65 
    66     <SceneNode name="node5" pos="-2000,0,0" scale="20,20,20"/>
    67     <Entity name="asteroid5" src="ast5.mesh" node="node5" />
    68 
    69     <SceneNode name="node6" pos="0,0,-2000" scale="20,20,20"/>
    70     <Entity name="asteroid6" src="ast6.mesh" node="node6" />
    71 
    72     <SceneNode name="node7" pos="1000,1500,0"  scale="50,50,50" />
    73     <Entity name="asteroid7" src="ast1.mesh" node="node7" />
    74 
    75 
    76 =======
    77 >>>>>>> .r591
    7850  </world>
    7951
Note: See TracChangeset for help on using the changeset viewer.