From 586f0f740898cd7eb7cd59048ba8d59410b2f766 Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 31 Mar 2017 18:31:16 -0400 Subject: fixed tons of things --- .../TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 0 -> 1453 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources (limited to 'TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources') diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources new file mode 100644 index 0000000..ef6fd62 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources differ -- cgit v1.2.3 From 6ecb36cc462081895a92ff7fb5b23f3259fc1f1e Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 31 Mar 2017 21:19:13 -0400 Subject: webchat1998 messages are working --- .vs/TimeHACK/v14/.suo | Bin 131072 -> 131072 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 126976 -> 126976 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 32256 -> 32256 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 126976 -> 126976 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 32256 -> 32256 bytes .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 1 + TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 34 +++++++++++++-------- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 2 +- .../Win95Apps/WinClassicDownloader.Designer.cs | 2 +- .../OS/Win95/Win95Apps/WinClassicDownloader.cs | 3 +- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 126976 -> 126976 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 32256 -> 32256 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 5509120 -> 5510144 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 6 ++-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 122368 -> 124416 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 6 ++-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 5509120 -> 5510144 bytes .../TimeHACK.Main.csproj.FileListAbsolute.txt | 4 +-- .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4011 -> 4011 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 16573 -> 16573 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 1453 -> 1818 bytes ....Win95.Win95Apps.WinClassicDownloader.resources | Bin 0 -> 180 bytes ...HACK.OS.Win95.Win95Apps.WinClassicIE4.resources | Bin 0 -> 3209 bytes ....WinClassicForms.WinClassicDownloader.resources | Bin 180 -> 0 bytes ...imeHACK.WinClassicForms.WinClassicIE4.resources | Bin 3209 -> 0 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 5509120 -> 5510144 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 6 ++-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 122368 -> 124416 bytes 31 files changed, 40 insertions(+), 30 deletions(-) create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources delete mode 100644 TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicDownloader.resources delete mode 100644 TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources (limited to 'TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index dc49232..15137ab 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 12776da..af31efa 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 bcd072f..d19e0f7 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/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index 12776da..af31efa 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 bcd072f..d19e0f7 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/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 index 12776da..af31efa 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 bcd072f..d19e0f7 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 3e20261..406cc0c 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - Y/rAJqdBIeeVdq8x9pd9jayNokuOTzXppfQCtfe7A8k= + 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 0c8fdea..991b339 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 106a594..7b1fe16 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - +7pai1S3Q/PZ9rTMRZLCxc+p+EzrZ2Tk18Rz8h9s7jY= + tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= @@ -75,7 +75,7 @@ - SNU8shTRP8QXCifGeLuklgIPQZQs0gMJyA6LTOuPX5w= + /l7x7HD8hXvATQQVmOSM663LgsskkmOz8feGgd4LmY8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index e0ba070..f03f771 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 3e20261..406cc0c 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - Y/rAJqdBIeeVdq8x9pd9jayNokuOTzXppfQCtfe7A8k= + 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= 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 @@ - + - +7pai1S3Q/PZ9rTMRZLCxc+p+EzrZ2Tk18Rz8h9s7jY= + tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= @@ -75,7 +75,7 @@ - SNU8shTRP8QXCifGeLuklgIPQZQs0gMJyA6LTOuPX5w= + /l7x7HD8hXvATQQVmOSM663LgsskkmOz8feGgd4LmY8= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 0c8fdea..991b339 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/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 index 091a82b..63f6ace 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 71db36c..3be4ddc 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.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources index ef6fd62..06dec4b 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources 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 new file mode 100644 index 0000000..9cbc1d1 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicDownloader.resources b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicDownloader.resources deleted file mode 100644 index 6c05a97..0000000 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicDownloader.resources and /dev/null differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources deleted file mode 100644 index 9cbc1d1..0000000 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources and /dev/null differ 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 @@ - Y/rAJqdBIeeVdq8x9pd9jayNokuOTzXppfQCtfe7A8k= + 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 0c8fdea..991b339 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 106a594..7b1fe16 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - +7pai1S3Q/PZ9rTMRZLCxc+p+EzrZ2Tk18Rz8h9s7jY= + tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= @@ -75,7 +75,7 @@ - SNU8shTRP8QXCifGeLuklgIPQZQs0gMJyA6LTOuPX5w= + /l7x7HD8hXvATQQVmOSM663LgsskkmOz8feGgd4LmY8= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index e0ba070..f03f771 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From 20dcdbf96d65bd92feec3509cd586cc324fb46c7 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Apr 2017 16:28:34 -0400 Subject: webchat extra things --- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 21 ++++++++++++++-- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 27 ++++++++++++++++++--- TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 5510144 -> 5512192 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 4 +-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 4 +-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 5510144 -> 5512192 bytes .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4011 -> 4011 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 1818 -> 2729 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 5510144 -> 5512192 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 4 +-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes 15 files changed, 52 insertions(+), 14 deletions(-) (limited to 'TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index c18ba20..4c5e8bf 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -37,6 +37,12 @@ namespace TimeHACK.OS.Win95.Win95Apps wm.startInfobox95("Invalid Username", "Your username cannot be blank."); return; } + else if (txtscreenname.Text.Length > 12) + { + WindowManager wm = new WindowManager(); + wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters."); + return; + } ParentForm.AcceptButton = button2; TitleScreen.username = txtscreenname.Text; login.Hide(); @@ -88,16 +94,27 @@ namespace TimeHACK.OS.Win95.Win95Apps private void Button2_Click(object sender, EventArgs e) { if (typechat.Text != "") history.Text += TitleScreen.username + ": " + typechat.Text + Environment.NewLine; + typechat.Text = ""; } private void Button3_Click(object sender, EventArgs e) { - correctname = true; Chat.Start(); + correctname = false; + button2.Show(); + button3.Hide(); + button4.Hide(); + typechat.Show(); + Chat.Start(); } private void Button4_Click(object sender, EventArgs e) { - correctname = false; Chat.Start(); + correctname = true; + button2.Show(); + button3.Hide(); + button4.Hide(); + typechat.Show(); + Chat.Start(); } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index 7ab7db0..1ea52b5 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -133,7 +133,7 @@ }, { "user": "SkyHigh", - "delay": 6000, + "delay": 5000, "message": "damn", "special": null, "userchat": true @@ -183,16 +183,37 @@ { "user": "SkyHigh", "delay": 6000, - "message": "hey man", + "message": "hey rain", "special": null, "userchat": true }, { "user": "SkyHigh", - "delay": 6000, + "delay": 4000, "message": "ive sort of been waiting", "special": null, "userchat": true + }, + { + "user": "rain49", + "delay": 5000, + "message": "sorry man", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 4000, + "message": "it took a while for this to load", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 4000, + "message": "anyway... let's get to it", + "special": null, + "userchat": true } ] } diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 406cc0c..3a27e18 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= + cp4mv+tX+6jJBhJbheR3r1fcQrhLwE/0ZofeJX+Q2g8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 991b339..ccbc1c9 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 7b1fe16..f6a6b80 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= + Tror80yNARQdUqLmtn1yi8lJbJvktcZSmWBERAPGH+E= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index f03f771..f28cad0 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 406cc0c..3a27e18 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= + cp4mv+tX+6jJBhJbheR3r1fcQrhLwE/0ZofeJX+Q2g8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 7b1fe16..f6a6b80 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ - + - tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= + Tror80yNARQdUqLmtn1yi8lJbJvktcZSmWBERAPGH+E= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 991b339..ccbc1c9 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/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 63f6ace..237f406 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.OS.Win95.Win95Apps.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources index 06dec4b..86e74b5 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 406cc0c..3a27e18 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= + cp4mv+tX+6jJBhJbheR3r1fcQrhLwE/0ZofeJX+Q2g8= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 991b339..ccbc1c9 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 7b1fe16..f6a6b80 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= + Tror80yNARQdUqLmtn1yi8lJbJvktcZSmWBERAPGH+E= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index f03f771..f28cad0 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From ecd5324b48a1ed84bdbddb43040cb5ac8aa426a9 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Apr 2017 16:32:53 -0400 Subject: set start sound to play slightly earlier --- TimeHACK.Main/OS/Win95/Win95.cs | 10 +++++----- TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 5512192 -> 5512704 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 4 ++-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 4 ++-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 5512192 -> 5512704 bytes .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4011 -> 4011 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 2729 -> 2880 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 5512192 -> 5512704 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 4 ++-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources') diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 260d909..6ca7f10 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -26,6 +26,11 @@ namespace TimeHACK.OS.Win95 // When New Game is clicked in TitleScreen.cs private void Desktop_Load(object sender, EventArgs e) { + // Play Windows 95 Start Sound + Stream audio = Properties.Resources.Win95Start; + startsound = new SoundPlayer(audio); + startsound.Play(); + // Hide the Startmenu startmenu.Hide(); @@ -38,11 +43,6 @@ namespace TimeHACK.OS.Win95 // Start the ClockTimer clockTimer.Start(); - // Play Windows 95 Start Sound - Stream audio = Properties.Resources.Win95Start; - startsound = new SoundPlayer(audio); - startsound.Play(); - // Set the StartMenu seperator startmenuitems.Items.Insert(6, new ToolStripSeparator()); diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 3a27e18..46a7c1b 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - cp4mv+tX+6jJBhJbheR3r1fcQrhLwE/0ZofeJX+Q2g8= + VGG8ydFiCkHRvcc+GBL93k6JCjK6F0iaeOA/kJ0EPVk= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index ccbc1c9..84a6386 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 f6a6b80..716c82e 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - Tror80yNARQdUqLmtn1yi8lJbJvktcZSmWBERAPGH+E= + AA5GUYnej7l+rvlbmSceLm12rMsQFQOIkVXTFht7gR0= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index f28cad0..42e946f 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 3a27e18..46a7c1b 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - cp4mv+tX+6jJBhJbheR3r1fcQrhLwE/0ZofeJX+Q2g8= + VGG8ydFiCkHRvcc+GBL93k6JCjK6F0iaeOA/kJ0EPVk= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index f6a6b80..716c82e 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ - + - Tror80yNARQdUqLmtn1yi8lJbJvktcZSmWBERAPGH+E= + AA5GUYnej7l+rvlbmSceLm12rMsQFQOIkVXTFht7gR0= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index ccbc1c9..84a6386 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/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 237f406..9966ca6 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.OS.Win95.Win95Apps.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources index 86e74b5..710aa84 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 3a27e18..46a7c1b 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - cp4mv+tX+6jJBhJbheR3r1fcQrhLwE/0ZofeJX+Q2g8= + VGG8ydFiCkHRvcc+GBL93k6JCjK6F0iaeOA/kJ0EPVk= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index ccbc1c9..84a6386 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 f6a6b80..716c82e 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - Tror80yNARQdUqLmtn1yi8lJbJvktcZSmWBERAPGH+E= + AA5GUYnej7l+rvlbmSceLm12rMsQFQOIkVXTFht7gR0= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index f28cad0..42e946f 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From ddb713407859352c35fa3a9644aedcafbd8584c4 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Apr 2017 18:29:26 -0400 Subject: fixed font --- .vs/TimeHACK/v14/.suo | Bin 131072 -> 131072 bytes TimeHACK.Main/OS/Win95/Win95.Designer.cs | 4 ++-- TimeHACK.Main/OS/Win95/Win95.cs | 17 +++++++++++++++ TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 23 ++++++++++++++++++++- TimeHACK.Main/TitleScreen.cs | 1 + TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 5512704 -> 5488128 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 4 ++-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 4 ++-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 5512704 -> 5488128 bytes .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4011 -> 4011 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 2880 -> 4277 bytes .../Release/TimeHACK.OS.Win95.Windows95.resources | Bin 162603 -> 137217 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 5512704 -> 5488128 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 4 ++-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes 19 files changed, 51 insertions(+), 12 deletions(-) (limited to 'TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 15137ab..870ac10 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 7628e46..8221889 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -229,7 +229,7 @@ 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(144, 311); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -284,7 +284,7 @@ this.AccessoriesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AccessoriesToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.AccessoriesToolStripMenuItem.Name = "AccessoriesToolStripMenuItem"; - this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(184, 26); this.AccessoriesToolStripMenuItem.Text = "Accessories"; // // CommunicationsToolStripMenuItem diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 6ca7f10..8efa6d3 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -26,6 +26,9 @@ namespace TimeHACK.OS.Win95 // When New Game is clicked in TitleScreen.cs private void Desktop_Load(object sender, EventArgs e) { + // Make Font Mandatory + fontLoad(); + // Play Windows 95 Start Sound Stream audio = Properties.Resources.Win95Start; startsound = new SoundPlayer(audio); @@ -49,6 +52,20 @@ namespace TimeHACK.OS.Win95 this.SendToBack(); } + private void fontLoad() + { + this.taskbartime.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ProgramsToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.DocumentsToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.SettingsToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.FindToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.HelpToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.RunToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.SuspendToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ShutdownToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.desktopicons.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + } + #region StartMenu // Paint StartMenu diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index db829e3..d20d707 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -252,10 +252,31 @@ }, { "user": "rain49", - "delay": 3000, + "delay": 5000, "message": "right, that", "special": null, "userchat": true + }, + { + "user": "rain49", + "delay": 3500, + "message": "since he's here should we just tell him?", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2500, + "message": "well i suppose we have to", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 2500, + "message": "ok then", + "special": null, + "userchat": true } ] } diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index 4cd9043..38086b9 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -47,6 +47,7 @@ namespace TimeHACK // Initialize Font pfc.AddFontFile(AppDomain.CurrentDomain.BaseDirectory + "\\LeviWindows.ttf"); + gameversion.Font = new Font(pfc.Families[0], 16F, FontStyle.Bold, GraphicsUnit.Point, (0)); // Start the VM Mode timer vmModeTimer.Start(); diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 46a7c1b..f2f8480 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - VGG8ydFiCkHRvcc+GBL93k6JCjK6F0iaeOA/kJ0EPVk= + 6MuDghOX8Wol+CMA46s4ZSHKmlZueYu5xV8CBVmiN5g= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 84a6386..bb82bb7 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 716c82e..f45e923 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - AA5GUYnej7l+rvlbmSceLm12rMsQFQOIkVXTFht7gR0= + gRboXh/lVHhw5uJ901V8Zmg4BAnhmp+nImuxQADJew8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 42e946f..623bf90 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 46a7c1b..f2f8480 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - VGG8ydFiCkHRvcc+GBL93k6JCjK6F0iaeOA/kJ0EPVk= + 6MuDghOX8Wol+CMA46s4ZSHKmlZueYu5xV8CBVmiN5g= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 716c82e..f45e923 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ - + - AA5GUYnej7l+rvlbmSceLm12rMsQFQOIkVXTFht7gR0= + gRboXh/lVHhw5uJ901V8Zmg4BAnhmp+nImuxQADJew8= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 84a6386..bb82bb7 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/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 9966ca6..4347c4d 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.OS.Win95.Win95Apps.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources index 710aa84..09910d8 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.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 2337d1d..52102be 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 46a7c1b..f2f8480 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - VGG8ydFiCkHRvcc+GBL93k6JCjK6F0iaeOA/kJ0EPVk= + 6MuDghOX8Wol+CMA46s4ZSHKmlZueYu5xV8CBVmiN5g= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 84a6386..bb82bb7 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 716c82e..f45e923 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - AA5GUYnej7l+rvlbmSceLm12rMsQFQOIkVXTFht7gR0= + gRboXh/lVHhw5uJ901V8Zmg4BAnhmp+nImuxQADJew8= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 42e946f..623bf90 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From db3a41715a3d49c275fd924f1d590de2956d972f Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 2 Apr 2017 20:07:39 -0400 Subject: more convo --- .vs/TimeHACK/v14/.suo | Bin 129536 -> 74240 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 0 -> 9073 bytes ...tedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs | 0 ...tedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs | 0 ...tedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs | 0 .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 1 + TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 10 ++++++++++ TimeHACK.Main/Properties/Resources.Designer.cs | 9 +++++++++ TimeHACK.Main/Properties/Resources.resx | 3 +++ TimeHACK.Main/Resources/WinClassic/AIMfile.wav | Bin 0 -> 4480 bytes TimeHACK.Main/TimeHACK.Main.csproj | 1 + TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 6063104 -> 6072320 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 4 ++-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 126464 -> 126464 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 4 ++-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 6063104 -> 6072320 bytes .../DesignTimeResolveAssemblyReferences.cache | Bin 46739 -> 37593 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 12438 -> 12533 bytes .../TempPE/Properties.Resources.Designer.cs.dll | Bin 9728 -> 9728 bytes .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4414 -> 4466 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 4277 -> 8933 bytes .../TimeHACK.Properties.Resources.resources | Bin 4706819 -> 4711331 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 6063104 -> 6072320 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 4 ++-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 126464 -> 126464 bytes 28 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache create mode 100644 TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs create mode 100644 TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs create mode 100644 TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs create mode 100644 TimeHACK.Main/Resources/WinClassic/AIMfile.wav (limited to 'TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 1fe43f0..3b72b36 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 0000000..bac2e0d Binary files /dev/null and b/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs new file mode 100644 index 0000000..e69de29 diff --git a/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs new file mode 100644 index 0000000..e69de29 diff --git a/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs new file mode 100644 index 0000000..e69de29 diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index af44554..9ab490a 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -87,6 +87,7 @@ this.history.ReadOnly = true; this.history.Size = new System.Drawing.Size(471, 377); this.history.TabIndex = 2; + this.history.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; // // panel1 // diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 714df9d..de03b93 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -26,6 +26,7 @@ namespace TimeHACK.OS.Win95.Win95Apps SoundPlayer leave = new SoundPlayer(Properties.Resources.AIMbuddyleave); SoundPlayer send = new SoundPlayer(Properties.Resources.AIMmessagesent); SoundPlayer receive = new SoundPlayer(Properties.Resources.AIMmessagereceived); + SoundPlayer file = new SoundPlayer(Properties.Resources.AIMfile); public WebChat1998() { @@ -76,6 +77,15 @@ namespace TimeHACK.OS.Win95.Win95Apps listBox1.Items.Add("rain49"); join.Play(); break; + case "addfile": + label5.Show(); + button5.Show(); + file.Play(); + break; + case "addpadams": + listBox1.Items.Add("12padams"); + join.Play(); + break; default: receive.Play(); break; diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index 96efd85..99c111c 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -98,6 +98,15 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream AIMfile { + get { + return ResourceManager.GetStream("AIMfile", resourceCulture); + } + } + /// /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. /// diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index 0970029..a4c1ad4 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -271,4 +271,7 @@ ..\Resources\WinClassic\Win95Warning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\AIMfile.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/TimeHACK.Main/Resources/WinClassic/AIMfile.wav b/TimeHACK.Main/Resources/WinClassic/AIMfile.wav new file mode 100644 index 0000000..6cc1b03 Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/AIMfile.wav differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index ea3b6a5..f96308a 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -238,6 +238,7 @@ + diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 1ac6496..448f3b1 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - TOmxfxrtinnOLMjWVtEuPI+MbEQOTMUMBIHGdANvS4w= + yEpghepPJm2OR2eU+1oEJSm3j1Th0B6L8j0AMtQRmno= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index e932d4b..aeb38a4 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 1fc268d..f0eb98d 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - 2lQG5DuYfrjHinXdd6VN7jq0gbfhQ+37R6XchZjlGkA= + 6Sf/XpiBIlZvEldzdG+VHPYw/v9Bah4Uj33huneKlIA= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index bafcdad..cc3a8cb 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 1ac6496..448f3b1 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - TOmxfxrtinnOLMjWVtEuPI+MbEQOTMUMBIHGdANvS4w= + yEpghepPJm2OR2eU+1oEJSm3j1Th0B6L8j0AMtQRmno= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 1fc268d..f0eb98d 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ - + - 2lQG5DuYfrjHinXdd6VN7jq0gbfhQ+37R6XchZjlGkA= + 6Sf/XpiBIlZvEldzdG+VHPYw/v9Bah4Uj33huneKlIA= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index e932d4b..aeb38a4 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 e6e9e54..f6d7c8b 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 fa0e958..0e41898 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/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll index 637a1b6..9f3fa70 100644 Binary files a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index d4a9233..eae23d0 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.OS.Win95.Win95Apps.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources index 09910d8..422a86f 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources index c7b9137..cb99be0 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 1ac6496..448f3b1 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - TOmxfxrtinnOLMjWVtEuPI+MbEQOTMUMBIHGdANvS4w= + yEpghepPJm2OR2eU+1oEJSm3j1Th0B6L8j0AMtQRmno= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index e932d4b..aeb38a4 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 1fc268d..f0eb98d 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - 2lQG5DuYfrjHinXdd6VN7jq0gbfhQ+37R6XchZjlGkA= + 6Sf/XpiBIlZvEldzdG+VHPYw/v9Bah4Uj33huneKlIA= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index bafcdad..cc3a8cb 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From a428bf2117d61d92e41e48454601a4e788847e9e Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 9 Apr 2017 12:31:17 -0400 Subject: gave proper font to ie4 --- .vs/TimeHACK/v14/.suo | Bin 91136 -> 90624 bytes TimeHACK.Engine/WindowManager.cs | 2 +- TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 128512 -> 128512 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 34304 -> 34304 bytes .../TimeHACK.Engine.csproj.GenerateResource.Cache | Bin 2186 -> 2186 bytes ...ACK.Engine.csprojResolveAssemblyReference.cache | Bin 12307 -> 12307 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 128512 -> 128512 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 34304 -> 34304 bytes TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs | 3 +++ TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 128512 -> 128512 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 34304 -> 34304 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 6084608 -> 6085120 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 6 +++--- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 126464 -> 126464 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 6 +++--- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 6084608 -> 6085120 bytes .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4466 -> 4466 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 16573 -> 16573 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 8933 -> 9300 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 6084608 -> 6085120 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 6 +++--- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 126464 -> 126464 bytes 25 files changed, 16 insertions(+), 13 deletions(-) (limited to 'TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 3af87aa..3121aa1 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs index 65a0ec5..d0a95c0 100644 --- a/TimeHACK.Engine/WindowManager.cs +++ b/TimeHACK.Engine/WindowManager.cs @@ -20,7 +20,7 @@ namespace TimeHACK.Engine app.Height = content.Height + 26; // Initialize Font pfc.AddFontFile(AppDomain.CurrentDomain.BaseDirectory + "\\LeviWindows.ttf"); - Font fnt = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + Font fnt = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0))); app.fnt = fnt; app.Title.Font = new Font(pfc.Families[0], 16F, FontStyle.Bold, GraphicsUnit.Point, ((0))); // Setup UC diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 97fd8a4..e93af1f 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 890f0ad..11be1ff 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/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache index f42b4f1..2677bc2 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 9c37d45..8ccb9e7 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 97fd8a4..e93af1f 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 890f0ad..11be1ff 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/Win95Apps/WinClassicIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs index 912fc8f..2e24707 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs @@ -4,6 +4,7 @@ using System.Drawing; using System.Runtime.InteropServices; using System.Windows.Forms; using TimeHACK.Engine; +using TimeHACK.Engine.Template; namespace TimeHACK.OS.Win95.Win95Apps { @@ -25,6 +26,8 @@ namespace TimeHACK.OS.Win95.Win95Apps for (int i = 0; i < 99; i++) browsinghistory.Add(null); welcomeinternetscreen.Show(); welcomeinternetscreen.Dock = DockStyle.Fill; + 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))); } private void hidePrograms() diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 97fd8a4..e93af1f 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 890f0ad..11be1ff 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 91a4988..dac5a57 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - AHNSlVj9yGqnbWwZ5WJ9a3PfbFC0x/6rR+NF8e0+HRE= + NPPQU3eZPg9VYsMI8zzYwjTVZyhPzOu7JQcT9v+dVPE= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 43c28ee..4f883c3 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 b844f45..82c4991 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - RYBUjsa41WJwxPHbRQU9W5p8HisGpfawoO64ibhu7cs= + sg+cAmnQCtjTRcJPoSgIt5uLHDtxRN2+4qv+uqe9qnM= @@ -75,7 +75,7 @@ - xoZRkVavtqwej84SMc+bgzTWybYfLR7XwCK73qumD+A= + JAnAd0u95lqauWOELUbGcbTzY3B2RFHUd67yDt9U4Co= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 5b6585b..fd6a1fa 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 91a4988..dac5a57 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - AHNSlVj9yGqnbWwZ5WJ9a3PfbFC0x/6rR+NF8e0+HRE= + NPPQU3eZPg9VYsMI8zzYwjTVZyhPzOu7JQcT9v+dVPE= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index b844f45..82c4991 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ - + - RYBUjsa41WJwxPHbRQU9W5p8HisGpfawoO64ibhu7cs= + sg+cAmnQCtjTRcJPoSgIt5uLHDtxRN2+4qv+uqe9qnM= @@ -75,7 +75,7 @@ - xoZRkVavtqwej84SMc+bgzTWybYfLR7XwCK73qumD+A= + JAnAd0u95lqauWOELUbGcbTzY3B2RFHUd67yDt9U4Co= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 43c28ee..4f883c3 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/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 7183732..0e05730 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 fec33e3..535925f 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.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources index 422a86f..d7b182d 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 91a4988..dac5a57 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - AHNSlVj9yGqnbWwZ5WJ9a3PfbFC0x/6rR+NF8e0+HRE= + NPPQU3eZPg9VYsMI8zzYwjTVZyhPzOu7JQcT9v+dVPE= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 43c28ee..4f883c3 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 b844f45..82c4991 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - RYBUjsa41WJwxPHbRQU9W5p8HisGpfawoO64ibhu7cs= + sg+cAmnQCtjTRcJPoSgIt5uLHDtxRN2+4qv+uqe9qnM= @@ -75,7 +75,7 @@ - xoZRkVavtqwej84SMc+bgzTWybYfLR7XwCK73qumD+A= + JAnAd0u95lqauWOELUbGcbTzY3B2RFHUd67yDt9U4Co= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 5b6585b..fd6a1fa 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From be95039389999476d338e3f27ab94dad598e568e Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 14 Apr 2017 19:27:36 -0400 Subject: 12padams is removing things! --- .vs/TimeHACK/v14/.suo | Bin 96256 -> 95744 bytes TimeHACK.Engine/BSODCreator.cs | 12 +- TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 164864 -> 165376 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 46592 -> 46592 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 164864 -> 165376 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 46592 -> 46592 bytes TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 32 ++- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 232 ++++++++++++++++++++- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 164864 -> 165376 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 46592 -> 46592 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 6123008 -> 6128640 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 8 +- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 136704 -> 136704 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 8 +- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 6123008 -> 6128640 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 16573 -> 16573 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 9300 -> 14314 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 6123008 -> 6128640 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 8 +- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 136704 -> 136704 bytes 23 files changed, 283 insertions(+), 23 deletions(-) (limited to 'TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 74e305a..903e396 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/BSODCreator.cs b/TimeHACK.Engine/BSODCreator.cs index fe19dfd..59eeb16 100644 --- a/TimeHACK.Engine/BSODCreator.cs +++ b/TimeHACK.Engine/BSODCreator.cs @@ -15,7 +15,8 @@ namespace TimeHACK.Engine public enum BSODCauses { Testing, - ExitChat98Early + WimpEnding, + PiracyEnding, } public Win9XBSOD throw9XBSOD(bool except, BSODCauses type) @@ -33,9 +34,16 @@ namespace TimeHACK.Engine case BSODCauses.Testing: bsod.textBox1.Text = "This is the testing type of BSOD. Hurrah."; break; - case BSODCauses.ExitChat98Early: + case BSODCauses.WimpEnding: bsod.textBox1.Text = "An unknown but fatal exception has occured has occured in the program \"wchat98.exe\". The current processes will be terminated."; break; + case BSODCauses.PiracyEnding: + bsod.textBox1.Text = "Vital elements of Windows were removed, but recovered. However, your data has been lost."; + bsod.BackColor = System.Drawing.Color.Black; + foreach (Control ctrl in bsod.Controls) ctrl.ForeColor = System.Drawing.Color.Silver; + bsod.label1.BackColor = System.Drawing.Color.Silver; + bsod.label1.ForeColor = System.Drawing.Color.Black; + break; default: break; } diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 6cbffa8..f5117fb 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 f410e47..100b587 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/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index 6cbffa8..f5117fb 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 f410e47..100b587 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/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index afca54c..1f00286 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -31,12 +31,15 @@ namespace TimeHACK.OS.Win95.Win95Apps BSODCreator bc = new BSODCreator(); Win9XBSOD bsod = null; + Win9XBSOD bsod2 = null; public WebChat1998() { InitializeComponent(); - bsod = bc.throw9XBSOD(false, BSODCreator.BSODCauses.ExitChat98Early); + bsod = bc.throw9XBSOD(false, BSODCreator.BSODCauses.WimpEnding); + bsod2 = bc.throw9XBSOD(false, BSODCreator.BSODCauses.PiracyEnding); bsod.Hide(); + bsod2.Hide(); } private void WebChat1998_Load(object sender, EventArgs e) { @@ -50,6 +53,7 @@ namespace TimeHACK.OS.Win95.Win95Apps if (txtscreenname.Text == "") { wm.startInfobox95("Invalid Username", "Your username cannot be blank.", Properties.Resources.Win95Warning); return; } if (txtscreenname.Text.Length > 12) { wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters.", Properties.Resources.Win95Warning); return; } if (txtscreenname.Text.Contains(" ")) { wm.startInfobox95("Invalid Username", "Your username cannot contain spaces.", Properties.Resources.Win95Warning); return; } + if (txtscreenname.Text == "SkyHigh" | txtscreenname.Text == "rain49" | txtscreenname.Text == "12padams") { wm.startInfobox95("Invalid Username", "That username is already taken.", Properties.Resources.Win95Warning); return; } ParentForm.AcceptButton = button2; TitleScreen.username = txtscreenname.Text; login.Hide(); @@ -93,12 +97,36 @@ namespace TimeHACK.OS.Win95.Win95Apps listBox1.Items.Add("12padams"); join.Play(); ((WinClassic)this.ParentForm).closeDisabled = true; + TitleScreen.frm95.startbutton.Enabled = false; + TitleScreen.frm95.startmenu.Hide(); + break; + case "nostart": + TitleScreen.frm95.startbutton.Hide(); + TitleScreen.frm95.startmenu.Hide(); + receive.Play(); + break; + case "removerain": + listBox1.Items.Remove("rain49"); + leave.Play(); + break; + case "iconsded": + TitleScreen.frm95.desktopicons.Enabled = false; + receive.Play(); + break; + case "taskbarded": + TitleScreen.frm95.taskbar.Hide(); + receive.Play(); + break; + case "iconsgone": + TitleScreen.frm95.desktopicons.Hide(); + receive.Play(); break; default: receive.Play(); break; } - Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); + if (TitleScreen.username == "devspeed") Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index) / 2; + else Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); } else { diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index 30ebbbf..6f40ce8 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -455,21 +455,21 @@ }, { "user": "SkyHigh", - "delay": 3000, + "delay": 2000, "message": "OH THIS IS SO COOL", "special": null, "userchat": true }, { "user": "SkyHigh", - "delay": 4000, + "delay": 3000, "message": "lemme send a screenshot", "special": null, "userchat": true }, { "user": "System", - "delay": 2000, + "delay": 1500, "message": "12padams has joined the chat.", "special": "addpadams", "userchat": true @@ -483,10 +483,234 @@ }, { "user": "SkyHigh", - "delay": 500, + "delay": 1000, "message": "ah NO WE ARE DED", "special": null, "userchat": true + }, + { + "user": "rain49", + "delay": 2500, + "message": "quick guys, LOGOUT!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 1000, + "message": "i cant! the close button isnt working!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 2500, + "message": "caught ya pirating my software!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 1500, + "message": "now that i have you, lets have some fun, shall we?", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 1500, + "message": "guys, shutdown the pc from start!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 2000, + "message": "not so fast!", + "special": "nostart", + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2500, + "message": "where did the start button go?", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 2000, + "message": "12padams disabled it, CRAP!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3500, + "message": "feeling scared yet?", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 3500, + "message": "no, cuz i can just unplug my computer!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3500, + "message": "i wouldnt do that if i were you..", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 1000, + "message": "oh yeah? just watch this!", + "special": null, + "userchat": true + }, + { + "user": "System", + "delay": 1500, + "message": "rain49 has left the chat.", + "special": "removerain", + "userchat": true + }, + { + "user": "12padams", + "delay": 3500, + "message": "all your computers are infected with a virus that makes them unable to boot.", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 2500, + "message": "and now, theres only two, SkyHigh, and @user.", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 5000, + "message": "please just let us go!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 2500, + "message": "you downloaded pirated software, so you both shall be punished!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 5000, + "message": "dont worry @user, ill look online for help!", + "special": "iconsded", + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 3000, + "message": "why cant i open anything?", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 4500, + "message": "i told you that you are going to be punished.", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3000, + "message": "your computers have a lethal virus that i call \"Win9X.Plague\"", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 6000, + "message": "what does it do?", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3000, + "message": "well, it disables your computers functions one by one, slowly killing it", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3000, + "message": "anyways, time to let it do its work!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2500, + "message": "no please dont, just remove this virus!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 6000, + "message": "remove the virus, you say?", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3500, + "message": "well the whole of windows 95 is a virus! now where do i begin...", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 4500, + "message": "i see a taskbar at the bottom of the screen.", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 4000, + "message": "the taskbar was made by microsoft making its debut in windows 95", + "special": "taskbarded", + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 7000, + "message": "hey! give me back my taskbar!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 4000, + "message": "you wanted me to remove viruses, didnt you? the taskbar was infected since it had no start button", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 2500, + "message": "and your icons are infected too so you dont need them", + "special": "iconsgone", + "userchat": true } ] } diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 6cbffa8..f5117fb 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 f410e47..100b587 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 e6ec21d..c014c7a 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 4RJxw03br+02dW7jp/y7zHQVuVqcJmxeHNyeolzflek= + 280QjWVlYQjCBDxeMKnZhpfLYyCD8hQ252nxOzrnKz8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 06a2beb..39b2aac 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 5843c47..8561823 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - XzGyLNLUI8xxaFC/WQkrVvjTa+n1zH1fDVgt9LI1Ti4= + QnQUcSTfQVzISU/NuYJScvj2sxMdP7Iger7YDqQZ8+4= - + - RaVKLDtR2Irzt5BzJ26m/EQk5rBJQj/W7mmhGLfilus= + 8lvNmgG2aw+p698BkPPiKQFjbo6S/6MYNtB4CWS1dZ8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 4abf160..0661141 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 e6ec21d..c014c7a 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - 4RJxw03br+02dW7jp/y7zHQVuVqcJmxeHNyeolzflek= + 280QjWVlYQjCBDxeMKnZhpfLYyCD8hQ252nxOzrnKz8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 5843c47..8561823 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,26 +56,26 @@ - + - XzGyLNLUI8xxaFC/WQkrVvjTa+n1zH1fDVgt9LI1Ti4= + QnQUcSTfQVzISU/NuYJScvj2sxMdP7Iger7YDqQZ8+4= - + - RaVKLDtR2Irzt5BzJ26m/EQk5rBJQj/W7mmhGLfilus= + 8lvNmgG2aw+p698BkPPiKQFjbo6S/6MYNtB4CWS1dZ8= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 06a2beb..39b2aac 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/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index 324e2c5..c01182e 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.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources index d7b182d..0ae036b 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index e6ec21d..c014c7a 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 4RJxw03br+02dW7jp/y7zHQVuVqcJmxeHNyeolzflek= + 280QjWVlYQjCBDxeMKnZhpfLYyCD8hQ252nxOzrnKz8= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 06a2beb..39b2aac 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 5843c47..8561823 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - XzGyLNLUI8xxaFC/WQkrVvjTa+n1zH1fDVgt9LI1Ti4= + QnQUcSTfQVzISU/NuYJScvj2sxMdP7Iger7YDqQZ8+4= - + - RaVKLDtR2Irzt5BzJ26m/EQk5rBJQj/W7mmhGLfilus= + 8lvNmgG2aw+p698BkPPiKQFjbo6S/6MYNtB4CWS1dZ8= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 4abf160..0661141 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3