From 2861282fa1a00778b773a73fde614cc64f291082 Mon Sep 17 00:00:00 2001 From: Michael Webb Date: Tue, 2 Apr 2019 07:08:20 -0500 Subject: [PATCH] Improved readme, license, and fixed a couple of things on the title screen --- Histacom2/AchievementScreen.cs | 2 +- Histacom2/TitleScreen.Designer.cs | 32 ++++++++++++++++--------------- LICENSE | 2 +- README.md | 15 +++++++-------- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Histacom2/AchievementScreen.cs b/Histacom2/AchievementScreen.cs index 5c85333..d114915 100644 --- a/Histacom2/AchievementScreen.cs +++ b/Histacom2/AchievementScreen.cs @@ -33,7 +33,7 @@ private void AchievementScreen_Load(object sender, EventArgs e) listView1.Items[1].Text = "Destruction Ending"; } if (achieved[20] == 1) listView2.Items[0].ImageIndex = 0; - if (achieved[21] == 1) listView2.Items[1].ImageIndex = 0; + // if (achieved[21] == 1) listView2.Items[1].ImageIndex = 0; } private void button1_Click(object sender, EventArgs e) diff --git a/Histacom2/TitleScreen.Designer.cs b/Histacom2/TitleScreen.Designer.cs index ccb18b2..f5ddbf7 100644 --- a/Histacom2/TitleScreen.Designer.cs +++ b/Histacom2/TitleScreen.Designer.cs @@ -32,7 +32,6 @@ private void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TitleScreen)); this.program = new System.Windows.Forms.Panel(); this.programContent = new System.Windows.Forms.Panel(); - this.pictureBox3 = new System.Windows.Forms.PictureBox(); this.panel2 = new System.Windows.Forms.Panel(); this.gameversion = new System.Windows.Forms.Label(); this.startbutton = new System.Windows.Forms.PictureBox(); @@ -52,9 +51,9 @@ private void InitializeComponent() this.bottomleftcorner = new System.Windows.Forms.Panel(); this.topleftcorner = new System.Windows.Forms.Panel(); this.updateText = new System.Windows.Forms.Timer(this.components); + this.label1 = new System.Windows.Forms.Label(); this.program.SuspendLayout(); this.programContent.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.startbutton)).BeginInit(); this.startmenu.SuspendLayout(); @@ -81,7 +80,7 @@ private void InitializeComponent() // programContent // this.programContent.BackColor = System.Drawing.Color.Teal; - this.programContent.Controls.Add(this.pictureBox3); + this.programContent.Controls.Add(this.label1); this.programContent.Controls.Add(this.panel2); this.programContent.Controls.Add(this.startmenu); this.programContent.Controls.Add(this.pictureBox2); @@ -91,15 +90,6 @@ private void InitializeComponent() this.programContent.Size = new System.Drawing.Size(791, 300); this.programContent.TabIndex = 9; // - // pictureBox3 - // - this.pictureBox3.BackgroundImage = global::Histacom2.Properties.Resources.CopyrightNotice; - this.pictureBox3.Location = new System.Drawing.Point(162, 220); - this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(225, 50); - this.pictureBox3.TabIndex = 13; - this.pictureBox3.TabStop = false; - // // panel2 // this.panel2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel2.BackgroundImage"))); @@ -163,7 +153,7 @@ private void InitializeComponent() this.startmenuitems.Name = "startmenuitems"; this.startmenuitems.Padding = new System.Windows.Forms.Padding(1, 2, 0, 0); this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.startmenuitems.Size = new System.Drawing.Size(140, 220); + this.startmenuitems.Size = new System.Drawing.Size(140, 239); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -310,6 +300,18 @@ private void InitializeComponent() // this.updateText.Enabled = true; this.updateText.Tick += new System.EventHandler(this.updateText_Tick); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.ForeColor = System.Drawing.Color.White; + this.label1.Location = new System.Drawing.Point(161, 228); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(293, 39); + this.label1.TabIndex = 14; + this.label1.Text = "© Philip Adams, Michael Webb and contributors, 2010-2019.\r\nAll operating systems " + + "shown in this game\r\nbelong to their respective owners."; // // TitleScreen // @@ -328,7 +330,7 @@ private void InitializeComponent() this.Load += new System.EventHandler(this.TitleScreen_Load); this.program.ResumeLayout(false); this.programContent.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); + this.programContent.PerformLayout(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit(); @@ -365,6 +367,6 @@ private void InitializeComponent() private System.Windows.Forms.Timer updateText; private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.ToolStripMenuItem achievementsToolStripMenuItem; - private System.Windows.Forms.PictureBox pictureBox3; + private System.Windows.Forms.Label label1; } } \ No newline at end of file diff --git a/LICENSE b/LICENSE index a5a3c81..ba32137 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 Histacom2-Devs +Copyright (c) 2019 Michael Webb and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 2378c6e..d58820f 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ AppVeyor Badge -[![Discord](https://img.shields.io/discord/266018132827570176.svg?colorB=7289DA&label=discord)](https://discord.gg/ffuXR9k) +[![Discord](https://img.shields.io/discord/562604068493852675.svg?colorB=7289DA&label=discord)](https://discord.gg/CeBBXWN) -# Histacom 2 -## The remake of the original hacking simulator! +[![# Histacom 2](https://raw.githubusercontent.com/TheRandomMelon/Histacom2/master/Histacom2/Resources/TitleScreen/Histacom2_Logo.png)] Histacom 2 is a C# version of the PC game Histacom, released by 12padams in 2010. Here are some of our goals: * Get Histacom 2 to the same playable state that the original Histacom's in and beyond. * Add more applications to the operating systems. @@ -15,14 +14,14 @@ Load the ``.sln`` project file into Visual Studio and compile. No further steps ## Links -Histacom 2 has a Discord server at https://discord.gg/FZgQMDe (You can also click on the dark blue Discord Badge) +Discord server: https://discord.gg/CeBBXWN (You can also click on the dark blue Discord Badge) -Histacom 2 has an AppVeyor project at https://ci.appveyor.com/project/timehack/timehack (You can also use the AppVeyor badge) +AppVeyor project: https://ci.appveyor.com/project/timehack/timehack (You can also use the AppVeyor badge) -Histacom 2 has a YouTube channel at https://www.youtube.com/channel/UCU3uiIgHdLaNvPYEB1hWPsg (We have a tutorial on how to contribute over there) +YouTube Channel: https://www.youtube.com/channel/UCU3uiIgHdLaNvPYEB1hWPsg (Note that the videos are probably outdated.) ## Documentation -Histacom 2's documentation can be found on the Histacom 2 Wiki: https://github.com/LemonyStudios/Histacom2/wiki +Histacom 2's documentation can be found on the Histacom 2 Wiki: https://github.com/TheRandomMelon/Histacom2/wiki ## License -Histacom 2 is licensed under the [MIT license](https://github.com/LemonyStudios/Histacom2/blob/master/LICENSE). All code committed to the Histacom 2 repository becomes the property of the LemonyStudios, and will **not** be removed upon request. +Histacom 2 is licensed under the [MIT license](https://github.com/TheRandomMelon/Histacom2/blob/master/LICENSE). All code committed to the Histacom 2 repository becomes the property of Michael Webb, and cannot be removed under request. Please consider this before contributing.