Skip to content

Commit

Permalink
Final commit before 002a release
Browse files Browse the repository at this point in the history
  • Loading branch information
Athanatos committed Apr 5, 2020
1 parent 705a98f commit 7f12309
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 8 deletions.
Binary file modified 3DRadSpace/.vs/3DRadSpace/v16/.suo
Binary file not shown.
Binary file modified 3DRadSpace/.vs/3DRadSpace/v16/Server/sqlite3/storage.ide
Binary file not shown.
4 changes: 2 additions & 2 deletions 3DRadSpace/3DRadSpace/Content/obj/Windows/Content/.mgstats
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ Source File,Dest File,Processor Type,Content Type,Source File Size,Dest File Siz
"C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/Camera.x","C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/bin/Windows/Content/Camera.xnb","ModelProcessor","ModelContent",23919,7328,0.1406486
"C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/EOL_Cube.x","C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/bin/Windows/Content/EOL_Cube.xnb","ModelProcessor","ModelContent",6363,1583,5.612702
"C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/EOL_Sphere.x","C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/bin/Windows/Content/EOL_Sphere.xnb","ModelProcessor","ModelContent",95457,25211,2.846426
"C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/Skinmeshes/terrain0100.dds","C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/bin/Windows/Content/Skinmeshes/terrain0100.xnb","TextureProcessor","Texture2DContent",2796344,2796345,3.405574
"C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/Skinmeshes/terrain0100.x","C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/bin/Windows/Content/Skinmeshes/terrain0100.xnb","ModelProcessor","ModelContent",594945,439264,3.608613
"C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/Skinmeshes/terrain0100.dds","C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/bin/Windows/Content/Skinmeshes/terrain0100.xnb","TextureProcessor","Texture2DContent",2796344,2796345,0.377001
"C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/Skinmeshes/terrain0100.x","C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/bin/Windows/Content/Skinmeshes/terrain0100.xnb","ModelProcessor","ModelContent",594945,439264,0.9130006
"C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/Sounds/sound.ogg","C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/bin/Windows/Content/Sounds/sound.xnb","SoundEffectProcessor","SoundEffectContent",6625,36201,1.273545
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<SourceFile>C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/Skinmeshes/terrain0100.x</SourceFile>
<SourceTime>2011-09-09T11:04:28+03:00</SourceTime>
<DestFile>C:/Users/Athanatos/Documents/GitHub/3D_Rad_Space/3DRadSpace/3DRadSpace/Content/bin/Windows/Content/Skinmeshes/terrain0100.xnb</DestFile>
<DestTime>2020-04-05T18:10:44.8345728+03:00</DestTime>
<DestTime>2020-04-05T20:13:56.7191821+03:00</DestTime>
<Importer>XImporter</Importer>
<ImporterTime>2018-12-08T18:35:54+02:00</ImporterTime>
<Processor>ModelProcessor</Processor>
Expand Down
26 changes: 21 additions & 5 deletions 3DRadSpace/3DRadSpace/EditorEvents.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Net;
using Microsoft.Xna.Framework;
using System.Windows.Forms;
using System.Threading;


namespace _3DRadSpace
Expand Down Expand Up @@ -140,11 +141,13 @@ void checkforUpdatesEvent(object s,EventArgs a)
DialogResult dialog = MessageBox.Show("New update found! Do you want it installed?", "Update", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (dialog == DialogResult.Yes)
{
client.DownloadFile("https://drive.google.com/uc?export=download&id=0B9yRO5eZEvTjSVhCZndjSGRUcVE", @"Setup.exe");
toolStripStatusLabel1.Text = "Status: Installing new update...";
_updating = true;
toolStripStatusLabel1.Text = "Status: Downloading new update...";
client.DownloadProgressChanged += Client_DownloadProgressChanged;
client.DownloadFileCompleted += Client_DownloadFileCompleted;
client.DownloadFileAsync(new Uri("https://drive.google.com/uc?export=download&id=0B9yRO5eZEvTjSVhCZndjSGRUcVE"), @"Setup.exe");
saveProject(null, null);
Process.Start(@"Setup.exe");
Exit();
client.Dispose();
}
else toolStripStatusLabel1.Text = "Status: Ready";
}
Expand All @@ -155,6 +158,18 @@ void checkforUpdatesEvent(object s,EventArgs a)
}
client.Dispose();
}

private void Client_DownloadFileCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e)
{
Process.Start(@"Setup.exe");
Exit();
}

private void Client_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
{
toolStripStatusLabel1.Text = "Status: Downloading new update "+e.ProgressPercentage+" % ("+(e.BytesReceived / 1024)+" KB recieved / "+(e.TotalBytesToReceive/1024)+" KB total)";
}

void aboutBoxOpen(object a, EventArgs e)
{
AboutBox aboutBox = new AboutBox();
Expand Down Expand Up @@ -339,9 +354,10 @@ void listBox1_MouseDown(object sender,MouseEventArgs mouse)
contextMenuStrip1.Show(GameWindow.Location.X+listBox1.Location.X, Cursor.Position.Y);
}
}
bool _updating = false;
void Editor_Exiting(object sender, FormClosingEventArgs e)
{
if(Settings[1] == true && ProjectSaved == false)
if(Settings[1] == true && ProjectSaved == false && !_updating)
{
DialogResult result = MessageBox.Show("Your project is not saved. Unsaved changes can be lost.", "Warning", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Warning);
if(result == DialogResult.Yes)
Expand Down
Binary file modified 3DRadSpace/3DRadSpace/bin/Windows/x86/Debug/3DRadSpace.exe
Binary file not shown.
Binary file modified 3DRadSpace/3DRadSpace/bin/Windows/x86/Debug/3DRadSpace.pdb
Binary file not shown.
Binary file not shown.
Binary file modified 3DRadSpace/3DRadSpace/obj/x86/Debug/3DRadSpace.exe
Binary file not shown.
Binary file modified 3DRadSpace/3DRadSpace/obj/x86/Debug/3DRadSpace.pdb
Binary file not shown.

0 comments on commit 7f12309

Please sign in to comment.