From 29d2b28cffd5d0f59632a761c2221ece7f257304 Mon Sep 17 00:00:00 2001 From: AShifter Date: Sun, 7 May 2017 15:58:48 -0600 Subject: start Win98 because --- .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 14191 -> 12956 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache') diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 9d8e4f0..3b67ff3 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ -- cgit v1.2.3 From 97cd97b92e3147d2eaa46df8d210a5d25fee5328 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 7 May 2017 19:03:07 -0400 Subject: Custom progress bar rendering. --- TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 185344 -> 185344 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 46592 -> 48640 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 9120 -> 9302 bytes .../TimeHACK.Engine.csproj.FileListAbsolute.txt | 12 ++ .../TimeHACK.Engine.csproj.GenerateResource.Cache | Bin 2531 -> 2531 bytes ...ACK.Engine.csprojResolveAssemblyReference.cache | Bin 23523 -> 29943 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 185344 -> 185344 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 46592 -> 48640 bytes TimeHACK.Main/OS/Win95/Win95.resx | 16 +- .../Win95Apps/WinClassicDownloader.Designer.cs | 8 +- TimeHACK.Main/TimeHACK.Main.csproj | 3 + TimeHACK.Main/UI/IProgressBar.cs | 234 +++++++++++++++++++++ TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 185344 -> 185344 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 46592 -> 48640 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 4766208 -> 4796416 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 6 +- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 181760 -> 204288 bytes .../bin/Release/TimeHACK.vshost.application | 4 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 19 +- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 4766208 -> 4796416 bytes .../DesignTimeResolveAssemblyReferences.cache | Bin 90841 -> 90811 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 12956 -> 13453 bytes .../TimeHACK.Main.csproj.FileListAbsolute.txt | 26 +++ .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 5699 -> 5766 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 36775 -> 46853 bytes ...HACK.OS.Win95.Win95Apps.WinClassicIE4.resources | Bin 15244 -> 15240 bytes .../Release/TimeHACK.OS.Win95.Windows95.resources | Bin 149816 -> 149816 bytes .../obj/Release/TimeHACK.OS.Win98.Win98.resources | Bin 0 -> 15851 bytes .../TimeHACK.Properties.Resources.resources | Bin 3337694 -> 3337688 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 4766208 -> 4796416 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 6 +- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 181760 -> 204288 bytes 34 files changed, 313 insertions(+), 25 deletions(-) create mode 100644 TimeHACK.Main/UI/IProgressBar.cs create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Win98.resources (limited to 'TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache') diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 517d0e2..4f815b0 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb index e7139da..8f7944b 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index e5ce53c..6fcaded 100644 Binary files a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt index 9d1edf6..574662a 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt @@ -46,3 +46,15 @@ D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Templat D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Win9XBSOD.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache index a3758a9..06332ab 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache index 20e3bfa..3324c48 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index 517d0e2..4f815b0 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb index e7139da..8f7944b 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx index 217c713..f02514a 100644 --- a/TimeHACK.Main/OS/Win95/Win95.resx +++ b/TimeHACK.Main/OS/Win95/Win95.resx @@ -138,13 +138,6 @@ 17, 17 - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N @@ -366,6 +359,13 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= @@ -407,7 +407,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAAVABAQFQAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAAVgBAQFYAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA AwABgAMAAQEBAAEgBwABAf8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AXAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/ diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs index fd182fa..b0822c9 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.progBar = new System.Windows.Forms.ProgressBar(); + this.progBar = new TimeHACK.UI.ProgressBar(); this.amountLbl = new System.Windows.Forms.Label(); this.appName = new System.Windows.Forms.Label(); this.locationLbl = new System.Windows.Forms.Label(); @@ -45,6 +45,10 @@ this.progBar.Location = new System.Drawing.Point(5, 29); this.progBar.Name = "progBar"; this.progBar.Size = new System.Drawing.Size(290, 23); + this.progBar.ProgressColor = System.Drawing.Color.FromArgb(19, 36, 105); + this.progBar.Style = System.Windows.Forms.ProgressBarStyle.Blocks; + this.progBar.BlockWidth = 14; + this.progBar.BlockSpacing = 2; this.progBar.TabIndex = 15; // // amountLbl @@ -113,7 +117,7 @@ #endregion - internal System.Windows.Forms.ProgressBar progBar; + internal TimeHACK.UI.ProgressBar progBar; internal System.Windows.Forms.Label amountLbl; internal System.Windows.Forms.Label appName; internal System.Windows.Forms.Label locationLbl; diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 8153432..4b10a84 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -210,6 +210,9 @@ TitleScreen.cs + + Component + Win95.cs diff --git a/TimeHACK.Main/UI/IProgressBar.cs b/TimeHACK.Main/UI/IProgressBar.cs new file mode 100644 index 0000000..d16debf --- /dev/null +++ b/TimeHACK.Main/UI/IProgressBar.cs @@ -0,0 +1,234 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace TimeHACK.UI +{ + public class ProgressBar : Control + { + private Color _pColor = Color.DarkBlue; + private ProgressBarStyle _style = ProgressBarStyle.Continuous; + + private Timer RedrawTimer = null; + + public Color ProgressColor + { + get + { + return _pColor; + } + set + { + _pColor = value; Refresh(); + } + } + + + public ProgressBarStyle Style + { + get + { + return _style; + } + set + { + _style = value; Refresh(); + } + } + + + private double _max = 100.0; + private double _min = 0.0; + + public double Maximum + { + get + { + return _max; + } + set + { + _max = value; Refresh(); + } + } + public double Minimum + { + get + { + return _min; + } + set + { + _min = value; Refresh(); + } + } + + + private int _blockWidth = 14; + + public int BlockWidth + { + get + { + return _blockWidth; + } + set + { + _blockWidth = value; + Refresh(); + } + } + + private int _blockSpacing = 2; + + public int BlockSpacing + { + get + { + return _blockSpacing; + } + set + { + _blockSpacing = value; + Refresh(); + } + } + + public ProgressBar() : base() + { + MarqueeWidth = 125; + BlockWidth = 20; + BlockSpacing = 5; + Minimum = 0.00; + Maximum = 100.0; + Style = ProgressBarStyle.Continuous; + ProgressColor = Color.DarkBlue; + RedrawTimer = new Timer(); + RedrawTimer.Tick += (o, a) => + { + if (this.Style == ProgressBarStyle.Marquee) + { + if (_marqueePos >= this.Width) + _marqueePos = 0; + else + _marqueePos++; + this.Refresh(); + } + }; + RedrawTimer.Interval = 50; + } + + private double _value = 0.00; + + public double Value + { + get + { + return _value; + } + set + { + if (value < Minimum || value > Maximum) + throw new ArgumentOutOfRangeException("The value is outside the minimum and maximum range."); + this.Refresh(); + _value = value; + } + } + + private int _marqueeWidth = 14; + + public int MarqueeWidth + { + get + { + return _marqueeWidth; + } + set + { + _marqueeWidth = value; + Refresh(); + } + } + + private bool _showText = false; + + public bool ShowText + { + get + { + return _showText; + } + set + { + _showText = value; + Refresh(); + } + } + + protected override void OnVisibleChanged(EventArgs e) + { + if (Visible) + RedrawTimer.Start(); + else + RedrawTimer.Stop(); + } + + private int _marqueePos = 0; + + protected override void OnPaint(PaintEventArgs e) + { + base.OnPaint(e); + var g = e.Graphics; + g.Clear(BackColor); + //Stolen from the ShiftOS code :3 + switch (Style) + { + case ProgressBarStyle.Continuous: + double width = linear(this.Value, this.Minimum, this.Maximum, 0, this.Width); + g.FillRectangle(new SolidBrush(ProgressColor), new RectangleF(0, 0, (float)width, this.Height)); + break; + case ProgressBarStyle.Blocks: + int block_count = this.Width / (this.BlockWidth + this.BlockSpacing); + int blocks = (int)linear(this.Value, this.Minimum, this.Maximum, 0, block_count); + for (int i = 0; i < blocks - 1; i++) + { + int position = i * (BlockWidth + BlockSpacing); + g.FillRectangle(new SolidBrush(ProgressColor), new Rectangle(position, 0, BlockWidth, this.Height)); + } + break; + case ProgressBarStyle.Marquee: + g.FillRectangle(new SolidBrush(ProgressColor), new Rectangle(_marqueePos, 0, MarqueeWidth, this.Height)); + break; + } + if (ShowText) + { + var f = this.Font; + var t = this.Text; + var size = g.MeasureString(t, f); + var loc = new PointF( + (this.Width - size.Width) / 2, + (this.Height - size.Height) / 2 + ); + var color = this.ForeColor; + g.DrawString(t, f, new SolidBrush(color), loc); + } + + } + + /// + /// Simple linear interpolation algorithm. (http://stackoverflow.com/questions/12838007/c-sharp-linear-interpolation) + /// + private double linear(double x, double x0, double x1, double y0, double y1) + { + if ((x1 - x0) == 0) + { + return (y0 + y1) / 2; + } + return y0 + (x - x0) * (y1 - y0) / (x1 - x0); + } + } +} diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 517d0e2..4f815b0 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb index e7139da..8f7944b 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index be29d92..269e050 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - ef+R3kMt5jCQpgLv/d6vcMFDmOi9wRZrQNmjTg6TKXY= + enHK1jtqVuqBzs5WjolvCxHtcQ4/IH2qRAoDLD4Vl1g= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 604930a..0512159 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.exe and b/TimeHACK.Main/bin/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest index 172faa4..c2dfd19 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - aRqzP/rD35y3yU8+o3+xULnrrst0dqO6CkFtqv8Djf4= + Td2TYOaDP/QyjPIAStenJiwmqqmIdwTWbqIXB1t1U7Q= @@ -75,7 +75,7 @@ - kA4p/X7N+8KBmybYSG+jtZ4BgT3YvokJ8MxyIsxYSPM= + SIXbCIc3wbx0rQbc1SZnPbW3ytPXP4QDiBiWIwFS8WY= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 234639c..af6c7ae 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application index 869f3dc..269e050 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -7,14 +7,14 @@ - + - 2HPIdiZqquZgs5r33pAG5zPGGOSw61XmsnFKC99cVUA= + enHK1jtqVuqBzs5WjolvCxHtcQ4/IH2qRAoDLD4Vl1g= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 6b033b1..c2dfd19 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ - + - 7LWP70+epu/ZatYgTAt1zLj3tUDScjNPBFhFDYlM4NU= + Td2TYOaDP/QyjPIAStenJiwmqqmIdwTWbqIXB1t1U7Q= @@ -75,7 +75,7 @@ - m6y3wcwMukQ5TrLCcX8fgYK8EJp+K9PMtNF0cSKByXA= + SIXbCIc3wbx0rQbc1SZnPbW3ytPXP4QDiBiWIwFS8WY= @@ -115,13 +115,13 @@ M69a0Q8VAYpaeWem7o8i+9iv5cJdzgRLyWD48mOZQiM= - + - EkfQ8aLPyyAH5829pfeLE7IKs7tDqPXZl2I+MzNMjZo= + 5dxj6DQUI8H4fwy1EkXVnQnRwj/wJVEVSlzyjSYfUgI= @@ -457,6 +457,15 @@ +fshereDl8F60Ef1K3Q1uudUcIBJeWlPAmosAdKe/eY= + + + + + + + W0yCwc3lJJFqQfgeTtazQbdAjUboLWojci1PiqJjIBM= + + diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 604930a..0512159 100644 Binary files a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe and b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache index ed3800c..8f72a7c 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 3b67ff3..fe04b4b 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt index 6f442f9..5e98586 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -96,3 +96,29 @@ D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Ap D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicNotepad.resources D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicWordPad.resources D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.pdb +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.exe.manifest +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.application +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.exe +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.pdb +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.Engine.dll +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.Engine.pdb +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Main.csprojResolveAssemblyReference.cache +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Windows95.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.TestApp.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicAddressBook.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicHWCV.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicInstaller.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicNotepad.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicWordPad.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win98.Win98.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Properties.Resources.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.TitleScreen.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Main.csproj.GenerateResource.Cache +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe.manifest +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.application diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index c583c90..b4de6ec 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index 29029b5..7d44865 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources index 8750ba3..34453e4 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources index 2be211f..47482ec 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Win98.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Win98.resources new file mode 100644 index 0000000..9944ba5 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Win98.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources index b157a00..abce7ec 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources and b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index be29d92..269e050 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - ef+R3kMt5jCQpgLv/d6vcMFDmOi9wRZrQNmjTg6TKXY= + enHK1jtqVuqBzs5WjolvCxHtcQ4/IH2qRAoDLD4Vl1g= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 604930a..0512159 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.exe and b/TimeHACK.Main/obj/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest index 172faa4..c2dfd19 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - aRqzP/rD35y3yU8+o3+xULnrrst0dqO6CkFtqv8Djf4= + Td2TYOaDP/QyjPIAStenJiwmqqmIdwTWbqIXB1t1U7Q= @@ -75,7 +75,7 @@ - kA4p/X7N+8KBmybYSG+jtZ4BgT3YvokJ8MxyIsxYSPM= + SIXbCIc3wbx0rQbc1SZnPbW3ytPXP4QDiBiWIwFS8WY= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 234639c..af6c7ae 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From 9e2582cd3f5b2bf6f3e8c2d6434ab06ea97832a7 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 7 May 2017 20:04:31 -0400 Subject: Implement a proper save system --- Data/google.jpg | Bin 0 -> 6218 bytes Profiles/user.save | 1 + TimeHACK.Engine/SaveSystem.cs | 87 +++++++++++++++++++++ TimeHACK.Engine/TimeHACK.Engine.csproj | 1 + TimeHACK.Engine/bin/Debug/TimeHACK.Engine.dll | Bin 21504 -> 188928 bytes TimeHACK.Engine/bin/Debug/TimeHACK.Engine.pdb | Bin 26112 -> 58880 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 185344 -> 187392 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 48640 -> 54784 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 9073 -> 9298 bytes .../TempPE/Properties.Resources.Designer.cs.dll | Bin 0 -> 5632 bytes .../TimeHACK.Engine.Properties.Resources.resources | Bin 0 -> 155443 bytes .../TimeHACK.Engine.Template.AboutBox95.resources | Bin 0 -> 180 bytes .../TimeHACK.Engine.Template.Infobox95.resources | Bin 0 -> 180 bytes .../TimeHACK.Engine.Template.Win9XBSOD.resources | Bin 0 -> 180 bytes .../TimeHACK.Engine.Template.WinClassic.resources | Bin 0 -> 4593 bytes .../TimeHACK.Engine.csproj.FileListAbsolute.txt | 11 +++ .../TimeHACK.Engine.csproj.GenerateResource.Cache | Bin 0 -> 2531 bytes TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll | Bin 0 -> 188928 bytes TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb | Bin 0 -> 58880 bytes .../TimeHACK.Engine.csproj.GenerateResource.Cache | Bin 2531 -> 2531 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 185344 -> 187392 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 48640 -> 54784 bytes TimeHACK.Main/TitleScreen.cs | 87 ++++++++++++--------- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 185344 -> 188928 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 48640 -> 58880 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 4796416 -> 4796416 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 6 +- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 204288 -> 204288 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 6 +- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 4796416 -> 4796416 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 13453 -> 13451 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 46853 -> 50807 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 4796416 -> 4796416 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 6 +- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 204288 -> 204288 bytes 38 files changed, 162 insertions(+), 49 deletions(-) create mode 100644 Data/google.jpg create mode 100644 Profiles/user.save create mode 100644 TimeHACK.Engine/SaveSystem.cs create mode 100644 TimeHACK.Engine/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll create mode 100644 TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Properties.Resources.resources create mode 100644 TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.AboutBox95.resources create mode 100644 TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.Infobox95.resources create mode 100644 TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.Win9XBSOD.resources create mode 100644 TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.WinClassic.resources create mode 100644 TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.FileListAbsolute.txt create mode 100644 TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.GenerateResource.Cache create mode 100644 TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll create mode 100644 TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb (limited to 'TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache') diff --git a/Data/google.jpg b/Data/google.jpg new file mode 100644 index 0000000..26df90c Binary files /dev/null and b/Data/google.jpg differ diff --git a/Profiles/user.save b/Profiles/user.save new file mode 100644 index 0000000..e7cefbf --- /dev/null +++ b/Profiles/user.save @@ -0,0 +1 @@ +eyJVc2VybmFtZSI6bnVsbCwiSW5zdGFsbGVkUHJvZ3JhbXMiOnt9LCJFeHBlcmllbmNlZFN0b3JpZXMiOltdfQ== \ No newline at end of file diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs new file mode 100644 index 0000000..c6e19a2 --- /dev/null +++ b/TimeHACK.Engine/SaveSystem.cs @@ -0,0 +1,87 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Newtonsoft.Json; + +namespace TimeHACK.Engine +{ + public static class SaveSystem + { + public static Save CurrentSave { get; private set; } + + public static string GameDirectory + { + get + { + return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "TimeHACK"); + } + } + + public static string ProfileDirectory + { + get + { + return Path.Combine(GameDirectory, "Profiles"); + } + } + + public static bool LoadSave() + { + if(File.Exists(Path.Combine(ProfileDirectory, "user.save"))) + { + //Read base64 string from file + string b64 = File.ReadAllText(Path.Combine(ProfileDirectory, "user.save")); + //Get Unicode byte array + byte[] bytes = Convert.FromBase64String(b64); + //Decode the Unicode + string json = Encoding.UTF8.GetString(bytes); + //Deserialize save object. + CurrentSave = JsonConvert.DeserializeObject(json); + return true; + } + else + { + NewGame(); + return false; + } + } + + public static void NewGame() + { + //TODO: User must set a username....somehow + if (!Directory.Exists(GameDirectory)) + Directory.CreateDirectory(GameDirectory); + + if (!Directory.Exists(ProfileDirectory)) + Directory.CreateDirectory(ProfileDirectory); + + var save = new Save(); + save.ExperiencedStories = new List(); + save.InstalledPrograms = new Dictionary(); + CurrentSave = save; + SaveGame(); + } + + public static void SaveGame() + { + //Serialize the save to JSON. + string json = JsonConvert.SerializeObject(CurrentSave); + //Get JSON bytes (Unicode format). + var bytes = Encoding.UTF8.GetBytes(json); + //Encode the array into Base64. + string b64 = Convert.ToBase64String(bytes); + //Write to disk. + File.WriteAllText(Path.Combine(ProfileDirectory, "user.save"), b64); + } + } + + public class Save + { + public string Username { get; set; } + public Dictionary InstalledPrograms { get; set; } + public List ExperiencedStories { get; set; } + } +} diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj index ecb6b48..14707ae 100644 --- a/TimeHACK.Engine/TimeHACK.Engine.csproj +++ b/TimeHACK.Engine/TimeHACK.Engine.csproj @@ -47,6 +47,7 @@ + Form diff --git a/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.dll index e569db6..66cdf05 100644 Binary files a/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.dll and b/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.pdb index 668c688..763326d 100644 Binary files a/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.pdb and b/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 4f815b0..25b26f2 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb index 8f7944b..fd4f046 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index bac2e0d..dc47b2a 100644 Binary files a/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Engine/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Engine/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll new file mode 100644 index 0000000..fc9ddba Binary files /dev/null and b/TimeHACK.Engine/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Properties.Resources.resources b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Properties.Resources.resources new file mode 100644 index 0000000..db7dda3 Binary files /dev/null and b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Properties.Resources.resources differ diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.AboutBox95.resources b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.AboutBox95.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.AboutBox95.resources differ diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.Infobox95.resources b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.Infobox95.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.Infobox95.resources differ diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.Win9XBSOD.resources b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.Win9XBSOD.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.Win9XBSOD.resources differ diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.WinClassic.resources b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.WinClassic.resources new file mode 100644 index 0000000..690267a Binary files /dev/null and b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.Template.WinClassic.resources differ diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.FileListAbsolute.txt b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..446887b --- /dev/null +++ b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.FileListAbsolute.txt @@ -0,0 +1,11 @@ +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.dll +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\bin\Debug\TimeHACK.Engine.pdb +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\bin\Debug\Newtonsoft.Json.dll +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Properties.Resources.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.Win9XBSOD.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.AboutBox95.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.Infobox95.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.Template.WinClassic.resources +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.csproj.GenerateResource.Cache +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.dll +C:\Users\Michael\Documents\TimeHACK\TimeHACK.Engine\obj\Debug\TimeHACK.Engine.pdb diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.GenerateResource.Cache new file mode 100644 index 0000000..49ae6a2 Binary files /dev/null and b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll new file mode 100644 index 0000000..66cdf05 Binary files /dev/null and b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb new file mode 100644 index 0000000..763326d Binary files /dev/null and b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache index 06332ab..832bf29 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index 4f815b0..25b26f2 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb index 8f7944b..fd4f046 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index 5e6e5f8..c883a95 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -5,6 +5,7 @@ using System.IO; using System.Windows.Forms; using TimeHACK.OS.Win95; using TimeHACK.Engine; +using static TimeHACK.Engine.SaveSystem; namespace TimeHACK { @@ -19,22 +20,43 @@ namespace TimeHACK public static DirectoryInfo datafolder; public static DirectoryInfo profilefolder; - public static string GameDirectory + public void StartGame() { - get + //TODO: You may want to handle story stuff to decide what OS to boot here. + if (Convert.ToInt32(VM_Width.Text) == 1337 && Convert.ToInt32(VM_Height.Text) == 1337) + { + leet(); + } + else +// If VM Mode is not enabled +if (vm_mode.Checked != true) + { + // Generate fullscreen desktop + frm95 = new Windows95(); + frm95.TopMost = true; + frm95.FormBorderStyle = FormBorderStyle.None; + frm95.WindowState = FormWindowState.Maximized; + frm95.Show(); + Hide(); + } + // If VM Mode is enabled + else { - return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonDocuments), "TimeHACK"); + // Generate desktop with size entered by user + frm95 = new Windows95(); + frm95.FormBorderStyle = FormBorderStyle.None; + frm95.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text)); + frm95.FormBorderStyle = FormBorderStyle.Fixed3D; + frm95.Show(); + Hide(); } + } + public TitleScreen() { InitializeComponent(); - if (!Directory.Exists(GameDirectory)) Directory.CreateDirectory(GameDirectory); - else thfolder = new DirectoryInfo(GameDirectory); - datafolder = Directory.CreateDirectory(Path.Combine(thfolder.FullName, "Data")); - Resources.google.Save(Path.Combine(datafolder.FullName, "\\google.jpg")); - profilefolder = Directory.CreateDirectory(Path.Combine(thfolder.FullName, "\\Profiles")); } private void closebutton_Click(object sender, EventArgs e) @@ -60,6 +82,18 @@ namespace TimeHACK // When the TitleScreen Loads private void TitleScreen_Load(object sender, EventArgs e) { + if (!Directory.Exists(GameDirectory)) + Directory.CreateDirectory(GameDirectory); + thfolder = new DirectoryInfo(GameDirectory); + + string Data = Path.Combine(thfolder.FullName, "Data"); + if (!Directory.Exists(Data)) + Directory.CreateDirectory(Data); + + Resources.google.Save(Path.Combine(Data, "google.jpg")); + profilefolder = Directory.CreateDirectory(Path.Combine(thfolder.FullName, "\\Profiles")); + + // Set GameVersion gameversion.Text = "TimeHACK " + Program.gameID; @@ -110,34 +144,8 @@ namespace TimeHACK // When NewGame is Clicked private void NewGame_Click(object sender, EventArgs e) { - if (Convert.ToInt32(VM_Width.Text) == 1337 && Convert.ToInt32(VM_Height.Text) == 1337) - { - leet(); - } - else - // If VM Mode is not enabled - if (vm_mode.Checked != true) - { - // Generate fullscreen desktop - frm95 = new Windows95(); - frm95.TopMost = true; - frm95.FormBorderStyle = FormBorderStyle.None; - frm95.WindowState = FormWindowState.Maximized; - frm95.Show(); - Hide(); - } - // If VM Mode is enabled - else - { - // Generate desktop with size entered by user - frm95 = new Windows95(); - frm95.FormBorderStyle = FormBorderStyle.None; - frm95.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text)); - frm95.FormBorderStyle = FormBorderStyle.Fixed3D; - frm95.Show(); - Hide(); - } - + NewGame(); + StartGame(); } public void BSODRewind(object sender, EventArgs e) @@ -185,7 +193,12 @@ namespace TimeHACK #region LoadGame private void LoadGame_Click(object sender, EventArgs e) { - + var result = LoadSave(); + if(result == false) + { + MessageBox.Show(caption: "No save found.", text: "No save was found on your system. However, we have created a new one, and we will start it up for you."); + } + StartGame(); } private void LoadGame_Enter(object sender, EventArgs e) { diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 4f815b0..66cdf05 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb index 8f7944b..763326d 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 269e050..797af7b 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - enHK1jtqVuqBzs5WjolvCxHtcQ4/IH2qRAoDLD4Vl1g= + Uz3V5ZfPvL8kbLdPsTxWUf0G46Tk2FvGdS//5mccIVQ= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 0512159..f37acab 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.exe and b/TimeHACK.Main/bin/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest index c2dfd19..375c506 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -63,19 +63,19 @@ - Td2TYOaDP/QyjPIAStenJiwmqqmIdwTWbqIXB1t1U7Q= + 6TXNhM+YgvjkCt77w0GQTcIrotJF2QVUhEdYf1z/jr4= - + - SIXbCIc3wbx0rQbc1SZnPbW3ytPXP4QDiBiWIwFS8WY= + IHN6zq12VyThKYP0thtt/7SHfFzso+22RuHWIy0c4dg= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index af6c7ae..34acd5d 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application index 269e050..797af7b 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - enHK1jtqVuqBzs5WjolvCxHtcQ4/IH2qRAoDLD4Vl1g= + Uz3V5ZfPvL8kbLdPsTxWUf0G46Tk2FvGdS//5mccIVQ= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index c2dfd19..375c506 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -63,19 +63,19 @@ - Td2TYOaDP/QyjPIAStenJiwmqqmIdwTWbqIXB1t1U7Q= + 6TXNhM+YgvjkCt77w0GQTcIrotJF2QVUhEdYf1z/jr4= - + - SIXbCIc3wbx0rQbc1SZnPbW3ytPXP4QDiBiWIwFS8WY= + IHN6zq12VyThKYP0thtt/7SHfFzso+22RuHWIy0c4dg= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 0512159..f37acab 100644 Binary files a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe and b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index fe04b4b..ed2d2ce 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index 7d44865..eff587f 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 269e050..797af7b 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - enHK1jtqVuqBzs5WjolvCxHtcQ4/IH2qRAoDLD4Vl1g= + Uz3V5ZfPvL8kbLdPsTxWUf0G46Tk2FvGdS//5mccIVQ= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 0512159..f37acab 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.exe and b/TimeHACK.Main/obj/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest index c2dfd19..375c506 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -63,19 +63,19 @@ - Td2TYOaDP/QyjPIAStenJiwmqqmIdwTWbqIXB1t1U7Q= + 6TXNhM+YgvjkCt77w0GQTcIrotJF2QVUhEdYf1z/jr4= - + - SIXbCIc3wbx0rQbc1SZnPbW3ytPXP4QDiBiWIwFS8WY= + IHN6zq12VyThKYP0thtt/7SHfFzso+22RuHWIy0c4dg= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index af6c7ae..34acd5d 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From b188d5037e8969aad6d95cbdbab3c61b85d24117 Mon Sep 17 00:00:00 2001 From: TheRandomMelon Date: Tue, 9 May 2017 17:50:13 -0500 Subject: Improved the README a LOT --- README.md | 25 +++++++++++---------- .../obj/Release/CoreCompileInputs.cache | 2 +- .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 9302 -> 9198 bytes TimeHACK.Main/obj/Release/CoreCompileInputs.cache | 2 +- .../DesignTimeResolveAssemblyReferences.cache | Bin 90811 -> 79565 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 13451 -> 13169 bytes 6 files changed, 15 insertions(+), 14 deletions(-) (limited to 'TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache') diff --git a/README.md b/README.md index cdd830c..e32a167 100644 --- a/README.md +++ b/README.md @@ -4,31 +4,32 @@ [![Discord](https://discordapp.com/api/guilds/234414439330349056/widget.png?style=shield)](https://discord.gg/FZgQMDe) # TimeHACK -## The original hacking simulator! +## The remake of the original hacking simulator! TimeHACK is a C# version of the PC game Histacom, released by 12padams in 2010. Here are some of our goals: -* Get TimeHACK to the same playable state that Histacom is in. -* Write a new engine and make an API to develop your own applications. +* Get TimeHACK to the same playable state that Histacom's in and beyond. +* Write a new engine and make an API so that you can easily develop your own applications. * Create a new Window Manager to make the development of apps easier. ## Building -TimeHACK is currently being developed on Microsoft Visual Studio 2017. Visual Studio 2015 has also been proven to work. If you are using a different IDE, please use caution. We cannot guarantee the stability of other IDEs. +TimeHACK is currently being developed in Microsoft Visual Studio 2017. Visual Studio 2015 has also been proven to work. If you are using a different IDE, please do so with caution. We cannot guarantee the stability of other IDEs. -Load the ``.SLN`` project file into Visual Studio and compile. No further steps are required. This list may grow in the future. +Load the ``.sln`` project file into Visual Studio and compile. No further steps are required. This list may grow in the future. ## Links -TimeHACK has a forum at http://www.ashifter.ml/timehack/forum +TimeHACK has a forum at https://www.ashifter.ml/timehack/forum -TimeHACK has a Discord at https://discord.gg/FZgQMDe (You can also click on the Purple Discord Badge) +TimeHACK has a Discord server at https://discord.gg/FZgQMDe (You can also click on the dark blue Discord Badge) -TimeHACK has an AppVeyor at https://ci.appveyor.com/project/timehack/timehack (You can also use the AppVeyor Badge) +TimeHACK has an AppVeyor project at https://ci.appveyor.com/project/timehack/timehack (You can also use the AppVeyor badge) -TimeHACK has a YouTube channel at https://www.youtube.com/channel/UCU3uiIgHdLaNvPYEB1hWPsg (This has a tutorial on how to contribute) +TimeHACK has a YouTube channel at https://www.youtube.com/channel/UCU3uiIgHdLaNvPYEB1hWPsg (We have a tutorial on how to contribute over there) ## Documentation -TimeHACK Documentation can be found at the TimeHACK Wiki. https://github.com/TimeHACKDevs/TimeHACK/wiki +TimeHACK's documentation can be found on the TimeHACK Wiki: https://github.com/TimeHACKDevs/TimeHACK/wiki ## Other Repositories -We do have another repo which is of an completely discontinued porject called "HistacomVB", the idea of it being that it was, rather than a rewrite like this, the old game except being built upon. In the end however we stopped it because have "HistacomVB" and "TimeHACK" was just stupid. If you REALLY want to see the repo you can here: http://www.github.com/TimeHACKDevs/HistacomVB +* A completely discontinued project called "HistacomVB". +The idea of it being that it was the old game except being built upon. In the end, however, we stopped it because having "HistacomVB" and "TimeHACK" was just stupid. If you REALLY want to see the repo, click here: http://www.github.com/TimeHACKDevs/HistacomVB ## License -TimeHACK is Licensed under the [MIT Software license](https://github.com/TimeHACKDevs/TimeHACK/blob/master/LICENSE). All code contributed to the TimeHACK project is the property of the TimeHACK development team, and will not be removed upon request. +TimeHACK is licensed under the [MIT license](https://github.com/TimeHACKDevs/TimeHACK/blob/master/LICENSE). All code committed to the TimeHACK repository becomes the property of the TimeHACK Development Team, and will **not** be removed upon request. diff --git a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache index e158fb7..96fd122 100644 --- a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -defaaccc70c7eb8223276a62546ce8ea271f019d +3f61991ca0a199db0f3858a95c8b02e5ed247a5c diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 6fcaded..8c43f58 100644 Binary files a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache index 2c8233d..a609b86 100644 --- a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -4bef4b1c0915c11ff57031bc58f9ea8e4f92589f +5c30ea676bdbdb465d2c2ca5bc89ac955afec8c8 diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache index 8f72a7c..03ca014 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index ed2d2ce..154a571 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ -- cgit v1.2.3