Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9939 for code/trunk/data


Ignore:
Timestamp:
Dec 21, 2013, 11:16:54 PM (10 years ago)
Author:
jo
Message:

presentationHS13 branch merged into trunk

Location:
code/trunk
Files:
33 edited
24 copied

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/data/defaultConfig/keybindings.ini

    r9526 r9939  
    5858KeyLeftWindows=
    5959KeyLessThan=
    60 KeyM=
     60KeyM="WorldAmbientSound nextsong"
    6161KeyMail=
    6262KeyMediaSelect=

  • code/trunk/data/gui/scripts/MiscConfigMenu.lua

    r9016 r9939  
    3838    table.insert(P.commandList, "HUDNavigation MarkerLimit_")
    3939    table.insert(P.commandList, "HUDNavigation showDistance")
     40    table.insert(P.commandList, "HUDRadar RadarMode_")
    4041
    4142    P.nameList = {}
    … …  
    6061    table.insert(P.nameList, "Marker Limit")
    6162    table.insert(P.nameList, "Show Distance next to cursor")
     63    table.insert(P.nameList, "Set Radar on 3D mode")
    6264
    6365    P.linesList = {}

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

    r9348 r9939  
     1<!-- -->
    12<LevelInfo
    23 name = "FPS testlevel"

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

    r9348 r9939  
    1414
    1515?>
     16
    1617
    1718<?lua
    … …  
    107108
    108109    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    109 
     110       
     111        <!-- SOUNDS & MUSIC -->
     112    <WorldSound name="scoreSound" position="-200,0,0" source="sounds/ReadyGo.ogg" >
     113      <events>
     114        <play>
     115          <EventListener event="start" />
     116        </play>
     117      </events>
     118    </WorldSound>
     119    <DistanceTrigger name="start" position="-200,0,0"  target="Pawn" distance=100 stayActive="true" delay=0.5 />
     120   
     121    <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" />
    110122
    111123    <!-- ------------------Planet----------------- -->

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

    r9348 r9939  
    1111  include("templates/lodInformation.oxt")
    1212?>
     13<WorldAmbientSound source="Asteroid_rocks.ogg" looping="true" playOnLoad="true" />
    1314
    1415<?lua

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

    r9348 r9939  
    55 screenshot = "asteroids.png"
    66/>
     7<WorldAmbientSound source="Asteroid_rocks.ogg" looping="true" playOnLoad="true" />
    78
    89<?lua

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

    r9348 r9939  
     1<!-- -->
    12<LevelInfo
    23 name = "Transporter"

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

    r9348 r9939  
    55 screenshot = "dynamicMatch.png"
    66/>
     7<WorldAmbientSound source="Mars.ogg" looping="true" playOnLoad="true" />
    78
    89<?lua

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

    r9763 r9939  
    3636    all Objects are organized in columns
    3737---->
     38
     39<!--- Spacestation --->
     40      <!--Model position="0,0,-160" yaw="90" pitch="-90" roll="0" scale="1" mesh="ss_box_lowpoly.mesh" /-->
     41      <Model position="0, 20,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_box_lowpoly_ad1.mesh" />
     42      <Model position="0, 40,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_box_lowpoly_ad2.mesh" />
     43      <Model position="0, 60,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_box_lowpoly_ad3.mesh" />
     44      <Model position="0, 80,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_box_lowpoly_ad4.mesh" />
     45      <Model position="0,-20,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_tube.mesh" />
     46      <Model position="0,-40,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_tube_twd.mesh" />
     47      <Model position="0,-60,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_tube_x.mesh" />
     48      <Model position="0,-80,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_wall.mesh" />
     49      <Model position="0,-100,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_table_cracked.mesh" />
     50      <Model position="0,-120,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_table.mesh" />
     51      <Model position="0,-140,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_spind.mesh" />
     52      <Model position="0,-160,-160" yaw="90" pitch="-90" roll="0" scale="0.01" mesh="ss_machine.mesh" />
     53      <Model position="0,-180,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_flag_room.mesh" />
     54      <Model position="0,-200,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_flag_eu.mesh" />
     55      <Model position="0,-220,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_flag_csa.mesh" />
     56      <Model position="0,-240,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_flag_cau.mesh" />
     57      <Model position="0,-260,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_flag_aean.mesh" />
     58      <Model position="0,-280,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_door.mesh" />
     59      <Model position="0,-300,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_cylinder.mesh" />
     60      <Model position="0,-320,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_curve.mesh" />
     61      <Model position="0,-340,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="ss_chair.mesh" />
     62     
    3863
    3964<!--- Whole Objects --->
    … …  
    152177      <!--Model position="0,80,200" yaw="90" pitch="-90" roll="0" scale="5" mesh="SmallPart1.mesh" /-->
    153178      <Model position="0,-20,200" yaw="90" pitch="-90" roll="0" scale="4" mesh="raceCheckPoint.mesh" />
    154       <Model position="0,-40,200" yaw="90" pitch="-90" roll="0" scale="0.5" mesh="Spacegate.mesh" />
     179      <Model position="0,-40,200" yaw="90" pitch="0" roll="0" scale="0.5" mesh="Spacegate.mesh" />
    155180
    156181      <Model position="0,-60,200" yaw="90" pitch="-90" roll="0" scale="0.5" mesh="BigSpacegate.mesh" />

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

    r9555 r9939  
    3232      include("includes/pickups.oxi")
    3333    ?>
     34   
     35    <WorldAmbientSound source="Nebula_metal.ogg" looping="true" playOnLoad="true" />
    3436
    3537<!----- Spawnpoints

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

    r9348 r9939  
    3333      include("includes/pickups.oxi")
    3434    ?>
     35   
     36    <WorldAmbientSound source="Nebula_metal.ogg" looping="true" playOnLoad="true" />
    3537
    3638<Bot />

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

    r9348 r9939  
    2727    skybox       = "Orxonox/skyBoxBasic"
    2828  >
     29  <WorldAmbientSound source="Nebula_metal.ogg" looping="true" playOnLoad="true" />
     30 
    2931<!-- TODO:
    30321. make collisionshapes bulletproof: -> attach movable entity with dynamic collisionshape within a static collisionshape

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

    r9664 r9939  
     1<!-- -->
     2
    13<LevelInfo
    24 name = "Maxim's Test"
    … …  
    2527  </templates>
    2628  <?lua include("includes/notifications.oxi") ?>
     29 
     30  <WorldAmbientSound source="Nebula_metal.ogg" looping="true" playOnLoad="true" />
    2731
    2832  <NotificationQueueCEGUI

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

    r9798 r9939  
     1<!---->
    12<LevelInfo
    23 name = "Mission One"

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

    r9348 r9939  
     1<!-- -->
    12<LevelInfo
    23 name = "Pickups showcase"

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

    r9348 r9939  
    2525    dofile("includes/CuboidSpaceStation.lua")
    2626?>
     27
     28<WorldAmbientSound source="Mars.ogg" looping="true" playOnLoad="true" />
    2729   
    2830<Level

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

    r9526 r9939  
    3434
    3535<Template name=pongball>
    36   <PongBall>
     36  <PongBall
     37   defScoreSound = "sounds/PlayerWinScore_cut.ogg"
     38   defBatSound = "sounds/Button.ogg"
     39   defBoundarySound = "sounds/Button.ogg">
    3740    <attached>
    3841      <Model mesh="sphere.mesh" scale=2 />

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

    r9348 r9939  
    1  
     1<!-- -->
    22<LevelInfo
    33 name = "Portals"

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

    r9016 r9939  
     1<!-- -->
     2
    13<LevelInfo
    24 name = "Presentation"

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

    r9348 r9939  
     1<!---->
     2
    13<LevelInfo
    24 name = "Presentation FS11"

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

    r9016 r9939  
     1<!-- -->
    12<LevelInfo
    23 name = "Quests showcase"

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

    r9016 r9939  
    2929    skybox       = "Orxonox/skyBoxMoreNebula"
    3030  >
     31 
     32  <!-- SOUNDS & MUSIC -->
     33    <WorldSound name="scoreSound" position="0,-2100,0" source="sounds/ReadyGo.ogg" >
     34      <events>
     35        <play>
     36          <EventListener event="start" />
     37        </play>
     38      </events>
     39    </WorldSound>
     40    <DistanceTrigger name="start" position="0,-2100,0"  target="Pawn" distance=100 stayActive="true" delay=0.5 />
     41 
     42    <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" />
     43 
    3144
    3245    <?lua math.randomseed(98) ?>
    … …  
    463476      </controller>
    464477    </SpaceShip>
     478   
     479   
    465480
    466481  </Scene>

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

    r9348 r9939  
    1010 tags = "gametype"
    1111/>
     12
    1213
    1314<?lua
    … …  
    445446    ?>
    446447    <?lua end ?>
     448   
     449    <!-- SOUNDS & MUSIC -->
     450    <WorldSound name="scoreSound" position="0,8050,0" source="sounds/ReadyGo.ogg" >
     451      <events>
     452        <play>
     453          <EventListener event="start" />
     454        </play>
     455      </events>
     456    </WorldSound>
     457    <DistanceTrigger name="start" position="0,8050,0"  target="Pawn" distance=100 stayActive="true" delay=0.5 />
     458    <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" />
    447459
    448460  </Scene>

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

    r9348 r9939  
    1919>
    2020
     21<WorldAmbientSound source="Jupiter.ogg" looping="true" playOnLoad="true" />
     22
    2123  <templates>
    2224    <Template link=lodtemplate_default />

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

    r9348 r9939  
    2222  </templates>
    2323  <?lua include("includes/notifications.oxi") ?>
     24 
     25  <WorldAmbientSound source="Jupiter.ogg" looping="true" playOnLoad="true" />
    2426
    2527  <Scene

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

    r9763 r9939  
    1717      <MeshLodInformation mesh=turretHead.mesh enabled=false />
    1818      <MeshLodInformation mesh=LaserBeam2.mesh enabled=false/>
     19      <MeshLodInformation mesh=asteroid_ice.mesh enabled=false/>
     20      <MeshLodInformation mesh=ast1.mesh  lodQuality=0.1/>
     21      <MeshLodInformation mesh=ast2.mesh  lodQuality=0.1/>
     22      <MeshLodInformation mesh=ast3.mesh  lodQuality=0.1/>
     23      <MeshLodInformation mesh=ast4.mesh  lodQuality=0.1/>
     24      <MeshLodInformation mesh=ast5.mesh  lodQuality=0.1/>
     25      <MeshLodInformation mesh=ast6.mesh  lodQuality=0.1/>
    1926
    2027      <!-- disable LOD for some debris meshes which caused a crash (fixed in Ogre 1.7.3) -->
    2128      <MeshLodInformation mesh=BodyDebris1.mesh enabled=false/>
    2229      <MeshLodInformation mesh=WingDebris2.mesh enabled=false/>
     30      <MeshLodInformation mesh=HeavyCruiser_body.mesh enabled=false/>
     31      <MeshLodInformation mesh=HeavyCruiser_frontL.mesh enabled=false/>
     32      <MeshLodInformation mesh=HeavyCruiser_frontR.mesh enabled=false/>
     33      <MeshLodInformation mesh=HeavyCruiser_partL.mesh enabled=false/>
     34      <MeshLodInformation mesh=HeavyCruiser_partR.mesh enabled=false/>
     35      <MeshLodInformation mesh=HeavyCruiser_sidearmL.mesh enabled=false/>
     36      <MeshLodInformation mesh=HeavyCruiser_sidearmLfront.mesh enabled=false/>
     37      <MeshLodInformation mesh=HeavyCruiser_sidearmR.mesh enabled=false/>
     38      <MeshLodInformation mesh=HeavyCruiser_sidearmRfront.mesh enabled=false/>
     39
     40          <MeshLodInformation mesh=ss_cylinder.mesh enabled=false/>
     41          <MeshLodInformation mesh=ss_chair.mesh enabled=false/>
     42          <MeshLodInformation mesh=ss_flag_room.mesh enabled=false/>
     43          <MeshLodInformation mesh=ss_wall.mesh enabled=false/>
     44          <MeshLodInformation mesh=ss_tube_twd.mesh enabled=false/>
     45          <MeshLodInformation mesh=ss_spind.mesh enabled=false/>
     46         
    2347    </lodinformation>
    2448  </Level>

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

    r8860 r9939  
    3737   linearDamping     = 0.7
    3838   angularDamping    = 0.9999999
     39
     40   explosionSound = "sounds/Explosion2.ogg"
    3941  >
    4042    <engines>
    … …  
    8284   defEngineSndNormal = "sounds/Engine_low.ogg"
    8385   defEngineSndBoost = "sounds/Engine_high.ogg"
    84 
     86   
    8587   accelerationfront     = 500
    8688   accelerationbrake     = 500

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

    r9664 r9939  
     1<!-- -->
     2
    13<LevelInfo
    24 name = "turret Test"

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

    r9348 r9939  
     1<!---->
     2
    13<LevelInfo
    24 name = "Under Attack"
    … …  
    2022  </templates>
    2123  <?lua include("includes/notifications.oxi") ?>
     24  <WorldAmbientSound source="Jupiter.ogg" looping="true" playOnLoad="true" />
    2225
    2326  <Scene

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

    r9526 r9939  
    6868  <HUDRadar
    6969   name          = "Radar"
    70    background    = "Orxonox/Radar"
     70   background    = "Orxonox/radar"
    7171   correctAspect = true
    7272   size          = "0.17, 0.17"

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

    r9526 r9939  
    108108    />
    109109
    110     <HUDRadar
    111      name          = "Radar"
    112      background    = "Orxonox/Radar"
    113      correctaspect = true
    114      size          = "0.17, 0.17"
    115      position      = "1.0, 1.0"
    116      pickpoint     = "1.0, 1.0"
    117      rotation      = 0
    118      sensitivity   = 1.0
    119      halfDotSizeDistance = 3000
    120      maximumDotSize      = 0.1
     110        <HUDRadar
     111     name                               = "Radar"
     112     background                         = "Orxonox/Radar3D"
     113     material2D                         = "Orxonox/Radar"
     114     material3DMiddle           = "Orxonox/Radar3D"
     115     material3DFront            = "Orxonox/Radar3DFront"
     116     material3DBack                     = "Orxonox/Radar3DBack"
     117     correctaspect                      = true
     118     size                               = "0.17, 0.17"
     119     position                           = "1.0, 1.0"
     120     pickpoint                          = "1.0, 1.0"
     121     rotation                           = 0
     122     sensitivity                        = 1.0
     123     halfDotSizeDistance        = 3000
     124     detectionLimit             = 10000.0
     125     maximumDotSize             = 0.1
     126     maximumDotSize3D           = 0.06
     127     mapAngle3D                         = 0.6435011
    121128    />
    122 
     129   
    123130    <HUDTimer
    124131     name     = "Timer"

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

    r8858 r9939  
    3232   name     = "RTRText"
    3333   position = "0.3, 0.09"
     34   font     = "Monofur"
     35   textsize = 0.03
     36  />
     37 
     38  <OverlayText
     39   name     = "PositionTextCaption"
     40   position = "0.03, 0.13"
     41   font     = "Monofur"
     42   caption  = "Position: "
     43   textsize = 0.03
     44  />
     45 
     46  <DebugPositionText
     47   name     = "PositionText"
     48   position = "0.3, 0.13"
    3449   font     = "Monofur"
    3550   textsize = 0.03
Note: See TracChangeset for help on using the changeset viewer.