diff options
Diffstat (limited to 'source/WindowsFormsApplication1')
16 files changed, 3 insertions, 6 deletions
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 Binary files differindex 7e07d7c..3993494 100644 --- a/source/WindowsFormsApplication1/bin/Debug/ShiftOS.exe +++ b/source/WindowsFormsApplication1/bin/Debug/ShiftOS.exe diff --git a/source/WindowsFormsApplication1/bin/Debug/ShiftOS.pdb b/source/WindowsFormsApplication1/bin/Debug/ShiftOS.pdb Binary files differindex 72f4660..2dfd58f 100644 --- a/source/WindowsFormsApplication1/bin/Debug/ShiftOS.pdb +++ b/source/WindowsFormsApplication1/bin/Debug/ShiftOS.pdb diff --git a/source/WindowsFormsApplication1/bin/Debug/ShiftUI.dll b/source/WindowsFormsApplication1/bin/Debug/ShiftUI.dll Binary files differindex 4ea1e27..b409099 100644 --- a/source/WindowsFormsApplication1/bin/Debug/ShiftUI.dll +++ b/source/WindowsFormsApplication1/bin/Debug/ShiftUI.dll diff --git a/source/WindowsFormsApplication1/bin/Debug/ShiftUI.pdb b/source/WindowsFormsApplication1/bin/Debug/ShiftUI.pdb Binary files differindex 7c1d4af..45ca52e 100644 --- a/source/WindowsFormsApplication1/bin/Debug/ShiftUI.pdb +++ b/source/WindowsFormsApplication1/bin/Debug/ShiftUI.pdb diff --git a/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differindex 91d8a24..3d1f8cc 100644 --- a/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Apps.About.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Apps.About.resources Binary files differnew file mode 100644 index 0000000..8fa2e06 --- /dev/null +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Apps.About.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.File_Skimmer.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.File_Skimmer.resources Binary files differindex 40488f6..79a81a0 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.File_Skimmer.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.File_Skimmer.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Properties.Resources.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Properties.Resources.resources Binary files differindex 6c375ef..eee1810 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Properties.Resources.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Properties.Resources.resources 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 Binary files differindex 7576d42..e011828 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.GenerateResource.Cache +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.GenerateResource.Cache diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache Binary files differindex 0d8f79f..9eacdff 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.exe b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.exe Binary files differindex 7e07d7c..3993494 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.exe +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.exe diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb Binary files differindex 72f4660..2dfd58f 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb |