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.

Location:
code/branches/presentation/data
Files:
4 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation/data/defaultConfig/keybindings.ini

    r8578 r8579  
    2121KeyDown="scale -1 moveFrontBack"
    2222KeyE="scale -1 rotateRoll"
    23 KeyEnd="boost"
     23KeyEnd=boost
    2424KeyEquals=
    2525KeyEscape="keyESC"
    … …  
    119119KeySlash=
    120120KeySleep=
    121 KeySpace="boost"
     121KeySpace=boost
    122122KeyStop=
    123123KeySystemRequest="printScreen"

  • code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi

    r8578 r8579  
    2626          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
    2727          <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
    28           <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
     28          <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
    2929        </Weapon>
    3030        <Weapon>
    … …  
    3636          <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
    3737          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
    38           <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
     38          <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
    3939        </Weapon>
    4040        <Weapon>
    41           <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
    42           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
     41          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=50 />
     42          <RocketFire mode=3 muzzleoffset="0,0,0" damage=100 />
    4343        </Weapon>
    4444      </WeaponPack>

  • 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.