Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 12, 2009, 8:20:07 PM (15 years ago)
Author:
rgrieder
Message:

Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.

Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder ;)

Location:
code/trunk
Files:
8 edited
1 copied

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/data/levels/old/physicstest2.oxw

    r5781 r5929  
    243243    <!--EventDispatcher>
    244244      <targets>
    245         <EventTarget name=fireright />
    246         <EventTarget name=firecenter />
    247         <EventTarget name=fireleft />
     245        <EventTarget target=fireright />
     246        <EventTarget target=firecenter />
     247        <EventTarget target=fireleft />
    248248      </targets>
    249249      <events>

  • code/trunk/data/levels/old/princessaeryn.oxw

    r5781 r5929  
    264264            <EventDispatcher>
    265265                <targets>
    266                     <EventTarget name=trail />
     266                    <EventTarget target=trail />
    267267                </targets>
    268268                <events>

  • code/trunk/data/levels/old/sample4.oxw

    r5781 r5929  
    123123    <EventDispatcher>
    124124      <targets>
    125         <EventTarget name=fireright />
    126         <EventTarget name=firecenter />
    127         <EventTarget name=fireleft />
     125        <EventTarget target=fireright />
     126        <EventTarget target=firecenter />
     127        <EventTarget target=fireleft />
    128128      </targets>
    129129      <events>

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

    r5781 r5929  
    151151    <EventDispatcher>
    152152      <targets>
    153         <EventTarget name=fireright />
    154         <EventTarget name=firecenter />
    155         <EventTarget name=fireleft />
     153        <EventTarget target=fireright />
     154        <EventTarget target=firecenter />
     155        <EventTarget target=fireleft />
    156156      </targets>
    157157      <events>

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

    r5781 r5929  
    111111    <EventDispatcher>
    112112      <targets>
    113         <EventTarget name=pirates />
     113        <EventTarget target=pirates />
    114114      </targets>
    115115      <events>
    … …  
    163163    <EventDispatcher>
    164164      <targets>
    165         <EventTarget name=attacker />
     165        <EventTarget target=attacker />
    166166      </targets>
    167167      <events>

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

    r5781 r5929  
    3232      <Backlight scale=0.2 colour="1.0, 1.0, 0.5" width=7 length=500 lifetime=0.3 elements=20 trailmaterial="Trail/backlighttrail" material="Examples/Flare" />
    3333      <Light type=point diffuse="1.0, 1.0, 0.5" specular="1.0, 1.0, 0.5" attenuation="1200, 1.0, 0.0035, 0.00005" />
    34     </attached>
     34      <ParticleSpawner name=hiteffect position="0,0,0" source="Orxonox/sparks2" lifetime=0.01 autostart=0 mainstate=spawn />
     35    </attached>
     36    <eventlisteners>
     37      <EventTarget target=hiteffect />
     38    </eventlisteners>
    3539  </PongBall>
    3640</Template>
    … …  
    4246 gametype     = Pong
    4347>
     48  <AmbientSound source="ambient/mainmenu.wav" playOnLoad=true />
     49
    4450  <Scene
    4551   ambientlight = "0.5, 0.5, 0.5"
    … …  
    5864  <MovableEntity rotationrate=5 rotationaxis="0,0,1">
    5965    <attached>
    60       <PongCenterpoint name=pongcenter dimension="200,120" balltemplate=pongball battemplate=pongbat ballspeed=200 batspeed=130 batlength=0.25>
     66      <PongCenterpoint name=pongcenter dimension="200,120" balltemplate=pongball battemplate=pongbat ballspeed=200 ballaccfactor=1.0 batspeed=130 batlength=0.25>
    6167        <attached>
    6268          <Model position="0,0,60" mesh="cube.mesh" scale3D="105,1,1" />
    6369          <Model position="0,0,-60" mesh="cube.mesh" scale3D="105,1,1" />
    64 <!--
    65           <ParticleSpawner name=scoreeffect_R position=" 100,0, 60" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0 />
    66           <ParticleSpawner name=scoreeffect position="  50,0, 60" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0 />
    67           <ParticleSpawner name=scoreeffect position="   0,0, 60" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0 />
    68           <ParticleSpawner name=scoreeffect position=" -50,0, 60" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0 />
    69           <ParticleSpawner name=scoreeffect_L position="-100,0, 60" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0 />
    70           <ParticleSpawner name=scoreeffect_R position=" 100,0,-60" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0 />
    71           <ParticleSpawner name=scoreeffect position="  50,0,-60" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0 />
    72           <ParticleSpawner name=scoreeffect position="   0,0,-60" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0 />
    73           <ParticleSpawner name=scoreeffect position=" -50,0,-60" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0 />
    74           <ParticleSpawner name=scoreeffect_L position="-100,0,-60" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0 />
    75 -->
     70
     71          <ParticleSpawner name=scoreeffect_right position="120,0, 45" source="Orxonox/sparks2" lifetime=0.1 autostart=0 />
     72          <ParticleSpawner name=scoreeffect_right position="120,0, 30" source="Orxonox/BigExplosion1part2" lifetime=3.0 autostart=0 />
     73          <ParticleSpawner name=scoreeffect_right position="120,0, 15" source="Orxonox/sparks2" lifetime=0.1 autostart=0 />
     74          <ParticleSpawner name=scoreeffect_right position="120,0,  0" source="Orxonox/BigExplosion1part2" lifetime=0.1 autostart=0 />
     75          <ParticleSpawner name=scoreeffect_right position="120,0,-15" source="Orxonox/sparks2" lifetime=0.1 autostart=0 />
     76          <ParticleSpawner name=scoreeffect_right position="120,0,-30" source="Orxonox/BigExplosion1part2" lifetime=3.0 autostart=0 />
     77          <ParticleSpawner name=scoreeffect_right position="120,0,-45" source="Orxonox/sparks2" lifetime=0.1 autostart=0 />
     78
     79          <ParticleSpawner name=scoreeffect_left position="-120,0, 45" source="Orxonox/sparks2" lifetime=0.1 autostart=0 />
     80          <ParticleSpawner name=scoreeffect_left position="-120,0, 30" source="Orxonox/BigExplosion1part2" lifetime=3.0 autostart=0 />
     81          <ParticleSpawner name=scoreeffect_left position="-120,0, 15" source="Orxonox/sparks2" lifetime=0.1 autostart=0 />
     82          <ParticleSpawner name=scoreeffect_left position="-120,0,  0" source="Orxonox/BigExplosion1part2" lifetime=0.1 autostart=0 />
     83          <ParticleSpawner name=scoreeffect_left position="-120,0,-15" source="Orxonox/sparks2" lifetime=0.1 autostart=0 />
     84          <ParticleSpawner name=scoreeffect_left position="-120,0,-30" source="Orxonox/BigExplosion1part2" lifetime=3.0 autostart=0 />
     85          <ParticleSpawner name=scoreeffect_left position="-120,0,-45" source="Orxonox/sparks2" lifetime=0.1 autostart=0 />
     86
     87          <WorldSound name="scoreSound" position="0,0,0" source="sounds/pong_score.wav" >
     88            <events>
     89              <play>
     90                <EventListener event=pongcenter />
     91              </play>
     92            </events>
     93          </WorldSound>
     94
     95<?lua
     96for i = 1, 15, 1
     97do ?>
     98          <ParticleSpawner name=scoreeffect_center position="<?lua print(math.random() * 200 - 100) ?>,0,<?lua print(math.random() * 120 - 60) ?>" source="Orxonox/sparks2" lifetime=0.02 autostart=0 startdelay=<?lua print(math.random() * 0.7) ?> />
     99<?lua
     100end
     101?>
     102
    76103        </attached>
    77104      </PongCenterpoint>
    … …  
    81108  <EventDispatcher>
    82109    <targets>
    83       <EventTarget name=scoreeffect />
     110      <EventTarget target=scoreeffect_right />
     111      <EventTarget target=scoreeffect_center />
    84112    </targets>
    85113    <events>
    86114      <spawn>
    87         <EventListener event=pongcenter />
     115        <EventFilter>
     116          <names>
     117            <EventName name=right />
     118          </names>
     119          <EventListener event=pongcenter />
     120        </EventFilter>
     121      </spawn>
     122    </events>
     123  </EventDispatcher>
     124  <EventDispatcher>
     125    <targets>
     126      <EventTarget target=scoreeffect_left />
     127      <EventTarget target=scoreeffect_center />
     128    </targets>
     129    <events>
     130      <spawn>
     131        <EventFilter>
     132          <names>
     133            <EventName name=left />
     134          </names>
     135          <EventListener event=pongcenter />
     136        </EventFilter>
    88137      </spawn>
    89138    </events>

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

    r5781 r5929  
    66
    77<?lua
    8         dofile("../../media/levels/includes/CuboidSpaceStation.lua")
     8        dofile("includes/CuboidSpaceStation.lua")
    99?>
    1010
    … …  
    227227            <EventDispatcher>
    228228                <targets>
    229                     <EventTarget name=trail />
     229                    <EventTarget target=trail />
    230230                </targets>
    231231                <events>
Note: See TracChangeset for help on using the changeset viewer.