diff options
| author | william341 <[email protected]> | 2016-07-25 12:18:40 -0700 |
|---|---|---|
| committer | william341 <[email protected]> | 2016-07-25 12:18:40 -0700 |
| commit | 5e4ac239005aeba9d190a3c6d428917dd94de607 (patch) | |
| tree | 36516b6db3eb0f2b6fa5289b5bd941996474e17c /source | |
| parent | 46c1c31302f111a1f3ec23a70e6f3986a9aa2a27 (diff) | |
| download | shiftos-c--5e4ac239005aeba9d190a3c6d428917dd94de607.tar.gz shiftos-c--5e4ac239005aeba9d190a3c6d428917dd94de607.tar.bz2 shiftos-c--5e4ac239005aeba9d190a3c6d428917dd94de607.zip | |
OooOOO easter egg
Diffstat (limited to 'source')
29 files changed, 86 insertions, 6 deletions
diff --git a/source/ShiftUI Designer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/source/ShiftUI Designer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differindex 46774de..216bafd 100644 --- a/source/ShiftUI Designer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/source/ShiftUI Designer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/source/ShiftUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/source/ShiftUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differindex 517edd6..dd2915f 100644 --- a/source/ShiftUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/source/ShiftUI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 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/Apps/Terminal.cs b/source/WindowsFormsApplication1/Apps/Terminal.cs index 8b68d23..f64a428 100644 --- a/source/WindowsFormsApplication1/Apps/Terminal.cs +++ b/source/WindowsFormsApplication1/Apps/Terminal.cs @@ -1671,6 +1671,89 @@ HIJACKER is a utility that allows you to hijack any system and install ShiftOS o WriteLine("Package 'timedistorter' not installed"); } + public void cmd_octocat(String[] args) + { + WriteLine(" *W#*: `*#W+ "); + WriteLine(" W@@@@W+` :W@@@@@: "); + WriteLine(" :@@@@@@@@+ *W@@@@@@@+ "); + WriteLine(" +@@@@@@@@@W* `:*++####++*:` :W@@@@@@@@@W "); + WriteLine(" W@@@@@@@@@@@W*#W@@@@@@@@@@@@@@@WW#@@@@@@@@@@@@ "); + WriteLine(" W@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@` "); + WriteLine(" W@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@` "); + WriteLine(" W@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@` "); + WriteLine(" W@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@` "); + WriteLine(" #@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@W "); + WriteLine(" *@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@W ` "); + WriteLine(" `@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@` "); + WriteLine(" W@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@W` "); + WriteLine(" +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@W "); + WriteLine(" `@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@: "); + WriteLine(" W@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@W "); + WriteLine(" `@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@: "); + WriteLine(" +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@W "); + WriteLine(" W@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ "); + WriteLine(" `@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@: "); + WriteLine(" :@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@* "); + WriteLine(" *@@@@@@@@@@@@#*:::::::***++++++***::::::*+W@@@@@@@@@@@+ "); + WriteLine(" *@@@@@@@@@@W:::::::::::::::::::::::::::::::*@@@@@@@@@@+ "); + WriteLine(" *@@@@@@@@@#::::::::::::::::::::::::::::::::::@@@@@@@@@+ "); + WriteLine(" *@@@@@@@@W::::::``::::::::::::::::::::``:::::*@@@@@@@@+ "); + WriteLine(" :@@@@@@@@:::::` ::::::::::::::::::` `::::#@@@@@@@+ "); + WriteLine(" :@@@@@@@#::::: `+*` ::::::::::::::::` :+: `::::@@@@@@@* "); + WriteLine(" `@@@@@@@:::::``#WW#``::::::::::::::: *WWW: ::::W@@@@@@* "); + WriteLine(" @@@@@@W::::: *WWWW* ::::::::::::::``WWWW# ::::+@@@@@@: "); + WriteLine(" W@@@@@W::::: #WWWW+ :::::::::::::: :WWWWW``:::*@@@@@@` "); + WriteLine(" #@@@@@W::::: #WWWW+ :::::::::::::: *WWWWW:`:::*@@@@@W "); + WriteLine(" ``````:@@@@@W::::: #WWWW+ :::::::::::::: :WWWWW``:::+@@@@@W `````` "); + WriteLine(" `::**++++++++++++@@@@@@::::: *WWWW: ::::::::::::::``WWWW# ::::#@@@@@W++++++++++++**::` "); + WriteLine("+++**:::`` #@@@@@*::::``#WW+ :::::::::::::::: *WWW: ::::W@@@@@: ``:::**+++"); + WriteLine("`` `::**++++++@@@@@#::::: `*: `:::::::**:::::::` :*` :::::W@@@@W++++++**::` ``"); + WriteLine(" `:**++++*:::```` +@@@@@:::::: `:::::::*W#::::::::` `::::*@@@@@: ```:::*++++**:` "); + WriteLine(":*+++*:` W@@@@W:::::::::::::::::#+:::::::::::::::::W@@@@W `:*+++*:"); + WriteLine("*:` `W@@@@+::::::::::::::::::::::::::::::::::+@@@@@` `:*"); + WriteLine(" `W@@@@#:::::::::::::++::#*:::::::::::::*@@@@@: "); + WriteLine(" `W@@@@W*::::::::::::###+:::::::::::::#@@@@W: "); + WriteLine(" +@@@@@W+*::::::::::*::::::::::::*#W@@@@# "); + WriteLine(" ` `+W@@@@@WW#+***:::::::::***+#WW@@@@@W: "); + WriteLine(" `WW *+` *WW@@@@@@@@@@@@@@@@@@@@@@@@@@@W+` "); + WriteLine(" `@@W@W: :+#WW@@@@@@@@@@@@@@@@@WW+:` "); + WriteLine(" `W@@#@: :@@@@@@@@@@@@@@@@: "); + WriteLine(" : +@@+W: ```@@@@@@@@@@@@@@@@@@``` "); + WriteLine(" `:` #@@@# ` W@@@@@@@@@@@@@@@@@@W "); + WriteLine(" `*` W@+W# ` :@@@@@@@@@@@@@@@@@@@@: "); + WriteLine(" ` *@@WW# +@@@@@@@@@@@@@@@@@@@@+ "); + WriteLine(" W@WW@W+:``:*W@@@@@@@@@@WW@@@@@@@@@W "); + WriteLine(" +@@@+W@WWW@#W@@@@@W@@@@++@@@@W@@@@W "); + WriteLine(" W@@@@WW@#@W@@@@@W:@@@@++@@@@:W@@@W "); + WriteLine(" :@@@@@@@@@@@@@@@W:@@@@++@@@@:W@@@W "); + WriteLine(" : W@@@@@@@@@@@@@#:@@@@++@@@@:#@@@W "); + WriteLine(" +W@@@@@@@@@@@#:@@@@++@@@@:#@@@W "); + WriteLine(" :*+++*:W@@@#:@@@@++@@@@:#@@@W "); + WriteLine(" W@@@#:@@@@++@@@@:#@@@W "); + WriteLine(" W@@@#:@@@@++@@@@:#@@@W "); + WriteLine(" W@@@#:@@@@**@@@@:#@@@W "); + WriteLine(" W@@@#:@@@@**@@@@:#@@@W "); + WriteLine(" W@@@#:@@@@**@@@@:#@@@W "); + WriteLine(" W@@@#:@@@@++@@@@:#@@@W "); + WriteLine(" ``@@@@W*@@@@##@@@@*W@@@@``` "); + WriteLine(" ``:::*@@@@W*@@@@##@@@@*W@@@@*::::`` "); + WriteLine(" `::***:W@@@@++@@@@++@@@@++@@@@W:****::` "); + WriteLine(" ::**::::W@@@@W:W@@@@**@@@@W:W@@@@W::::***:` "); + WriteLine(" `:**::::*@@@@@W::@@@@W::W@@@@::W@@@@@*:*:::**:` "); + WriteLine(" :**::::::*WWWW*::W@@@W::::W@@@W::*WWWW*:::::::*:` "); + WriteLine(" `*:::::::::******+@@@W*:**:*W@@@+******:::::::::*:` "); + WriteLine(" :*:::::::::**+++++WW+::*::*::+WW+++++**::::::::::*: "); + WriteLine(" :*:::::::::::*++++***+*::::*+***++++*::::::::::::*: "); + WriteLine(" :*:::::::::::*++++*++++*::*++++*++++*::::::::::::*: "); + WriteLine(" `*::::::::::::*+++**+++*::*+++**+++*::::::::::::*:` "); + WriteLine(" `**::::::::::*+++**++++**++++**+++*:::::::::::*:` "); + WriteLine(" `:**::::::::*+++**++++**++++**+++*:::::::::**:` "); + WriteLine(" ::**::::::*+++**++++**++++**+++*::::::***:` "); + WriteLine(" `::***::*+++**++++**++++**+++*:::***::` "); + WriteLine(" ``:::*++++**++++**++++**++++**:::`` "); + WriteLine(" ``::****++++**++++*****:``` "); + WriteLine(" ````:``:`````` "); + } #endregion #region RunEXE By Carver Harrison 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/Interop.WMPLib.dll b/source/WindowsFormsApplication1/bin/Debug/Interop.WMPLib.dll Binary files differindex 9fcb4ef..03d8d5a 100644 --- a/source/WindowsFormsApplication1/bin/Debug/Interop.WMPLib.dll +++ b/source/WindowsFormsApplication1/bin/Debug/Interop.WMPLib.dll diff --git a/source/WindowsFormsApplication1/bin/Debug/ShiftOS.exe b/source/WindowsFormsApplication1/bin/Debug/ShiftOS.exe Binary files differindex 7e07d7c..b166183 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..1e80a5e 100644 --- a/source/WindowsFormsApplication1/bin/Debug/ShiftOS.pdb +++ b/source/WindowsFormsApplication1/bin/Debug/ShiftOS.pdb diff --git a/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differindex 91d8a24..84df0a9 100644 --- a/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/source/WindowsFormsApplication1/obj/Debug/Interop.WMPLib.dll b/source/WindowsFormsApplication1/obj/Debug/Interop.WMPLib.dll Binary files differindex 9fcb4ef..03d8d5a 100644 --- a/source/WindowsFormsApplication1/obj/Debug/Interop.WMPLib.dll +++ b/source/WindowsFormsApplication1/obj/Debug/Interop.WMPLib.dll 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.FinalMission.ChooseYourApproach.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.FinalMission.ChooseYourApproach.resources Binary files differindex 4003dd1..6a254bc 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.FinalMission.ChooseYourApproach.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.FinalMission.ChooseYourApproach.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HackUI.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HackUI.resources Binary files differindex 558466f..c792b50 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HackUI.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HackUI.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HoloChat.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HoloChat.resources Binary files differindex 1508d1b..771bcb2 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HoloChat.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.HoloChat.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.KnowledgeInput.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.KnowledgeInput.resources Binary files differindex a027528..7ea1939 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.KnowledgeInput.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.KnowledgeInput.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetGen.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetGen.resources Binary files differindex 1682936..4e17fe9 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetGen.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetGen.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetworkBrowser.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetworkBrowser.resources Binary files differindex 5c81027..554b503 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetworkBrowser.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.NetworkBrowser.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Pong.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Pong.resources Binary files differindex 6f6cbf1..d421763 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Pong.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Pong.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..401322e 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.Shifter.resources b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Shifter.resources Binary files differindex 12c8ba1..73359a1 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Shifter.resources +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.Shifter.resources diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt index 7f33003..39f7162 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\wiggl\Documents\GitHub\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..f19cddf 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.csproj.ResolveComReference.cache b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.ResolveComReference.cache Binary files differindex a67209d..2773d20 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.ResolveComReference.cache +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.ResolveComReference.cache diff --git a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache Binary files differindex 0d8f79f..985a221 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..b166183 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..1e80a5e 100644 --- a/source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb +++ b/source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb diff --git a/source/WindowsFormsApplication1/obj/Debug/Shiftorium.Frontend.resources b/source/WindowsFormsApplication1/obj/Debug/Shiftorium.Frontend.resources Binary files differindex d545f9f..2f7d78b 100644 --- a/source/WindowsFormsApplication1/obj/Debug/Shiftorium.Frontend.resources +++ b/source/WindowsFormsApplication1/obj/Debug/Shiftorium.Frontend.resources |
