diff options
| author | AShifter <[email protected]> | 2017-03-31 12:38:15 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-03-31 12:38:15 -0600 |
| commit | 6c4ae51afd730cfcb6ddb93486c6f0a4d36ea4c0 (patch) | |
| tree | fa9b07821f8bb61e456071ca8f3a35696dda57eb | |
| parent | e2213726e627553783571fa631dd032f773f8794 (diff) | |
| parent | 19ea483b2ba7974ffcfbe06b73c160a5ca418f45 (diff) | |
| download | histacom2-6c4ae51afd730cfcb6ddb93486c6f0a4d36ea4c0.tar.gz histacom2-6c4ae51afd730cfcb6ddb93486c6f0a4d36ea4c0.tar.bz2 histacom2-6c4ae51afd730cfcb6ddb93486c6f0a4d36ea4c0.zip | |
Merge pull request #18 from lempamo/master
webchat things
17 files changed, 238 insertions, 9 deletions
diff --git a/TimeHACK.Engine/WCMessageParser.cs b/TimeHACK.Engine/WCMessageParser.cs new file mode 100644 index 0000000..ed16afd --- /dev/null +++ b/TimeHACK.Engine/WCMessageParser.cs @@ -0,0 +1,24 @@ +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TimeHACK.Engine +{ + class WCMessageParser + { + public string ParseMessage(string json, int index, string user) + { + JObject message = JObject.Parse(JObject.Parse(json)["messages"][index].ToString()); + string newmsg = message["message"].ToString().Replace("@user", user); + return message["user"].ToString() + ": " + newmsg; + } + public int GetMessageDelay(string json, int index) + { + JObject message = JObject.Parse(JObject.Parse(json)["messages"][index].ToString()); + return message["delay"].ToObject<int>(); + } + } +} diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache Binary files differindex 0cba21a..4b8aab4 100644 --- a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache +++ b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt index 4e353bd..72e6bb9 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt @@ -36,3 +36,4 @@ D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Templat D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache Binary files differindex ae8d488..53df2c1 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache Binary files differindex 6f79d45..af4ea3d 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs new file mode 100644 index 0000000..4348cf3 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -0,0 +1,53 @@ +namespace TimeHACK.OS.Win95.Win95Apps +{ + partial class WebChat1998 + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.Chat = new System.Windows.Forms.Timer(this.components); + this.SuspendLayout(); + // + // Chat + // + this.Chat.Interval = 15000; + // + // WebChat1998 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Name = "WebChat1998"; + this.Size = new System.Drawing.Size(724, 482); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Timer Chat; + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs new file mode 100644 index 0000000..ce87665 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace TimeHACK.OS.Win95.Win95Apps +{ + public partial class WebChat1998 : UserControl + { + public WebChat1998() + { + InitializeComponent(); + } + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx new file mode 100644 index 0000000..51a63d1 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <metadata name="Chat.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>17, 17</value> + </metadata> +</root>
\ No newline at end of file diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 3564ab7..e265f99 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -7,14 +7,14 @@ <framework targetVersion="4.5.2" profile="Full" supportedRuntime="4.0.30319" /> </compatibleFrameworks> <dependency> - <dependentAssembly dependencyType="install" codebase="TimeHACK.exe.manifest" size="25059"> + <dependentAssembly dependencyType="install" codebase="TimeHACK.exe.manifest" size="25070"> <assemblyIdentity name="TimeHACK.exe" version="1.0.1.0" publicKeyToken="0000000000000000" language="en" processorArchitecture="msil" type="win32" /> <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>qaapyX2jr0UWaYXTbselFOkiBXRtz6ImXgg1+L1diVE=</dsig:DigestValue> + <dsig:DigestValue>FLFyLhgh/00187VHfEwpMWCgaYVgEkJOBemU56+LWss=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application index 83d1107..e265f99 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -7,14 +7,14 @@ <framework targetVersion="4.5.2" profile="Full" supportedRuntime="4.0.30319" /> </compatibleFrameworks> <dependency> - <dependentAssembly dependencyType="install" codebase="TimeHACK.exe.manifest" size="24638"> + <dependentAssembly dependencyType="install" codebase="TimeHACK.exe.manifest" size="25070"> <assemblyIdentity name="TimeHACK.exe" version="1.0.1.0" publicKeyToken="0000000000000000" language="en" processorArchitecture="msil" type="win32" /> <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>5a9h2X2t0Dj9rJMnIryLPsaET63h0tHbHFwSEBh2QPA=</dsig:DigestValue> + <dsig:DigestValue>FLFyLhgh/00187VHfEwpMWCgaYVgEkJOBemU56+LWss=</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 1d7c3d4..fb36093 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -63,7 +63,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>plR98K+NhvVW+NWDVr/6Ridl1ZBQjbEHLs+io1Ljf4k=</dsig:DigestValue> + <dsig:DigestValue>U7Kekeyx6Ql+9uqUNh8/OwQYQaKLz8r3pS1n2eI6994=</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>JcbRZTkAsDszUwGNpbxDF8k8HOqul6OO1xlMBp+H1As=</dsig:DigestValue> + <dsig:DigestValue>egCP83neM3apVMcIH6zkNIiRVob2rALwSMmYPhotJik=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> @@ -457,6 +457,15 @@ <dsig:DigestValue>yrDBF1QPiJUsw5OapnDIEykQ8dj5guyF87IFQaEAs2w=</dsig:DigestValue> </hash> </file> + <file name="Resources\WinClassic\Window\sliversilver.png" size="156"> + <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>T9l945vYoKcCSIEDDqot2H3OVrkVxqkoQ/E6pZokY8g=</dsig:DigestValue> + </hash> + </file> <file name="Resources\WinClassic\Window\TopLeft.png" size="170"> <hash> <dsig:Transforms> diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache Binary files differindex b21e519..3841497 100644 --- a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache +++ b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache Binary files differindex 7d7e180..d5b94ac 100644 --- a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache +++ b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt index c780125..bfcd8fb 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -68,7 +68,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.pdb C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK.Engine.dll C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK.Engine.pdb -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\Newtonsoft.Json.xml C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.exe.manifest C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.application C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.exe 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 e302cc7..25a7f6d 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 8d183db..ee86c18 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.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 3564ab7..e265f99 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -7,14 +7,14 @@ <framework targetVersion="4.5.2" profile="Full" supportedRuntime="4.0.30319" /> </compatibleFrameworks> <dependency> - <dependentAssembly dependencyType="install" codebase="TimeHACK.exe.manifest" size="25059"> + <dependentAssembly dependencyType="install" codebase="TimeHACK.exe.manifest" size="25070"> <assemblyIdentity name="TimeHACK.exe" version="1.0.1.0" publicKeyToken="0000000000000000" language="en" processorArchitecture="msil" type="win32" /> <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>qaapyX2jr0UWaYXTbselFOkiBXRtz6ImXgg1+L1diVE=</dsig:DigestValue> + <dsig:DigestValue>FLFyLhgh/00187VHfEwpMWCgaYVgEkJOBemU56+LWss=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> |
