diff options
| author | lempamo <[email protected]> | 2017-03-31 21:19:13 -0400 |
|---|---|---|
| committer | lempamo <[email protected]> | 2017-03-31 21:19:13 -0400 |
| commit | 6ecb36cc462081895a92ff7fb5b23f3259fc1f1e (patch) | |
| tree | 8512e8f97b3966c2870f854a33e55fd30df78de2 | |
| parent | 7841180fc0f60f6eb1fff1503f89ff2cad117e85 (diff) | |
| download | histacom2-6ecb36cc462081895a92ff7fb5b23f3259fc1f1e.tar.gz histacom2-6ecb36cc462081895a92ff7fb5b23f3259fc1f1e.tar.bz2 histacom2-6ecb36cc462081895a92ff7fb5b23f3259fc1f1e.zip | |
webchat1998 messages are working
29 files changed, 40 insertions, 30 deletions
diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo Binary files differindex dc49232..15137ab 100644 --- a/.vs/TimeHACK/v14/.suo +++ b/.vs/TimeHACK/v14/.suo diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll Binary files differindex 12776da..af31efa 100644 --- a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll +++ b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb Binary files differindex bcd072f..d19e0f7 100644 --- a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb +++ b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll Binary files differindex 12776da..af31efa 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb Binary files differindex bcd072f..d19e0f7 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index b849893..545a796 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -58,6 +58,7 @@ // Chat // this.Chat.Interval = 15000; + this.Chat.Tick += new System.EventHandler(this.Chat_Tick); // // listBox1 // diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 94179d6..fa0837f 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -14,6 +14,9 @@ namespace TimeHACK.OS.Win95.Win95Apps { public partial class WebChat1998 : UserControl { + int chat_index = 0; + WCMessageParser wcmp = new WCMessageParser(); + public WebChat1998() { InitializeComponent(); @@ -36,23 +39,30 @@ namespace TimeHACK.OS.Win95.Win95Apps TitleScreen.username = txtscreenname.Text; login.Hide(); listBox1.Items.Add(TitleScreen.username); - chatLoop(); + history.Text = "System: " + TitleScreen.username + " has joined the chat." + Environment.NewLine; + Chat.Start(); } - private void chatLoop() + private void Chat_Tick(object sender, EventArgs e) { - WCMessageParser wcmp = new WCMessageParser(); - Thread.Sleep(15000); - for (int i = 0; i < 200; i++) + history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine; + switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) { - history.Text = wcmp.ParseMessage(resources.GetString("convo"), i, TitleScreen.username); - switch (wcmp.GetSpecial(resources.GetString("convo"), i)) - { - default: - break; - } - Thread.Sleep(wcmp.GetMessageDelay(resources.GetString("convo"), i)); + case "addsh": + listBox1.Items.Add("SkyHigh"); + break; + case "nameguess": + typechat.Hide(); + button2.Hide(); + button3.Show(); + button4.Show(); + Chat.Stop(); + break; + default: + break; } + Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); + chat_index++; } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index db61d93..6734aab 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -161,7 +161,7 @@ }, { "user": "SkyHigh", - "delay": 500, + "delay": 1000, "message": "ill make 2 buttons pop up, you click the one you want to guess", "special": "nameguess", "userchat": true diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs index cd0b55c..fd182fa 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs @@ -1,4 +1,4 @@ -namespace TimeHACK.WinClassicForms +namespace TimeHACK.OS.Win95.Win95Apps { partial class WinClassicDownloader { diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs index 9df4811..418444a 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs @@ -1,8 +1,7 @@ using System; using System.Windows.Forms; -using TimeHACK.OS.Win95; -namespace TimeHACK.WinClassicForms +namespace TimeHACK.OS.Win95.Win95Apps { public partial class WinClassicDownloader : UserControl { diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll Binary files differindex 12776da..af31efa 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll +++ b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb Binary files differindex bcd072f..d19e0f7 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb +++ b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 3e20261..406cc0c 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -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>Y/rAJqdBIeeVdq8x9pd9jayNokuOTzXppfQCtfe7A8k=</dsig:DigestValue> + <dsig:DigestValue>3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe Binary files differindex 0c8fdea..991b339 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest index 106a594..7b1fe16 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ </dependentAssembly> </dependency> <dependency> - <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="5509120"> + <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="5510144"> <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>+7pai1S3Q/PZ9rTMRZLCxc+p+EzrZ2Tk18Rz8h9s7jY=</dsig:DigestValue> + <dsig:DigestValue>tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y=</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>SNU8shTRP8QXCifGeLuklgIPQZQs0gMJyA6LTOuPX5w=</dsig:DigestValue> + <dsig:DigestValue>/l7x7HD8hXvATQQVmOSM663LgsskkmOz8feGgd4LmY8=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb Binary files differindex e0ba070..f03f771 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.pdb +++ b/TimeHACK.Main/bin/Release/TimeHACK.pdb diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application index 3e20261..406cc0c 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -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>Y/rAJqdBIeeVdq8x9pd9jayNokuOTzXppfQCtfe7A8k=</dsig:DigestValue> + <dsig:DigestValue>3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 106a594..7b1fe16 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ </dependentAssembly> </dependency> <dependency> - <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="5509120"> + <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="5510144"> <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>+7pai1S3Q/PZ9rTMRZLCxc+p+EzrZ2Tk18Rz8h9s7jY=</dsig:DigestValue> + <dsig:DigestValue>tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y=</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>SNU8shTRP8QXCifGeLuklgIPQZQs0gMJyA6LTOuPX5w=</dsig:DigestValue> + <dsig:DigestValue>/l7x7HD8hXvATQQVmOSM663LgsskkmOz8feGgd4LmY8=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe Binary files differindex 0c8fdea..991b339 100644 --- a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe +++ b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt index eb0b568..b6ab8e4 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -25,8 +25,6 @@ C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK. C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK.Engine.pdb C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.Main.csprojResolveAssemblyReference.cache C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.TestApp.resources -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicDownloader.resources -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicIE4.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicInstaller.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.Properties.Resources.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.TitleScreen.resources @@ -37,3 +35,5 @@ C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK. C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.pdb C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Windows95.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache Binary files differindex 091a82b..63f6ace 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache Binary files differindex 71db36c..3be4ddc 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources Binary files differindex ef6fd62..06dec4b 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources +++ b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicDownloader.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources Binary files differindex 6c05a97..6c05a97 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicDownloader.resources +++ b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources Binary files differindex 9cbc1d1..9cbc1d1 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources +++ b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 3e20261..406cc0c 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -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>Y/rAJqdBIeeVdq8x9pd9jayNokuOTzXppfQCtfe7A8k=</dsig:DigestValue> + <dsig:DigestValue>3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe Binary files differindex 0c8fdea..991b339 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest index 106a594..7b1fe16 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ </dependentAssembly> </dependency> <dependency> - <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="5509120"> + <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="5510144"> <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>+7pai1S3Q/PZ9rTMRZLCxc+p+EzrZ2Tk18Rz8h9s7jY=</dsig:DigestValue> + <dsig:DigestValue>tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y=</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>SNU8shTRP8QXCifGeLuklgIPQZQs0gMJyA6LTOuPX5w=</dsig:DigestValue> + <dsig:DigestValue>/l7x7HD8hXvATQQVmOSM663LgsskkmOz8feGgd4LmY8=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb Binary files differindex e0ba070..f03f771 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.pdb +++ b/TimeHACK.Main/obj/Release/TimeHACK.pdb |
