Changeset 8679
- Timestamp:
- 2017-06-14 15:04:36 (6 years ago)
- Location:
- 2016/27/PaavoH
- Files:
-
- 193 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
2016/27/PaavoH/UltimateAdventure/UltimateAdventure/UltimateAdventure/DataSave.cs
r8434 r8679 12 12 [Save] 13 13 public double Volume; 14 } 14 [Save] 15 public bool FullScreen; 16 } -
2016/27/PaavoH/UltimateAdventure/UltimateAdventure/UltimateAdventure/UltimateAdventure.cs
r8609 r8679 19 19 bool saapommittaa = true; 20 20 PushButton TextureButton; 21 PushButton FullScreenButton; 21 22 DoubleMeter aani = new DoubleMeter(0, 0, 1); 22 23 private IntMeter OxygenMeter; … … 66 67 tulos = DataStorage.Load<DataSave>(tulos, "Options.xml"); 67 68 SmoothTextures = tulos.IsSmoothTex; 69 IsFullScreen = tulos.FullScreen; 68 70 aani.Value = tulos.Volume; 69 71 LuoAlkuValikko(); … … 157 159 Add(liukusaadin); 158 160 TeeTextureButton(); 161 TeeFullScreenButton(); 159 162 } 160 163 … … 212 215 TextureButton.Text = "" + SmoothTextures; 213 216 } 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 214 235 Slider LuoSlider() 215 236 { … … 329 350 ajastin.Timeout += delegate 330 351 { 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) 332 353 { 333 354 PhysicsObject nuoli = new PhysicsObject(30, 5); … … 614 635 AddCollisionHandler(temp, "snake", CollisionHandler.DestroyTarget); 615 636 616 Timer.SingleShot( 1, temp.Destroy);637 Timer.SingleShot(0.1, temp.Destroy); 617 638 618 639 Timer ajastin = new Timer(); … … 744 765 745 766 void ElamaLoppui() 746 { 767 { 747 768 pelaaja1.Destroy(); 769 ControllerOne.Vibrate(0.7, 0.7, 0.0, 0.0, 0.3); 748 770 ExplosionSystem rajahdys = new ExplosionSystem(veripartikkeli, 100); 749 771 Add(rajahdys); -
2016/27/PaavoH/UltimateAdventure/UltimateAdventure/UltimateAdventure/bin/x86/Debug/Data/Options.xml
r8511 r8679 8 8 <Value>0.305</Value> 9 9 </Field> 10 <Field Name="FullScreen" Type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 11 <Value>False</Value> 12 </Field> 10 13 </Object> 11 14 </State> -
2016/27/PaavoH/UltimateAdventure/UltimateAdventure/UltimateAdventure/obj/x86/Debug/ContentPipeline-{FB1067CC-FEED-45F1-8CB8-8F3DD59AB260}.xml
r8609 r8679 522 522 <Options>None</Options> 523 523 <Output>C:\MyTemp\PaavoH\UltimateAdventure\UltimateAdventure\UltimateAdventure\bin\x86\Debug\Content\ruoska.xnb</Output> 524 <Time>2017-06-1 3T11:33:05.4668271+03:00</Time>524 <Time>2017-06-14T11:52:22.3630851+03:00</Time> 525 525 <Request>C:\MyTemp\PaavoH\UltimateAdventure\UltimateAdventure\UltimateAdventure\bin\x86\Debug\Content\ruoska\ruoska01.xnb</Request> 526 526 <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.