Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11104 for code/trunk


Ignore:
Timestamp:
Jan 31, 2016, 11:42:11 PM (8 years ago)
Author:
fvultier
Message:

Some HUDs (Health, Shield, Weapons, EnemyHealth, EnemyShield) are also displayed in FPS mode. Removed two unused redundant files.

Location:
code/trunk/data
Files:
2 deleted
13 edited

Legend:

Unmodified
Added
Removed

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

    r9939 r11104  
    99<?lua
    1010  include("HUDTemplates3.oxo")
     11  include("HUDTemplatesFPS.oxo")
    1112  include("stats.oxo")
    1213  include("templates/spaceshipAssff.oxt")

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

    r11052 r11104  
    1111  include("stats.oxo")
    1212  include("HUDTemplates3.oxo")
     13  include("HUDTemplatesFPS.oxo")
    1314  include("templates/lodInformation.oxt")
    1415  include("templates/pickupRepresentationTemplates.oxt")
    … …  
    2223  include("templates/spaceshipTurret.oxt")
    2324  include("templates/spaceshipCollateralDamage.oxt")
    24   include("templates/FPS_HS14.oxt")
     25  include("templates/FPS.oxt")
    2526  include("templates/HeavyCruiser.oxt")
    2627  include("templates/spacestation_elements.oxt")
    … …  
    139140        <!-- FPS Player as destination of the dock -->
    140141        <!-- My position after docking -->
    141             <FpsPlayer template = "fps_HS14" radarname = "First Person Player" position = "1330,-20016,0" >
     142            <FpsPlayer template = "fps" radarname = "First Person Player" position = "1330,-20016,0" >
    142143              <attached>
    143144                <DistanceTriggerBeacon name="bcnDestroyer" />
    … …  
    313314               
    314315 </attached>
    315   </StaticEntity>
     316</StaticEntity>
    316317       
    317318   

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

    r9943 r11104  
    99<?lua
    1010  include("HUDTemplates3.oxo")
     11  include("HUDTemplatesFPS.oxo")
    1112  include("stats.oxo")
    1213  include("templates/spaceshipAssff.oxt")

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

    r9943 r11104  
    1010  include("stats.oxo")
    1111  include("HUDTemplates3.oxo")
     12  include("HUDTemplatesFPS.oxo")
    1213  include("templates/lodInformation.oxt")
    1314  include("templates/pickupRepresentationTemplates.oxt")

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

    r11052 r11104  
    99    include("stats.oxo")
    1010    include("HUDTemplates3.oxo")
     11    include("HUDTemplatesFPS.oxo")
    1112    include("templates/lodInformation.oxt")
    1213

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

    r10262 r11104  
    1010  include("stats.oxo")
    1111  include("HUDTemplates3.oxo")
     12  include("HUDTemplatesFPS.oxo")
    1213  include("templates/lodInformation.oxt")
    1314  include("templates/pickupRepresentationTemplates.oxt")

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

    r9348 r11104  
    88<?lua
    99  include("HUDTemplates3.oxo")
     10  include("HUDTemplatesFPS.oxo")
    1011  include("stats.oxo")
    1112  include("templates/spaceshipAssff.oxt")

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

    r9348 r11104  
    88<?lua
    99  include("HUDTemplates3.oxo")
     10  include("HUDTemplatesFPS.oxo")
    1011  include("stats.oxo")
    1112  include("templates/spaceshipAssff.oxt")

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

    r11052 r11104  
    1010  include("stats.oxo")
    1111  include("HUDTemplates3.oxo")
     12  include("HUDTemplatesFPS.oxo")
    1213  include("templates/lodInformation.oxt")
    1314  include("templates/pickupRepresentationTemplates.oxt")

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

    r11052 r11104  
    1010    include("stats.oxo")
    1111    include("HUDTemplates3.oxo")
     12    include("HUDTemplatesFPS.oxo")
    1213    include("templates/lodInformation.oxt")
    1314

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

    r11052 r11104  
    99    include("stats.oxo")
    1010    include("HUDTemplates3.oxo")
     11    include("HUDTemplatesFPS.oxo")
    1112    include("templates/lodInformation.oxt")
    1213

  • code/trunk/data/levels/templates/FPS.oxt

    r11052 r11104  
    11<Template name=fps>
    22  <FpsPlayer
     3   hudtemplate            = fpshud
    34   spawnparticlesource    = "Orxonox/fairytwirl"
    45   spawnparticleduration  = 3
    … …  
    89   maxhealth         = 200
    910   initialhealth     = 100
     11
     12   shieldhealth        = 30
     13   initialshieldhealth = 30
     14   maxshieldhealth     = 30
     15   shieldabsorption    = 0.9
     16   shieldrechargerate  = 1
     17   shieldrechargewaittime = 1
    1018
    1119   primaryThrust     = 0;

  • code/trunk/data/overlays/HUDTemplatesFPS.oxo

    r10292 r11104  
    1 <Template name="spectatorhud">
    2   <OverlayGroup name = "spectatorhud" scale = "1, 1">
    3   </OverlayGroup>
    4 </Template>
    5 
    61<Template name="fpshud">
    72  <OverlayGroup name = "fpshud" scale = "1, 1">
    … …  
    116     name              = "HealthBar1"
    127     background        = "Orxonox/HealthBarBackground"
    13      size              = "0.35, 0.0875"
     8     size              = "0.40, 0.08"
    149     position          = "0.0 , 0.95 "
    1510     pickpoint         = "0, 1"
    … …  
    1712     textfont          = "VeraMono"
    1813     textusebarcolour  = true
    19      textsize          = 0.039
    20      textoffset        = "0.315, 0.05"
     14     textscale          = 0.4
     15     textoffset        = "0.325, -0.825"
    2116     textpickpoint     = "0, 0"
    2217     textalign         = "right"
    23      correctaspect     = false
    24      textcorrectaspect = false
     18     correctaspect     = true
     19     iconmaterial      = "Orxonox/BarIconHealth"
    2520    >
    2621      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
    … …  
    2924    </HUDHealthBar>
    3025
    31  <!--   <HUDSpeedBar
    32      name          = "SpeedBar1"
     26    <HUDShieldBar
     27     name          = "ShieldBar1"
    3328     background    = "Orxonox/BarBackground"
    34      size          = "0.35, 0.05"
     29     size          = "0.40, 0.04"
    3530     position      = "0.0 , 1.0 "
    3631     pickpoint     = "0, 1"
    37      correctaspect = false
     32     correctaspect = true
     33     iconmaterial  = "Orxonox/BarIconShield"
    3834    >
    39       <BarColour position = 0.0 colour = "0.7,0.5,0.2" />
    40       <BarColour position = 0.5 colour = "0.2,0.7,0.2" />
    41       <BarColour position = 1.0 colour = "0.7,0.2,0.2" />
    42     </HUDSpeedBar>
    43 -->
     35      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
     36      <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
     37      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
     38    </HUDShieldBar>
     39
     40    <HUDEnemyHealthBar
     41     name              = "EnemyHealthBar"
     42     background        = "Orxonox/HealthBarBackground"
     43     size              = "0.4, 0.08"
     44     position          = "1 ,0"
     45     pickpoint         = "1, 0"
     46     bartexture        = "healthbar_bar.png"
     47     textfont          = "VeraMono"
     48     textusebarcolour  = true
     49     textscale         = 0.4
     50     textoffset        = "-0.675, 0.175"
     51     textpickpoint     = "0, 0"
     52     textalign         = "right"
     53     correctaspect     = true
     54     iconmaterial      = "Orxonox/BarIconHealth"
     55    >
     56      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
     57      <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
     58      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
     59    </HUDEnemyHealthBar>
     60
     61    <HUDEnemyShieldBar
     62     name          = "EnemyShieldBar1"
     63     background    = "Orxonox/BarBackground"
     64     size          = "0.40, 0.04"
     65     position      = "1.0 , 0.1 "
     66     pickpoint     = "1, 0"
     67     correctaspect = true
     68     iconmaterial  = "Orxonox/BarIconShield"
     69    >
     70      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
     71      <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
     72      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
     73    </HUDEnemyShieldBar>
     74
    4475    <HUDNavigation
    4576     name          = "Navigation"
    … …  
    6495    />
    6596
     97    <HUDWeaponSystem
     98     name                   = "WeaponSystem"
     99     correctaspect          = true
     100     position               = "0.01, 0.01"
     101     pickpoint              = "0, 0"
     102     visible                = "true"
     103     weaponModeHUDSize      = "0.09, 0.03"
     104    />
     105
    66106    <HUDTimer
    67107     name     = "Timer"
    … …  
    73113    />
    74114
    75  <!--   <GUIOverlay
     115    <GUIOverlay
    76116      name = "QuestGUI"
    77117      guiname = "QuestGUI"
    78118      visible = "false"
    79119    />
    80 -->
     120   
     121    <GUIOverlay
     122      name = "PickupInventory"
     123      guiname = "PickupInventory"
     124      visible = "false"
     125    />
     126
    81127  </OverlayGroup>
    82128</Template>
Note: See TracChangeset for help on using the changeset viewer.