Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11525


Ignore:
Timestamp:
Oct 30, 2017, 4:30:58 PM (6 years ago)
Author:
fanconic
Message:

verschiedene kleine Aenderungen

Location:
code/branches/CampaignMap_HS17
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw

    r11513 r11525  
    6161</StaticEntity>
    6262
     63<MovableEntity>
     64   
     65
    6366    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
    6467    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />

  • code/branches/CampaignMap_HS17/src/modules/objects/StoryModePlanet.cc

    r11512 r11525  
    6868    void StoryModePlanet::setConfigValues()
    6969    {
     70         static const std::string names[] =
     71        {
     72            "Berkay Berabi",
     73            "Louis  Meile"
     74            "Muten Roshi",
     75            "Abradolf Lincler",
     76            "Lionel Messi",
     77            "Kamal Khan",
     78            "Karl the Llama",
     79            "Thomas the Tankengine",
     80            "Rick",
     81            "send nudes",
     82            "Morty",
     83            "Charlie the Unicorn",
     84            "Kung Fury",
     85            "Postman Pat"
     86        };
     87        static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string));
    7088
     89        SetConfigValue(names_, defaultnames);
    7190    }
    7291}

  • code/branches/CampaignMap_HS17/src/orxonox/infos/Bot.cc

    r11358 r11525  
    7777            "Thomas the Tankengine",
    7878            "Rick",
     79            "send nudes",
    7980            "Morty",
    8081            "Charlie the Unicorn",
Note: See TracChangeset for help on using the changeset viewer.