Changeset 8679


Ignore:
Timestamp:
2017-06-14 15:04:36 (2 years ago)
Author:
npo17_0
Message:
 
Location:
2016/27/PaavoH
Files:
193 added
9 edited

Legend:

Unmodified
Added
Removed

  • 2016/27/PaavoH/UltimateAdventure/UltimateAdventure/UltimateAdventure/DataSave.cs

    r8434 r8679  
    1212    [Save] 
    1313    public double Volume; 
    14     } 
     14    [Save] 
     15    public bool FullScreen; 
     16} 

  • 2016/27/PaavoH/UltimateAdventure/UltimateAdventure/UltimateAdventure/UltimateAdventure.cs

    r8609 r8679  
    1919    bool saapommittaa = true; 
    2020    PushButton TextureButton; 
     21    PushButton FullScreenButton; 
    2122    DoubleMeter aani = new DoubleMeter(0, 0, 1); 
    2223    private IntMeter OxygenMeter; 
    … …  
    6667        tulos = DataStorage.Load<DataSave>(tulos, "Options.xml"); 
    6768        SmoothTextures = tulos.IsSmoothTex; 
     69        IsFullScreen = tulos.FullScreen; 
    6870        aani.Value = tulos.Volume; 
    6971        LuoAlkuValikko(); 
    … …  
    157159        Add(liukusaadin); 
    158160        TeeTextureButton(); 
     161        TeeFullScreenButton(); 
    159162    } 
    160163 
    … …  
    212215        TextureButton.Text = "" + SmoothTextures; 
    213216    } 
     217 
     218  void TeeFullScreenButton() 
     219  { 
     220      FullScreenButton = new PushButton("" + IsFullScreen); 
     221      FullScreenButton.Y = -150; 
     222      FullScreenButton.Clicked += PaivitaFullScreen; 
     223      FullScreenButton.Tag = "Options"; 
     224 
     225      Add(FullScreenButton); 
     226  } 
     227 
     228  void PaivitaFullScreen() 
     229  { 
     230      if (IsFullScreen = false); 
     231      IsFullScreen = !IsFullScreen; 
     232      FullScreenButton.Text = "" + IsFullScreen; 
     233  } 
     234 
    214235    Slider LuoSlider() 
    215236    { 
    … …  
    329350        ajastin.Timeout += delegate 
    330351        { 
    331             if (pelaaja1.X > Turret.X && Math.Abs(pelaaja1.Y - Turret.Y) < 20) 
     352            if (pelaaja1.X > Turret.X && Math.Abs(pelaaja1.Y - Turret.Y) < 20 && Turret.IsDestroyed == false) 
    332353            { 
    333354                PhysicsObject nuoli = new PhysicsObject(30, 5); 
    … …  
    614635        AddCollisionHandler(temp, "snake", CollisionHandler.DestroyTarget); 
    615636 
    616         Timer.SingleShot(1, temp.Destroy); 
     637        Timer.SingleShot(0.1, temp.Destroy); 
    617638 
    618639        Timer ajastin = new Timer(); 
    … …  
    744765 
    745766    void ElamaLoppui() 
    746     { 
     767    {  
    747768        pelaaja1.Destroy(); 
     769        ControllerOne.Vibrate(0.7, 0.7, 0.0, 0.0, 0.3); 
    748770        ExplosionSystem rajahdys = new ExplosionSystem(veripartikkeli, 100); 
    749771        Add(rajahdys); 

  • 2016/27/PaavoH/UltimateAdventure/UltimateAdventure/UltimateAdventure/bin/x86/Debug/Data/Options.xml

    r8511 r8679  
    88      <Value>0.305</Value> 
    99    </Field> 
     10    <Field Name="FullScreen" Type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 
     11      <Value>False</Value> 
     12    </Field> 
    1013  </Object> 
    1114</State> 

  • 2016/27/PaavoH/UltimateAdventure/UltimateAdventure/UltimateAdventure/obj/x86/Debug/ContentPipeline-{FB1067CC-FEED-45F1-8CB8-8F3DD59AB260}.xml

    r8609 r8679  
    522522      <Options>None</Options> 
    523523      <Output>C:\MyTemp\PaavoH\UltimateAdventure\UltimateAdventure\UltimateAdventure\bin\x86\Debug\Content\ruoska.xnb</Output> 
    524       <Time>2017-06-13T11:33:05.4668271+03:00</Time> 
     524      <Time>2017-06-14T11:52:22.3630851+03:00</Time> 
    525525      <Request>C:\MyTemp\PaavoH\UltimateAdventure\UltimateAdventure\UltimateAdventure\bin\x86\Debug\Content\ruoska\ruoska01.xnb</Request> 
    526526      <Request>C:\MyTemp\PaavoH\UltimateAdventure\UltimateAdventure\UltimateAdventure\bin\x86\Debug\Content\ruoska\ruoska02.xnb</Request> 
Note: See TracChangeset for help on using the changeset viewer.