Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3538


Ignore:
Timestamp:
Jan 7, 2006, 11:23:25 PM (18 years ago)
Author:
bensch
Message:

orxonox/data/trunk: merged the network data to the trunk:
merged with command

svn merge ​https://svn.orxonox.net/data/branches/network . -r159:HEAD

no conflicts

Location:
data/trunk/worlds
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • data/trunk/worlds/DefaultCampaign.oxc

    r3499 r3538  
    44  <description>The one and only default debug campaign</description>
    55  <WorldList>
    6     <World>
     6    <SinglePlayerWorld>
    77      <identifier>0</identifier>
    88      <nextid>1</nextid>
    99      <path>worlds/Straight.oxw</path>
    10     </World>
    11     <World>
     10    </SinglePlayerWorld>
     11    <SinglePlayerWorld>
    1212      <identifier>1</identifier>
    1313      <nextid>2</nextid>
    1414      <path>worlds/christmas.oxw</path>
    15     </World>
    16     <World>
     15    </SinglePlayerWorld>
     16    <SinglePlayerWorld>
    1717      <identifier>2</identifier>
    1818      <nextid>3</nextid>
    1919      <path>worlds/DefaultWorld.oxw</path>
    20     </World>
    21     <World>
     20    </SinglePlayerWorld>
     21    <SinglePlayerWorld>
    2222      <identifier>3</identifier>
    2323      <nextid>4</nextid>
    2424      <path>worlds/vulcania.oxw</path>
    25     </World>
    26     <World>
     25    </SinglePlayerWorld>
     26    <SinglePlayerWorld>
    2727      <identifier>4</identifier>
    2828      <nextid>999</nextid>
    2929      <path>worlds/World2.oxw</path>
    30     </World>
     30    </SinglePlayerWorld>
    3131  </WorldList>
    3232</Campaign>

  • data/trunk/worlds/DefaultNetworkCampaign.oxc

    r3497 r3538  
    44  <description>The one and only default debug campaign</description>
    55  <WorldList>
    6     <NetworkWorld>
     6    <MultiPlayerWorld>
    77      <identifier>0</identifier>
    88      <nextid>1</nextid>
    99      <path>worlds/Straight.oxw</path>
    10     </NetworkWorld>
    11     <NetworkWorld>
     10    </MultiPlayerWorld>
     11    <MultiPlayerWorld>
    1212      <identifier>1</identifier>
    1313      <nextid>2</nextid>
    1414      <path>worlds/DefaultWorld.oxw</path>
    15     </NetworkWorld>
     15    </MultiPlayerWorld>
    1616  </WorldList>
    1717</Campaign>
Note: See TracChangeset for help on using the changeset viewer.