Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12053


Ignore:
Timestamp:
Oct 24, 2018, 11:32:57 AM (5 years ago)
Author:
linggj
Message:

Ship added

Location:
code/branches/WorldMap_HS18
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • code/branches/WorldMap_HS18/data/gui/layouts/CampaignMenu.layout

    r11803 r12053  
    77        <Property name="Area" value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
    88        <Property name="BackgroundEnabled" value="False" />
     9       
     10
    911        <Window name="Mission1Text" type="MenuWidgets/Button">
    1012            <Property name="Text" value="Mission One" />
     
    1921            <Event function="CampaignMenu.Mission1Button_clicked" name="Clicked" />
    2022        </Window>
     23
    2124        <Window name="Mission2Text" type="MenuWidgets/Button">
    2225            <Property name="Text" value="Fight in our Back" />
    23             <Property name="Visible" value="False" />
     26            <Property name="Visible" value="True" />
    2427            <Property name="Area" value="{{0.35,0},{0.6,0},{0.55,0},{0.65,0}}" />
    2528            <Property name="Disabled" value="True" />
     
    2730        </Window>
    2831        <Window name="Mission2Button" type="MenuWidgets/JuuButton">
    29             <Property name="Visible" value="False" />
     32            <Property name="Visible" value="True" />
    3033            <Property name="MaxSize" value="{{1,0},{1,0}}" />
    3134            <Property name="Area" value="{{0.4,0},{0.7,0},{0.5,0},{0.85,0}}" />
     
    3336            <Event function="CampaignMenu.Mission2Button_clicked" name="Clicked" />
    3437        </Window>
     38
    3539        <Window name="Mission3Text" type="MenuWidgets/Button">
    3640            <Property name="Text" value="Pirate Attack" />
     
    4751            <Event function="CampaignMenu.Mission3Button_clicked" name="Clicked" />
    4852        </Window>
     53
    4954        <Window name="Mission4Text" type="MenuWidgets/Button">
    5055            <Property name="Text" value="Trip to Area 51" />
     
    6166            <Event function="CampaignMenu.Mission4Button_clicked" name="Clicked" />
    6267        </Window>
     68
    6369        <Window name="Mission5Text" type="MenuWidgets/Button">
    6470            <Property name="Text" value="Area 51 under Fire" />
     
    7581            <Event function="CampaignMenu.Mission5Button_clicked" name="Clicked" />
    7682        </Window>
     83
    7784        <Window name="Mission6Text" type="MenuWidgets/Button">
    7885            <Property name="Text" value="Escape the Bastards" />
     
    8592            <Property name="Visible" value="False" />
    8693            <Property name="MaxSize" value="{{1,0},{1,0}}" />
     94           
    8795            <Property name="Area" value="{{0.6,0},{0.17,0},{0.65,0},{0.27,0}}" />
    88             <Property name="Disabled" value="True" />
     96           
     97            <Property name="Disabled" value="True" />
    8998            <Event function="CampaignMenu.Mission6Button_clicked" name="Clicked" />
    9099        </Window>
     
    96105            <Property name="Area" value="{{0.4,0},{0.025,0},{0.6,0},{0.075,0}}" />
    97106        </Window>
     107
    98108        <Window name="Mission7Button" type="MenuWidgets/JuuButton">
    99109            <Property name="Visible" value="False" />
     
    117127            <Event function="CampaignMenu.Mission8Button_clicked" name="Clicked" />
    118128        </Window>
     129
    119130        <Window name="Mission9Text" type="MenuWidgets/Button">
    120131            <Property name="Text" value="Retaliation" />
     
    131142            <Event function="CampaignMenu.Mission9Button_clicked" name="Clicked" />
    132143        </Window>
     144
    133145        <Window name="CampaignMenuBackButton" type="MenuWidgets/Button">
    134146            <Property name="Text" value="Back" />
     
    146158            <Property name="Area" value="{{0.4,0},{0.15,0},{0.6,0},{0.2,0}}" />
    147159        </Window>
     160       
    148161    </Window>
    149162</GUILayout>
  • code/branches/WorldMap_HS18/data/gui/scripts/CampaignMenu.lua

    r11805 r12053  
    3333    end
    3434end
    35 
     35--Updated Buttons der levels
    3636function P.updateButton(index, button)
     37    --Wenn genuegend Levels vorhanden sind, wird der Butten angezeigt
    3738    if (P.shouldDisplayButton(index)) then
    3839        button:setProperty("Visible", "True")
    3940
     41        --wenn genuegend levels bestanden sind, wird er benutzbar
    4042        if (P.shouldEnableButton(index)) then
    4143            button:setProperty("Disabled", "False")
    4244        end
    4345    end
     46end
     47
     48function P.Test(e)
     49     orxonox.execute("startMainMenu")
    4450end
    4551
  • code/branches/WorldMap_HS18/data/levels/StoryModeMap.oxw

    r11783 r12053  
    2929
    3030
    31     <StaticEntity position="0,0,0" direction="0,0,0" >
     31    <StaticEntity position="0,0,0" direction="0,0,-1" >
    3232      <attached>
    3333
    34         <Model position="600,370,0" mesh="planets/moon.mesh" scale=100 />
     34        <Model position="600,370,0" mesh="planets/moon.mesh" scale=100 visible="false" />
     35         <Model position="550,300,0" mesh="assff.mesh" scale=20  visible="true" orientation="-0.015,0.091,0.038,-0.995"/>
     36        <Model position="600,370,0" mesh="Coordinates.mesh" scale=10 />
    3537        <Billboard colour="1,1,0.05" position="600,370,-80"  material="Flares/lensflare" scale=4.5 />
    36  
    37         <Model position="100,350,-250" mesh="planets/moon.mesh" scale=100  />
     38       
     39
     40        <Model position="100,350,-250" mesh="planets/moon.mesh" scale=100  visible="false"/>
     41         <Model position="50,300,-250" mesh="assff.mesh" scale=20  visible="true" orientation="-0.015,0.091,0.038,-0.995"/>
    3842        <Billboard colour="1,1,0.05" position="100,350,-330"  material="Flares/lensflare" scale=4.5 />
    3943
     
    6670    <SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, -1" pawndesign=StoryMode />
    6771   
     72   
    6873  </Scene>
    6974</Level>
  • code/branches/WorldMap_HS18/data/levels/templates/StoryModeEscort.oxt

    r11783 r12053  
    4343    </engines>
    4444    <attached>
    45       <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=4 mesh="escortShip.mesh" />
     45      <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=20 mesh="escortShip.mesh" />
    4646      <Model position="0,0,0" yaw=180 pitch=90 roll=0 scale=4 mesh="escortWeapon.mesh" />
    4747<!--Model mesh="cube.mesh" mass=10 position="0,0,3" scale3D="10,4,8" />
  • code/branches/WorldMap_HS18/src/orxonox/LevelManager.cc

    r11071 r12053  
    6363        RegisterObject(LevelManager);
    6464        this->setConfigValues();
    65 
     65        orxout(status)<<" a ";
    6666        // check override
    6767        if (!CommandLineParser::getArgument("level")->hasDefaultValue())
     
    257257        // Get all files matching the level criteria
    258258        Ogre::StringVectorPtr levels = Resource::findResourceNames("*.oxw");
    259 
     259        orxout(internal_info) << levels << "itse me";
    260260        // We only want to load as little as possible
    261261        ClassTreeMask mask;
  • code/branches/WorldMap_HS18/src/orxonox/gametypes/StoryMode.cc

    r11783 r12053  
    4747    StoryMode::StoryMode(Context* context) : Gametype(context)
    4848    {
     49        orxout(internal_info) << levels << "itse me";
    4950        RegisterObject(StoryMode);
    5051
     
    6566    void StoryMode::exit()
    6667    {
    67         orxout() << "s funktioniert"<< endl;
     68     
    6869        for (StoryMode* mission : ObjectList<StoryMode>())
    6970        { //TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions!
Note: See TracChangeset for help on using the changeset viewer.