Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 6, 2015, 11:03:00 PM (9 years ago)
Author:
landauf
Message:

merged the latest changes from pickupsFS14 to trunk

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/data/levels/jump.oxw

    r10259 r10260  
    243243            <Model position="0,0,-1000" mesh="JumpPlatform06.mesh" scale="1" />
    244244            <Model position="0,0,-1000" mesh="JumpProjectile.mesh" scale="1" />
    245             <Model position="0,0,-1000" mesh="JumpFigure.mesh" scale="1" />
    246245            <Model position="0,0,-1000" mesh="JumpEnemy1.mesh" scale="1" />
    247246            <Model position="0,0,-1000" mesh="JumpEnemy2.mesh" scale="1" />
     
    250249            <Model position="0,0,-1000" mesh="JumpSpring.mesh" scale="1" />
    251250            <Model position="0,0,-1000" mesh="JumpRocket.mesh" scale="1" />
     251            <Model position="0,0,-1000" mesh="JumpPropeller.mesh" scale="1" />
     252            <Model position="0,0,-1000" mesh="JumpBoots.mesh" scale="1" />
     253            <Model position="0,0,-1000" mesh="JumpShield.mesh" scale="1" />
    252254          </attached>
    253255        </JumpCenterpoint>
Note: See TracChangeset for help on using the changeset viewer.