Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12180


Ignore:
Timestamp:
Dec 11, 2018, 2:52:30 PM (7 months ago)
Author:
merholzl
Message:

World Map merging

Location:
code/branches/Merge_HS18
Files:
12 edited
9 copied

Legend:

Unmodified
Added
Removed
  • code/branches/Merge_HS18

  • code/branches/Merge_HS18/data/gui/layouts/CampaignMenu.layout

    r11803 r12180  
    77        <Property name="Area" value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
    88        <Property name="BackgroundEnabled" value="False" />
     9             
     10
     11       
     12
    913        <Window name="Mission1Text" type="MenuWidgets/Button">
    1014            <Property name="Text" value="Mission One" />
     
    1317            <Event function="CampaignMenu.Mission1Button_clicked" name="Clicked" />
    1418        </Window>
     19
    1520        <Window name="Mission1Button" type="MenuWidgets/JuuButton">
    1621            <Property name="Visible" value="False" />
     
    1924            <Event function="CampaignMenu.Mission1Button_clicked" name="Clicked" />
    2025        </Window>
     26
    2127        <Window name="Mission2Text" type="MenuWidgets/Button">
    2228            <Property name="Text" value="Fight in our Back" />
    23             <Property name="Visible" value="False" />
     29            <Property name="Visible" value="True" />
    2430            <Property name="Area" value="{{0.35,0},{0.6,0},{0.55,0},{0.65,0}}" />
    2531            <Property name="Disabled" value="True" />
    2632            <Event function="CampaignMenu.Mission2Button_clicked" name="Clicked" />
    2733        </Window>
     34       
    2835        <Window name="Mission2Button" type="MenuWidgets/JuuButton">
    29             <Property name="Visible" value="False" />
     36            <Property name="Visible" value="True" />
    3037            <Property name="MaxSize" value="{{1,0},{1,0}}" />
    3138            <Property name="Area" value="{{0.4,0},{0.7,0},{0.5,0},{0.85,0}}" />
     
    3340            <Event function="CampaignMenu.Mission2Button_clicked" name="Clicked" />
    3441        </Window>
     42
    3543        <Window name="Mission3Text" type="MenuWidgets/Button">
    3644            <Property name="Text" value="Pirate Attack" />
     
    4755            <Event function="CampaignMenu.Mission3Button_clicked" name="Clicked" />
    4856        </Window>
     57
    4958        <Window name="Mission4Text" type="MenuWidgets/Button">
    5059            <Property name="Text" value="Trip to Area 51" />
     
    6170            <Event function="CampaignMenu.Mission4Button_clicked" name="Clicked" />
    6271        </Window>
     72
    6373        <Window name="Mission5Text" type="MenuWidgets/Button">
    6474            <Property name="Text" value="Area 51 under Fire" />
     
    7585            <Event function="CampaignMenu.Mission5Button_clicked" name="Clicked" />
    7686        </Window>
     87
    7788        <Window name="Mission6Text" type="MenuWidgets/Button">
    7889            <Property name="Text" value="Escape the Bastards" />
     
    8596            <Property name="Visible" value="False" />
    8697            <Property name="MaxSize" value="{{1,0},{1,0}}" />
     98           
    8799            <Property name="Area" value="{{0.6,0},{0.17,0},{0.65,0},{0.27,0}}" />
    88             <Property name="Disabled" value="True" />
     100           
     101            <Property name="Disabled" value="True" />
    89102            <Event function="CampaignMenu.Mission6Button_clicked" name="Clicked" />
    90103        </Window>
     
    96109            <Property name="Area" value="{{0.4,0},{0.025,0},{0.6,0},{0.075,0}}" />
    97110        </Window>
     111
    98112        <Window name="Mission7Button" type="MenuWidgets/JuuButton">
    99113            <Property name="Visible" value="False" />
     
    117131            <Event function="CampaignMenu.Mission8Button_clicked" name="Clicked" />
    118132        </Window>
     133
    119134        <Window name="Mission9Text" type="MenuWidgets/Button">
    120135            <Property name="Text" value="Retaliation" />
     
    131146            <Event function="CampaignMenu.Mission9Button_clicked" name="Clicked" />
    132147        </Window>
     148
    133149        <Window name="CampaignMenuBackButton" type="MenuWidgets/Button">
    134150            <Property name="Text" value="Back" />
     
    137153            <Event function="CampaignMenu.CampaignMenuBackButton_clicked" name="Clicked" />
    138154        </Window>
     155
     156
    139157        <Window name="CampaignMenuCongratulation" type="MenuWidgets/StaticText">
    140158            <Property name="Text" value="Campaign Completed!!!" />
     
    146164            <Property name="Area" value="{{0.4,0},{0.15,0},{0.6,0},{0.2,0}}" />
    147165        </Window>
     166       
    148167    </Window>
    149168</GUILayout>
  • code/branches/Merge_HS18/data/gui/scripts/CampaignMenu.lua

    r11805 r12180  
    22
    33local P = createMenuSheet("CampaignMenu")
     4
    45
    56function P:onShow()
     
    3334    end
    3435end
    35 
     36--Updated Buttons der levels
    3637function P.updateButton(index, button)
     38    --Wenn genuegend Levels vorhanden sind, wird der Butten angezeigt
    3739    if (P.shouldDisplayButton(index)) then
    3840        button:setProperty("Visible", "True")
    3941
     42        --wenn genuegend levels bestanden sind, wird er benutzbar
    4043        if (P.shouldEnableButton(index)) then
    4144            button:setProperty("Disabled", "False")
    4245        end
    4346    end
     47end
     48
     49function P.Test(e)
     50     orxonox.execute("startMainMenu")
    4451end
    4552
     
    6976end
    7077
     78
     79
     80
    7181function P.Mission1Button_clicked(e)
     82    P.loadLevel(P.FindLevel(0))
     83end
     84function P.KeyPressed(e)
    7285    P.loadLevel(P.FindLevel(0))
    7386end
     
    110123end
    111124
     125function P.loadMap()
     126    orxonox.execute("changeGame  dynamicMatch.oxw")
     127     hideAllMenuSheets()
     128end
     129
    112130function P.FindLevel(index)
    113131    local filename = orxonox.LevelManager:getInstance():getCampaignMission(index)
  • code/branches/Merge_HS18/data/levels/StoryModeMap.oxw

    r11783 r12180  
    1111  include("StoryModeHUD.oxo")
    1212  include("templates/lodInformation.oxt")
     13  include("templates/spaceshipAssff.oxt")
    1314  include("templates/StoryMode.oxt")
    1415?>
     
    2122    <Template link=lodtemplate_default />
    2223  </templates>
     24
     25   
     26
    2327  <?lua include("includes/notifications.oxi") ?>
    2428
     
    2731    skybox       = "Orxonox/Starbox"
    2832  >
     33   
     34   
     35   
     36   
    2937
    30 
    31     <StaticEntity position="0,0,0" direction="0,0,0" >
     38    <StaticEntity position="0,0,0" direction="0,0,-1" >
    3239      <attached>
    3340
    34         <Model position="600,370,0" mesh="planets/moon.mesh" scale=100 />
     41        <Model name="a" position="550,300,0" mesh="planets/moon.mesh" scale=100 visible="true" />
     42        <Billboard colour="1,0,0.05" position="550,300,-80"  material="Flares/lensflare" scale=4.5 />
     43
     44        <Model name="a" position="600,370,0" mesh="planets/moon.mesh" scale=100 visible="true" />
     45         
     46       
     47         <Model position="550,300,0" mesh="assff.mesh" scale=20  visible="false" orientation="-0.015,0.091,0.038,-0.995"/>
     48       
    3549        <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  />
     50       
     51
     52        <Model position="100,350,-250" mesh="planets/moon.mesh" scale=100  visible="true"/>
     53         
    3854        <Billboard colour="1,1,0.05" position="100,350,-330"  material="Flares/lensflare" scale=4.5 />
    3955
    40         <Model position="-600,250,-500" mesh="planets/moon.mesh" scale=100 />
     56        <Model position="-600,250,-500" mesh="planets/moon.mesh" scale=100 visible="true"/>
    4157        <Billboard colour="1,1,0.05" position="-600,250,-580"  material="Flares/lensflare" scale=5 />
    4258
     
    6278    </StaticEntity>
    6379
     80   
     81
    6482    <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"/>
    6583
    66     <SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, -1" pawndesign=StoryMode />
     84    <SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, -1" spawnclass=StoryMode pawndesign=StoryMode />
     85   
    6786   
    6887  </Scene>
  • code/branches/Merge_HS18/data/levels/templates/StoryMode.oxt

    r11783 r12180  
    11<Template name=StoryMode>
    2   <Pawn
     2  <StoryModeController
    33   hudtemplate            = StoryModeMap
    44  />
  • code/branches/Merge_HS18/data/levels/templates/StoryModeEscort.oxt

    r11783 r12180  
    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/Merge_HS18/data/overlays/StoryModeHUD.oxo

    r11783 r12180  
    1111  </OverlayGroup>
    1212</Template>
     13  <Template name="spectatorhud">
     14  <OverlayGroup name = "spectatorhud" scale = "1, 1">
     15  </OverlayGroup>
     16</Template>
  • code/branches/Merge_HS18/src/modules/flappyorx/FlappyOrxShip.cc

    r11781 r12180  
    3838#include "graphics/Camera.h"
    3939#include "graphics/ParticleSpawner.h"
     40#include "worldentities/pawns/SpaceShip.h"
    4041#include <math.h>
    4142#include <ctime>
  • code/branches/Merge_HS18/src/modules/towerdefense/TowerDefense.cc

    r11716 r12180  
    272272        if (hasStarted() == false || player_ == nullptr)
    273273        {
     274            orxout(internal_warning) << "Heere" << endl;
    274275            return;
    275276        }
     277
     278        orxout(internal_warning) << "2" << endl;
    276279        timeUntilNextWave_ -= dt;
    277280        timeSinceLastSpawn_ += dt;
     
    280283        if (selecter != nullptr && selecter->buildTower_ == true)
    281284        {
     285             orxout(internal_warning) << "3" << endl;
    282286            selecter->buildTower_ = false;
    283287
  • code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseSelecter.cc

    r11071 r12180  
    108108    void TowerDefenseSelecter::moveFrontBack(const Vector2& value)
    109109    {
     110       
    110111        if (value.x > 0)
    111112        {
  • code/branches/Merge_HS18/src/orxonox/controllers/CMakeLists.txt

    r12028 r12180  
    11ADD_SOURCE_FILES(ORXONOX_SRC_FILES
    22  Controller.cc
     3  StoryModeController.cc
     4  SMCoord.cc
    35  HumanController.cc
    46  NewHumanController.cc
     
    2022  MasterController.cc
    2123  ArrowController.cc;
    22   AutonomousDroneController.cc;
     24  AutonomousDroneController.cc;
     25  StoryModeController.cc;
    2326       
    2427)
  • code/branches/Merge_HS18/src/orxonox/gametypes/StoryMode.cc

    r11783 r12180  
    4747    StoryMode::StoryMode(Context* context) : Gametype(context)
    4848    {
     49       
    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.