diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo index d20ff58..e149259 100644 Binary files a/.vs/TimeHACK/v15/.suo and b/.vs/TimeHACK/v15/.suo differ diff --git a/TimeHACK.Engine/GameSave/SaveData.cs b/TimeHACK.Engine/GameSave/SaveData.cs new file mode 100644 index 0000000..3ea901d --- /dev/null +++ b/TimeHACK.Engine/GameSave/SaveData.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TimeHACK.Engine.GameSave +{ + public class SaveData + { + static int OS + { + get; set; + } + } +} diff --git a/TimeHACK.Engine/GameSave/SaveSystem.cs b/TimeHACK.Engine/GameSave/SaveSystem.cs new file mode 100644 index 0000000..e4b69d9 --- /dev/null +++ b/TimeHACK.Engine/GameSave/SaveSystem.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Newtonsoft.Json; + +namespace TimeHACK.Engine +{ + public class SaveSystem + { + public void NewGame() + { + //int kool = 430634; + //JsonConvert.SerializeObject(kool); + } + } +} diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj index ecb6b48..5fc47e2 100644 --- a/TimeHACK.Engine/TimeHACK.Engine.csproj +++ b/TimeHACK.Engine/TimeHACK.Engine.csproj @@ -47,6 +47,8 @@ + + Form diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 4bb4674..2622978 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 bea88dc..be732e8 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/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache index 016901c..eefe581 100644 --- a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -03f745c6a0e75bab98ef9919670fab0f1de5ece4 +bdbeecc076ab1435c4e764cd236cd99237fe8529 diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 4103602..e421fcc 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.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache index 7b238df..5860591 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 7f234df..2e5818a 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 4bb4674..2622978 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 bea88dc..be732e8 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/NewGameDialog.Designer.cs b/TimeHACK.Main/NewGameDialog.Designer.cs new file mode 100644 index 0000000..9aee1e0 --- /dev/null +++ b/TimeHACK.Main/NewGameDialog.Designer.cs @@ -0,0 +1,125 @@ +namespace TimeHACK +{ + partial class NewGameDialog + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.txtProfName = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.btnOk = new System.Windows.Forms.Button(); + this.btnHelp = new System.Windows.Forms.Button(); + this.btnCancl = new System.Windows.Forms.Button(); + this.btnInfo = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // txtProfName + // + this.txtProfName.Location = new System.Drawing.Point(87, 12); + this.txtProfName.Name = "txtProfName"; + this.txtProfName.Size = new System.Drawing.Size(370, 20); + this.txtProfName.TabIndex = 0; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 15); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(70, 13); + this.label1.TabIndex = 1; + this.label1.Text = "Profile Name:"; + // + // btnOk + // + this.btnOk.Location = new System.Drawing.Point(382, 70); + this.btnOk.Name = "btnOk"; + this.btnOk.Size = new System.Drawing.Size(75, 23); + this.btnOk.TabIndex = 2; + this.btnOk.Text = "OK"; + this.btnOk.UseVisualStyleBackColor = true; + this.btnOk.Click += new System.EventHandler(this.btnOk_Click); + // + // btnHelp + // + this.btnHelp.Location = new System.Drawing.Point(301, 70); + this.btnHelp.Name = "btnHelp"; + this.btnHelp.Size = new System.Drawing.Size(75, 23); + this.btnHelp.TabIndex = 2; + this.btnHelp.Text = "Help"; + this.btnHelp.UseVisualStyleBackColor = true; + this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click); + // + // btnCancl + // + this.btnCancl.Location = new System.Drawing.Point(220, 70); + this.btnCancl.Name = "btnCancl"; + this.btnCancl.Size = new System.Drawing.Size(75, 23); + this.btnCancl.TabIndex = 2; + this.btnCancl.Text = "Cancel"; + this.btnCancl.UseVisualStyleBackColor = true; + this.btnCancl.Click += new System.EventHandler(this.btnCancl_Click); + // + // btnInfo + // + this.btnInfo.Location = new System.Drawing.Point(7, 70); + this.btnInfo.Name = "btnInfo"; + this.btnInfo.Size = new System.Drawing.Size(121, 23); + this.btnInfo.TabIndex = 2; + this.btnInfo.Text = "Technical Info"; + this.btnInfo.UseVisualStyleBackColor = true; + this.btnInfo.Click += new System.EventHandler(this.btnInfo_Click); + // + // NewGameDialog + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(469, 96); + this.Controls.Add(this.btnInfo); + this.Controls.Add(this.btnCancl); + this.Controls.Add(this.btnHelp); + this.Controls.Add(this.btnOk); + this.Controls.Add(this.label1); + this.Controls.Add(this.txtProfName); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "NewGameDialog"; + this.Text = "New Game"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.TextBox txtProfName; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button btnOk; + private System.Windows.Forms.Button btnHelp; + private System.Windows.Forms.Button btnCancl; + private System.Windows.Forms.Button btnInfo; + } +} \ No newline at end of file diff --git a/TimeHACK.Main/NewGameDialog.cs b/TimeHACK.Main/NewGameDialog.cs new file mode 100644 index 0000000..3479aec --- /dev/null +++ b/TimeHACK.Main/NewGameDialog.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using TimeHACK.Engine; +using TimeHACK.Engine.GameSave; +using Newtonsoft.Json; + +namespace TimeHACK +{ + public partial class NewGameDialog : Form + { + public NewGameDialog() + { + InitializeComponent(); + } + + private void btnHelp_Click(object sender, EventArgs e) + { + MessageBox.Show("You can choose a profile name - this will create a new profile! Whenever you want to Load a game, click 'Load Game' and then choose a profile (You can have as many prfiles as you want)"); + } + + private void btnCancl_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void btnInfo_Click(object sender, EventArgs e) + { + MessageBox.Show("The game's profiles are stored in C:/TimeHACK/Profiles - the rest is for you to figure out!"); + } + + private void btnOk_Click(object sender, EventArgs e) + { + + } + } +} diff --git a/TimeHACK.Main/NewGameDialog.resx b/TimeHACK.Main/NewGameDialog.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/TimeHACK.Main/NewGameDialog.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 2e88c36..04374ba 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -29,7 +29,7 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95)); System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem("My Computer", 0); System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem("Network Neighborhood", 5); System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem("Inbox", 3); @@ -238,7 +238,7 @@ private void InitializeComponent() this.startmenuitems.Name = "startmenuitems"; this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0); this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.startmenuitems.Size = new System.Drawing.Size(141, 292); + this.startmenuitems.Size = new System.Drawing.Size(141, 311); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -439,6 +439,7 @@ private void InitializeComponent() this.AddressBookToolStripMenuItem.Name = "AddressBookToolStripMenuItem"; this.AddressBookToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.AddressBookToolStripMenuItem.Text = "Address Book"; + this.AddressBookToolStripMenuItem.Click += new System.EventHandler(this.AddressBookToolStripMenuItem_Click); // // CalculatorToolStripMenuItem // diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index da8a550..eeaa9f2 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -310,6 +310,20 @@ public void UpdateTaskbar() } } + private void AddressBookToolStripMenuItem_Click(object sender, EventArgs e) + { + WinClassicAddressBook ab = new WinClassicAddressBook(); + WinClassic app = wm.startWin95(ab, "Address Book", Properties.Resources.Win95IconWordpad, true, true); + AddTaskBarItem(app, app.Tag.ToString(), "Address Book", Properties.Resources.Win95IconWordpad); + + nonimportantapps.Add(app); + nonimportantapps[nonimportantapps.Count - 1].BringToFront(); + nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing); + + app.BringToFront(); + startmenu.Hide(); + } + //TODO: Add Outlook Express 4 } } diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx index ae3e1b6..ac1b120 100644 --- a/TimeHACK.Main/OS/Win95/Win95.resx +++ b/TimeHACK.Main/OS/Win95/Win95.resx @@ -330,7 +330,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAATABAQEwAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAATgBAQE4AQEBIAEAASABAAT/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/WinClassicAddressBook.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.Designer.cs index 09f32df..4974cc2 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.Designer.cs @@ -28,18 +28,121 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + this.label1 = new System.Windows.Forms.Label(); + this.topmenu = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.newContactToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.newGroupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.newFolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.topmenu.SuspendLayout(); this.SuspendLayout(); // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(114, 85); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(442, 39); + this.label1.TabIndex = 0; + this.label1.Text = "YOY! This is my application"; + // + // topmenu + // + this.topmenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem, + this.editToolStripMenuItem, + this.viewToolStripMenuItem, + this.toolsToolStripMenuItem, + this.helpToolStripMenuItem}); + this.topmenu.Location = new System.Drawing.Point(0, 0); + this.topmenu.Name = "topmenu"; + this.topmenu.Size = new System.Drawing.Size(666, 24); + this.topmenu.TabIndex = 1; + this.topmenu.Text = "menuStrip1"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.newContactToolStripMenuItem, + this.newGroupToolStripMenuItem, + this.newFolderToolStripMenuItem}); + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Text = "File"; + // + // editToolStripMenuItem + // + this.editToolStripMenuItem.Name = "editToolStripMenuItem"; + this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); + this.editToolStripMenuItem.Text = "Edit"; + // + // viewToolStripMenuItem + // + this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; + this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.viewToolStripMenuItem.Text = "View"; + // + // toolsToolStripMenuItem + // + this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; + this.toolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20); + this.toolsToolStripMenuItem.Text = "Tools"; + // + // helpToolStripMenuItem + // + this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; + this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.helpToolStripMenuItem.Text = "Help"; + // + // newContactToolStripMenuItem + // + this.newContactToolStripMenuItem.Name = "newContactToolStripMenuItem"; + this.newContactToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.newContactToolStripMenuItem.Text = "New contact..."; + // + // newGroupToolStripMenuItem + // + this.newGroupToolStripMenuItem.Name = "newGroupToolStripMenuItem"; + this.newGroupToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.newGroupToolStripMenuItem.Text = "New group..."; + // + // newFolderToolStripMenuItem + // + this.newFolderToolStripMenuItem.Name = "newFolderToolStripMenuItem"; + this.newFolderToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.newFolderToolStripMenuItem.Text = "New folder..."; + // // WinClassicAddressBook // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.topmenu); this.Name = "WinClassicAddressBook"; - this.Size = new System.Drawing.Size(260, 264); + this.Size = new System.Drawing.Size(666, 425); + this.topmenu.ResumeLayout(false); + this.topmenu.PerformLayout(); this.ResumeLayout(false); + this.PerformLayout(); } #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.MenuStrip topmenu; + private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem viewToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem toolsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem newContactToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem newGroupToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem newFolderToolStripMenuItem; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.cs index 3934fa7..624267c 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.cs @@ -15,6 +15,23 @@ public partial class WinClassicAddressBook : UserControl public WinClassicAddressBook() { InitializeComponent(); + foreach (ToolStripMenuItem item in topmenu.Items) + { + item.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0))); + item.BackColor = Color.Silver; + item.BackgroundImage = Properties.Resources.sliversilver; + item.BackgroundImageLayout = ImageLayout.Center; + item.DisplayStyle = ToolStripItemDisplayStyle.Text; + } + + //Time to prepare to load all the fonts up for the combo boxes + + //foreach (FontFamily font in System.Drawing.FontFamily.Families) + //{ + // Added to the ComboBox here + + //comboFont.Items.Add(font.Name); + //} } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.resx index 1af7de1..6dff4e6 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 9dafca4..db4f9fe 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -119,6 +119,12 @@ + + Form + + + NewGameDialog.cs + Form @@ -204,6 +210,9 @@ TitleScreen.cs + + NewGameDialog.cs + Win95.cs diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 4bb4674..2622978 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 bea88dc..be732e8 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 6def2fe..f950128 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - HHvzTiHAxUTYqzjzsZdM0fyuFWIZGCBN+d51DdJwNrs= + xjHHFGhzyw8t/woi94tXsDi0wHI6NNfYQtZ7SVesCss= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index c6f4277..0d3f0ca 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 3775956..d3d82ae 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - 2Jbod4Xow0JGKpYFpNEsaUATDtSEvAz3bjwZPOERE5o= + bvuNiShd3UykZMwmEw2EiL3NEusY3nKAMAgkSxVBuEs= @@ -75,7 +75,7 @@ - m6y3wcwMukQ5TrLCcX8fgYK8EJp+K9PMtNF0cSKByXA= + q5TdtgL5zKcTU+c/GlC/k7CBj0YZbbB5vI93xhR0nM0= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index c8706f5..bc84b34 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/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index c6f4277..0d3f0ca 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/CoreCompileInputs.cache b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache index 80cd691..9bfc9d3 100644 --- a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -b2dbf06aa0cc470c40ca4fe96ade7148963cc456 +b26a4c517dee1309b1e9884b9621232394ba8ed0 diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache index fc4277d..875050f 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 9d8e4f0..7c3de03 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 dd398fa..0cac41b 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -90,3 +90,4 @@ C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHA C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.Main.csproj.GenerateResource.Cache C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.exe.manifest C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.application +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.NewGameDialog.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 10057d7..b1476c3 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 bc11b9a..2b1420e 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.NewGameDialog.resources b/TimeHACK.Main/obj/Release/TimeHACK.NewGameDialog.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.NewGameDialog.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 813ae27..159c838 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.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 6def2fe..f950128 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - HHvzTiHAxUTYqzjzsZdM0fyuFWIZGCBN+d51DdJwNrs= + xjHHFGhzyw8t/woi94tXsDi0wHI6NNfYQtZ7SVesCss= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index c6f4277..0d3f0ca 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 3775956..d3d82ae 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - 2Jbod4Xow0JGKpYFpNEsaUATDtSEvAz3bjwZPOERE5o= + bvuNiShd3UykZMwmEw2EiL3NEusY3nKAMAgkSxVBuEs= @@ -75,7 +75,7 @@ - m6y3wcwMukQ5TrLCcX8fgYK8EJp+K9PMtNF0cSKByXA= + q5TdtgL5zKcTU+c/GlC/k7CBj0YZbbB5vI93xhR0nM0= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index c8706f5..bc84b34 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ