Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 25, 2011, 9:28:29 PM (13 years ago)
Author:
dafrick
Message:

Reverse merge to revert last, failed, merge. Apparently you can't partially commit a merge.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation/data/levels/templates/spaceshipAssff.oxt

    r8578 r8579  
    1212   initialhealth     = 100
    1313
    14    shieldhealth        = 30
    15    initialshieldhealth = 30
    16    maxshieldhealth     = 50
    17    shieldabsorption    = 0.8
    18    reloadrate          = 1
    19    reloadwaittime      = 1
    20 
    21    primaryThrust     = 100
    22    auxilaryThrust    = 30
    23    rotationThrust    = 25
    24 
    25    boostPower            = 15
    26    boostPowerRate        = 1
    27    boostRate             = 5
    28    boostCooldownDuration = 10
    29 
    30    shakeFrequency = 15
    31    shakeAmplitude = 7
     14   primaryThrust     = 100;
     15   auxilaryThrust    = 30;
     16   rotationThrust    = 25;
    3217
    3318   collisionType     = "dynamic"
Note: See TracChangeset for help on using the changeset viewer.