From abe52183e0e34051196d72ac0e56733bd0749bdd Mon Sep 17 00:00:00 2001 From: Michael VanOverbeek Date: Mon, 25 Jul 2016 14:30:01 -0400 Subject: Fix Cheats and some designer stuff --- source/.vs/ShiftOS/v14/.suo | Bin 187392 -> 28160 bytes source/ShiftUI/bin/Debug/ShiftUI.dll | Bin 2656768 -> 2656768 bytes source/ShiftUI/bin/Debug/ShiftUI.pdb | Bin 6602240 -> 6589952 bytes .../obj/Debug/ShiftUI.csproj.FileListAbsolute.txt | 8 ++++++++ .../Debug/ShiftUI.csproj.GenerateResource.Cache | Bin 1347 -> 1347 bytes .../ShiftUI.csprojResolveAssemblyReference.cache | Bin 48632 -> 62307 bytes source/ShiftUI/obj/Debug/ShiftUI.dll | Bin 2656768 -> 2656768 bytes source/ShiftUI/obj/Debug/ShiftUI.pdb | Bin 6602240 -> 6589952 bytes source/WindowsFormsApplication1/Apps/Cheats.cs | 4 ---- .../CreditScroller.Designer.cs | 2 +- .../Desktop/ShiftOSDesktop.Designer.cs | 2 +- .../WindowsFormsApplication1/bin/Debug/ShiftOS.exe | Bin 8097280 -> 8160768 bytes .../WindowsFormsApplication1/bin/Debug/ShiftOS.pdb | Bin 1646080 -> 1656320 bytes .../WindowsFormsApplication1/bin/Debug/ShiftUI.dll | Bin 2656768 -> 2656768 bytes .../WindowsFormsApplication1/bin/Debug/ShiftUI.pdb | Bin 6602240 -> 6589952 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 50516 -> 50420 bytes .../obj/Debug/ShiftOS.Apps.About.resources | Bin 0 -> 59170 bytes .../obj/Debug/ShiftOS.File_Skimmer.resources | Bin 12317 -> 10161 bytes .../Debug/ShiftOS.Properties.Resources.resources | Bin 6862192 -> 6862220 bytes .../obj/Debug/ShiftOS.csproj.FileListAbsolute.txt | 1 + .../Debug/ShiftOS.csproj.GenerateResource.Cache | Bin 22454 -> 22657 bytes .../ShiftOS.csprojResolveAssemblyReference.cache | Bin 224852 -> 224852 bytes .../WindowsFormsApplication1/obj/Debug/ShiftOS.exe | Bin 8097280 -> 8160768 bytes .../WindowsFormsApplication1/obj/Debug/ShiftOS.pdb | Bin 1646080 -> 1656320 bytes 24 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 source/WindowsFormsApplication1/obj/Debug/ShiftOS.Apps.About.resources (limited to 'source') diff --git a/source/.vs/ShiftOS/v14/.suo b/source/.vs/ShiftOS/v14/.suo index 65da625..461e415 100644 Binary files a/source/.vs/ShiftOS/v14/.suo and b/source/.vs/ShiftOS/v14/.suo differ diff --git a/source/ShiftUI/bin/Debug/ShiftUI.dll b/source/ShiftUI/bin/Debug/ShiftUI.dll index 4ea1e27..b409099 100644 Binary files a/source/ShiftUI/bin/Debug/ShiftUI.dll and b/source/ShiftUI/bin/Debug/ShiftUI.dll differ diff --git a/source/ShiftUI/bin/Debug/ShiftUI.pdb b/source/ShiftUI/bin/Debug/ShiftUI.pdb index 7c1d4af..45ca52e 100644 Binary files a/source/ShiftUI/bin/Debug/ShiftUI.pdb and b/source/ShiftUI/bin/Debug/ShiftUI.pdb differ diff --git a/source/ShiftUI/obj/Debug/ShiftUI.csproj.FileListAbsolute.txt b/source/ShiftUI/obj/Debug/ShiftUI.csproj.FileListAbsolute.txt index 5430307..855938c 100644 --- a/source/ShiftUI/obj/Debug/ShiftUI.csproj.FileListAbsolute.txt +++ b/source/ShiftUI/obj/Debug/ShiftUI.csproj.FileListAbsolute.txt @@ -20,3 +20,11 @@ C:\Users\wiggl\Documents\GitHub\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.Prop C:\Users\wiggl\Documents\GitHub\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.csproj.GenerateResource.Cache C:\Users\wiggl\Documents\GitHub\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.dll C:\Users\wiggl\Documents\GitHub\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.pdb +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\bin\Debug\ShiftUI.dll +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\bin\Debug\ShiftUI.pdb +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\bin\Debug\Microsoft.Build.Framework.dll +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.csprojResolveAssemblyReference.cache +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.Properties.Resources.resources +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.csproj.GenerateResource.Cache +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.dll +C:\Users\mikey\Documents\ShiftOS-C-\source\ShiftUI\obj\Debug\ShiftUI.pdb diff --git a/source/ShiftUI/obj/Debug/ShiftUI.csproj.GenerateResource.Cache b/source/ShiftUI/obj/Debug/ShiftUI.csproj.GenerateResource.Cache index 53ca4d5..4cf2b20 100644 Binary files a/source/ShiftUI/obj/Debug/ShiftUI.csproj.GenerateResource.Cache and b/source/ShiftUI/obj/Debug/ShiftUI.csproj.GenerateResource.Cache differ diff --git a/source/ShiftUI/obj/Debug/ShiftUI.csprojResolveAssemblyReference.cache b/source/ShiftUI/obj/Debug/ShiftUI.csprojResolveAssemblyReference.cache index 6639ac0..2b7273a 100644 Binary files a/source/ShiftUI/obj/Debug/ShiftUI.csprojResolveAssemblyReference.cache and b/source/ShiftUI/obj/Debug/ShiftUI.csprojResolveAssemblyReference.cache differ diff --git a/source/ShiftUI/obj/Debug/ShiftUI.dll b/source/ShiftUI/obj/Debug/ShiftUI.dll index 4ea1e27..b409099 100644 Binary files a/source/ShiftUI/obj/Debug/ShiftUI.dll and b/source/ShiftUI/obj/Debug/ShiftUI.dll differ diff --git a/source/ShiftUI/obj/Debug/ShiftUI.pdb b/source/ShiftUI/obj/Debug/ShiftUI.pdb index 7c1d4af..45ca52e 100644 Binary files a/source/ShiftUI/obj/Debug/ShiftUI.pdb and b/source/ShiftUI/obj/Debug/ShiftUI.pdb differ diff --git a/source/WindowsFormsApplication1/Apps/Cheats.cs b/source/WindowsFormsApplication1/Apps/Cheats.cs index d477cd9..a37021b 100644 --- a/source/WindowsFormsApplication1/Apps/Cheats.cs +++ b/source/WindowsFormsApplication1/Apps/Cheats.cs @@ -6,11 +6,7 @@ using System.Drawing; using System.Linq; using System.Text; using System.Threading.Tasks; -<<<<<<< HEAD using ShiftUI; -======= -using System.Windows.Forms; ->>>>>>> refs/remotes/origin/master using ShiftOS.Online.Hacking; namespace ShiftOS.Apps diff --git a/source/WindowsFormsApplication1/CreditScroller.Designer.cs b/source/WindowsFormsApplication1/CreditScroller.Designer.cs index c6dffcc..086bf44 100644 --- a/source/WindowsFormsApplication1/CreditScroller.Designer.cs +++ b/source/WindowsFormsApplication1/CreditScroller.Designer.cs @@ -207,7 +207,7 @@ // // lbgametitle // - this.lbgametitle.Dock = System.Windows.Forms.DockStyle.Top; + this.lbgametitle.Dock = ShiftUI.DockStyle.Top; this.lbgametitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 25F); this.lbgametitle.Location = new System.Drawing.Point(0, 0); this.lbgametitle.Name = "lbgametitle"; diff --git a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs index 533f4b5..9c0f08c 100644 --- a/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs +++ b/source/WindowsFormsApplication1/Desktop/ShiftOSDesktop.Designer.cs @@ -1281,7 +1281,7 @@ this.flicons.Name = "flicons"; this.flicons.Size = new System.Drawing.Size(1268, 661); this.flicons.TabIndex = 3; - this.flicons.Paint += new System.Windows.Forms.PaintEventHandler(this.flicons_Paint); + this.flicons.Paint += new ShiftUI.PaintEventHandler(this.flicons_Paint); // // cmbfactions // diff --git a/source/WindowsFormsApplication1/bin/Debug/ShiftOS.exe b/source/WindowsFormsApplication1/bin/Debug/ShiftOS.exe index 7e07d7c..3993494 100644 Binary files a/source/WindowsFormsApplication1/bin/Debug/ShiftOS.exe and b/source/WindowsFormsApplication1/bin/Debug/ShiftOS.exe differ diff --git a/source/WindowsFormsApplication1/bin/Debug/ShiftOS.pdb b/source/WindowsFormsApplication1/bin/Debug/ShiftOS.pdb index 72f4660..2dfd58f 100644 Binary files a/source/WindowsFormsApplication1/bin/Debug/ShiftOS.pdb and b/source/WindowsFormsApplication1/bin/Debug/ShiftOS.pdb differ diff --git a/source/WindowsFormsApplication1/bin/Debug/ShiftUI.dll b/source/WindowsFormsApplication1/bin/Debug/ShiftUI.dll index 4ea1e27..b409099 100644 Binary files a/source/WindowsFormsApplication1/bin/Debug/ShiftUI.dll and b/source/WindowsFormsApplication1/bin/Debug/ShiftUI.dll differ diff --git a/source/WindowsFormsApplication1/bin/Debug/ShiftUI.pdb b/source/WindowsFormsApplication1/bin/Debug/ShiftUI.pdb index 7c1d4af..45ca52e 100644 Binary files a/source/WindowsFormsApplication1/bin/Debug/ShiftUI.pdb and b/source/WindowsFormsApplication1/bin/Debug/ShiftUI.pdb differ diff --git a/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 91d8a24..3d1f8cc 100644 Binary files a/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Apps.About.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Apps.About.resources new file mode 100644 index 0000000..8fa2e06 Binary files /dev/null and b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Apps.About.resources differ diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.File_Skimmer.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.File_Skimmer.resources index 40488f6..79a81a0 100644 Binary files a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.File_Skimmer.resources and b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.File_Skimmer.resources differ diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Properties.Resources.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Properties.Resources.resources index 6c375ef..eee1810 100644 Binary files a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Properties.Resources.resources and b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Properties.Resources.resources differ diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt index 7f33003..79ff222 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt @@ -235,3 +235,4 @@ C:\Users\mikey\Documents\ShiftOS-C-\source\WindowsFormsApplication1\bin\Debug\Sv C:\Users\mikey\Documents\ShiftOS-C-\source\WindowsFormsApplication1\bin\Debug\Svg.xml C:\Users\mikey\Documents\ShiftOS-C-\source\WindowsFormsApplication1\bin\Debug\Interop.WMPLib.dll C:\Users\mikey\Documents\ShiftOS-C-\source\WindowsFormsApplication1\bin\Debug\AxInterop.WMPLib.dll +C:\Users\mikey\Documents\ShiftOS-C-\source\WindowsFormsApplication1\obj\Debug\ShiftOS.Apps.About.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.GenerateResource.Cache b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.GenerateResource.Cache index 7576d42..e011828 100644 Binary files a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.GenerateResource.Cache and b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.GenerateResource.Cache differ diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache index 0d8f79f..9eacdff 100644 Binary files a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache and b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache differ diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.exe b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.exe index 7e07d7c..3993494 100644 Binary files a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.exe and b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.exe differ diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb index 72f4660..2dfd58f 100644 Binary files a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb and b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb differ -- cgit v1.2.3