yoy
This commit is contained in:
AShifter 2017-05-20 09:43:04 -06:00
parent 2088dcac27
commit 5bd41f103e
29 changed files with 54 additions and 158 deletions

Binary file not shown.

View file

@ -1 +1 @@
34172df9cedd638ac7a23f9204409797a1d64c7b
36d6c51ba86e2fb614720ec9b4b9f611be681e3c

View file

@ -69,3 +69,15 @@ C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Temp
C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache
C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll
C:\Users\trm\Documents\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Win9XBSOD.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb

View file

@ -24,7 +24,6 @@ private void Button1_Click(object sender, EventArgs e)
Label3.Show();
Label3.Text = "Hidden Content Found: Time Distorter";
TitleScreen.frm95.hiddenpadamsFound = true;
if (TitleScreen.frm95.ie != null && ((WinClassicIE4)TitleScreen.frm95.ie.programContent.Controls[0]).currentsite.Title == "12PADAMS") ((WinClassicIE4)TitleScreen.frm95.ie.programContent.Controls[0]).webBrowser1.Refresh();
}
else
{

View file

@ -189,7 +189,6 @@ private void InitializeComponent()
this.TextBox2 = new System.Windows.Forms.TextBox();
this.Label7 = new System.Windows.Forms.Label();
this.pboxgoogleprototypelogo = new System.Windows.Forms.PictureBox();
this.webBrowser1 = new System.Windows.Forms.WebBrowser();
this.Panel14 = new System.Windows.Forms.Panel();
this.GoButton = new System.Windows.Forms.Button();
this.addressbar = new System.Windows.Forms.ComboBox();
@ -1082,95 +1081,7 @@ private void InitializeComponent()
this.PictureBox3.Size = new System.Drawing.Size(160, 136);
this.PictureBox3.TabIndex = 0;
this.PictureBox3.TabStop = false;
//
<<<<<<< HEAD
=======
// welcomeinternetscreen
//
this.welcomeinternetscreen.AutoScroll = true;
this.welcomeinternetscreen.BackColor = System.Drawing.Color.White;
this.welcomeinternetscreen.Controls.Add(this.Label58);
this.welcomeinternetscreen.Controls.Add(this.LinkLabel16);
this.welcomeinternetscreen.Controls.Add(this.LinkLabel15);
this.welcomeinternetscreen.Controls.Add(this.Label3);
this.welcomeinternetscreen.Controls.Add(this.TextBox1);
this.welcomeinternetscreen.Controls.Add(this.Label2);
this.welcomeinternetscreen.Location = new System.Drawing.Point(8, 3);
this.welcomeinternetscreen.Name = "welcomeinternetscreen";
this.welcomeinternetscreen.Size = new System.Drawing.Size(38, 38);
this.welcomeinternetscreen.TabIndex = 0;
//
// Label58
//
this.Label58.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.Label58.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label58.Location = new System.Drawing.Point(0, 45);
this.Label58.Name = "Label58";
this.Label58.Size = new System.Drawing.Size(200, 16);
this.Label58.TabIndex = 7;
this.Label58.Text = "Where do you want to go today?";
this.Label58.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// LinkLabel16
//
this.LinkLabel16.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.LinkLabel16.Location = new System.Drawing.Point(0, 317);
this.LinkLabel16.Name = "LinkLabel16";
this.LinkLabel16.Size = new System.Drawing.Size(200, 13);
this.LinkLabel16.TabIndex = 6;
this.LinkLabel16.TabStop = true;
this.LinkLabel16.Text = "www.12padams.com";
this.LinkLabel16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// LinkLabel15
//
this.LinkLabel15.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.LinkLabel15.Location = new System.Drawing.Point(0, 298);
this.LinkLabel15.Name = "LinkLabel15";
this.LinkLabel15.Size = new System.Drawing.Size(200, 13);
this.LinkLabel15.TabIndex = 5;
this.LinkLabel15.TabStop = true;
this.LinkLabel15.Text = "www.google.com";
this.LinkLabel15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// Label3
//
this.Label3.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.Label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label3.Location = new System.Drawing.Point(0, 258);
this.Label3.Name = "Label3";
this.Label3.Size = new System.Drawing.Size(200, 20);
this.Label3.TabIndex = 2;
this.Label3.Text = "Here are some sites you may wish to visit.";
this.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// TextBox1
//
this.TextBox1.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.TextBox1.BackColor = System.Drawing.Color.White;
this.TextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.TextBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.TextBox1.Location = new System.Drawing.Point(0, 98);
this.TextBox1.Multiline = true;
this.TextBox1.Name = "TextBox1";
this.TextBox1.ReadOnly = true;
this.TextBox1.Size = new System.Drawing.Size(200, 130);
this.TextBox1.TabIndex = 1;
this.TextBox1.Text = resources.GetString("TextBox1.Text");
this.TextBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// Label2
//
this.Label2.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.Label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Label2.Location = new System.Drawing.Point(0, 19);
this.Label2.Name = "Label2";
this.Label2.Size = new System.Drawing.Size(200, 24);
this.Label2.TabIndex = 0;
this.Label2.Text = "Welcome To Internet Explorer 4";
this.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
>>>>>>> origin/master
//
// hotmailpadams
//
this.hotmailpadams.AutoScroll = true;
@ -2153,15 +2064,6 @@ private void InitializeComponent()
this.pboxgoogleprototypelogo.TabIndex = 0;
this.pboxgoogleprototypelogo.TabStop = false;
//
// webBrowser1
//
this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill;
this.webBrowser1.Location = new System.Drawing.Point(0, 111);
this.webBrowser1.Name = "webBrowser1";
this.webBrowser1.Size = new System.Drawing.Size(959, 483);
this.webBrowser1.TabIndex = 11;
this.webBrowser1.DocumentCompleted += new System.Windows.Forms.WebBrowserDocumentCompletedEventHandler(this.webBrowser1_DocumentCompleted);
//
// Panel14
//
this.Panel14.Controls.Add(this.GoButton);

View file

@ -5,8 +5,6 @@
using System.Windows.Forms;
using TimeHACK.Engine;
using TimeHACK.Engine.Template;
using TimeHACK.Resources.IE4;
namespace TimeHACK.OS.Win95.Win95Apps
{
public partial class WinClassicIE4 : UserControl
@ -14,8 +12,6 @@ public partial class WinClassicIE4 : UserControl
public List<string> browsinghistory = new List<string>();
public int historylocation = 0;
IE4Welcome welcomeinternetscreen = new IE4Welcome();
public WinClassicIE4()
{
InitializeComponent();
@ -23,19 +19,13 @@ public WinClassicIE4()
private void WinClassicIE4_Load(object sender, EventArgs e)
{
<<<<<<< HEAD
browsinghistory.Capacity = 99;
BringToFront();
hidePrograms();
welcomeinternetscreen.Dock = DockStyle.Fill;
welcomeinternetscreen.Show();
browsinghistory.Add("www.microsoft.com/internetexplorer4/welcome");
for (int i = 0; i < 99; i++) browsinghistory.Add(null);
foreach (ToolStripMenuItem item in MenuStrip3.Items) item.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0)));
foreach (Control ctrl in Panel1.Controls) ctrl.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0)));
=======
>>>>>>> origin/master
}
private void hidePrograms()
@ -43,7 +33,6 @@ private void hidePrograms()
googlemain.Hide();
googleprototype.Hide();
googlealpha.Hide();
welcomeinternetscreen.Hide();
padamsmain.Hide();
hotmailmain.Hide();
padamsbackgrounds.Hide();
@ -75,8 +64,6 @@ private void goToSite(string url, bool back)
break;
case "www.microsoft.com/internetexplorer4/welcome":
hidePrograms();
welcomeinternetscreen.Dock = DockStyle.Fill;
welcomeinternetscreen.Show();
break;
case "www.???.com":
hidePrograms();
@ -143,42 +130,7 @@ private void GoButton_Click(object sender, EventArgs e)
{
goToSite(addressbar.Text, false);
}
<<<<<<< HEAD
=======
private void webBrowser1_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
{
loadplz.Start();
}
private void loadplz_Tick(object sender, EventArgs e)
{
try
{
switch (currentsite.Title)
{
case "IE4START":
webBrowser1.Document.GetElementById("google").Click += new HtmlElementEventHandler(google_LinkClicked);
webBrowser1.Document.GetElementById("padams").Click += new HtmlElementEventHandler(padams_LinkClicked);
break;
case "12PADAMS":
webBrowser1.Document.GetElementById("wc_b").Click += new HtmlElementEventHandler(WCDownloadButton_Click);
if (!TitleScreen.frm95.hiddenpadamsFound) webBrowser1.Document.GetElementById("distort").Style += "visibility:hidden;";
break;
case "GOOGLE":
webBrowser1.Document.GetElementById("prototype").Click += new HtmlElementEventHandler(googleprototypelink_LinkClicked);
webBrowser1.Document.GetElementById("alpha").Click += new HtmlElementEventHandler(googlebetalink_LinkClicked);
break;
}
loadplz.Stop();
} catch
{
}
}
>>>>>>> origin/master
//TODO: Add more websites
//TODO: Relabel Buttons And Things
}

View file

@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>hMTjdJiibiTYqKxR7HqCakXJqGnrz7XPeVCRAsbaM1k=</dsig:DigestValue>
<dsig:DigestValue>GoxQOGP7B2eD+tfJWs/i3tSzuFU0Z3cP5DIwNHf1VlA=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

View file

@ -56,14 +56,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="4812288">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="4808704">
<assemblyIdentity name="TimeHACK" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>AKsANA7gB/uA+0C5YVulN2jRooS99Y9QISJmcYJyuCY=</dsig:DigestValue>
<dsig:DigestValue>x0JfwuS6Z2FzxwSOfxtqnv0PmJU958Re5irDF45U2X4=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
@ -75,7 +75,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>OYL3W6VPjR/jevpWgri4MYg7bMP4XeB+2OfDy+NvgfU=</dsig:DigestValue>
<dsig:DigestValue>JxJzXoPwWMXX+nLudxuAsBNczogYyPusog32bR0W1cY=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

View file

@ -1 +1 @@
55e5267912f35225509997d29deb1d005ac19e4a
ae286026c77fb98c845cb9fbea65815750f7abfe

View file

@ -29,3 +29,34 @@ I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.e
I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.pdb
I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.LoadGameDialog.resources
I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.LoadGameProfileItem.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Main.csprojResolveAssemblyReference.cache
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.LoadGameDialog.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.LoadGameProfileItem.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.NewGameDialog.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Windows95.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.AddressBook.FRMWinClassicAddressBookNewContact.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.TestApp.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.AddressBook.FRMWinClassicAddressBookNewFolder.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicAddressBook.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicHWCV.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicInstaller.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicNotepad.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicWordPad.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win98.Win98.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Properties.Resources.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.TitleScreen.resources
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Main.csproj.GenerateResource.Cache
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.pdb
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.exe.manifest
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.application
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.exe
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.pdb
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.Engine.dll
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.Engine.pdb
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe.manifest
C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.application

View file

@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>hMTjdJiibiTYqKxR7HqCakXJqGnrz7XPeVCRAsbaM1k=</dsig:DigestValue>
<dsig:DigestValue>GoxQOGP7B2eD+tfJWs/i3tSzuFU0Z3cP5DIwNHf1VlA=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

View file

@ -56,14 +56,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="4812288">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="4808704">
<assemblyIdentity name="TimeHACK" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>AKsANA7gB/uA+0C5YVulN2jRooS99Y9QISJmcYJyuCY=</dsig:DigestValue>
<dsig:DigestValue>x0JfwuS6Z2FzxwSOfxtqnv0PmJU958Re5irDF45U2X4=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
@ -75,7 +75,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>OYL3W6VPjR/jevpWgri4MYg7bMP4XeB+2OfDy+NvgfU=</dsig:DigestValue>
<dsig:DigestValue>JxJzXoPwWMXX+nLudxuAsBNczogYyPusog32bR0W1cY=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>