diff options
| author | ComputeLinux <[email protected]> | 2016-07-23 11:48:04 -0700 |
|---|---|---|
| committer | ComputeLinux <[email protected]> | 2016-07-23 11:48:04 -0700 |
| commit | 4684ff1a833f1baa3022e27a9ae3709c2257c8f8 (patch) | |
| tree | db0ca996487a36faf5c64844b912f9f9b1a98ef6 | |
| parent | 333d09f6a28a34274e708f31adeeb5cac8851efe (diff) | |
| download | shiftos-c--4684ff1a833f1baa3022e27a9ae3709c2257c8f8.tar.gz shiftos-c--4684ff1a833f1baa3022e27a9ae3709c2257c8f8.tar.bz2 shiftos-c--4684ff1a833f1baa3022e27a9ae3709c2257c8f8.zip | |
lederp
3 files changed, 22 insertions, 39 deletions
diff --git a/source/WindowsFormsApplication1/Properties/Resources.Designer.cs b/source/WindowsFormsApplication1/Properties/Resources.Designer.cs index ac7b7d4..71c64c1 100644 --- a/source/WindowsFormsApplication1/Properties/Resources.Designer.cs +++ b/source/WindowsFormsApplication1/Properties/Resources.Designer.cs @@ -305,7 +305,8 @@ namespace ShiftOS.Properties { ///"I keep reading news about networks on the list going offline.":"Richard Ladouceur", ///"It's great to see you're doing this, because pretty soon, it'll be DevX's turn to suffer your wrath.":"Richard Ladouceur", ///"I've patched your Network Browser to allow you to fight in Tier 3 battles.":"Richard Ladouceur", - ///"Just be careful - if I'm able to see all of this news, there's no doubt DevX has his eyes on it.":"Richard Ladouce [rest of string was truncated]";. + ///"Just be careful - if I'm able to see all of this news, there's no doubt DevX has his eyes on it.":"Richard Ladouceur" + ///}. /// </summary> internal static string AustinWalkerCompletionStory { get { @@ -377,7 +378,7 @@ namespace ShiftOS.Properties { /// "However, in your Terminal, you should be able to run 'quests' to view all the tasks we need to accomplish.":"???", /// "You'll also see a window near the App Launcher, I will use it to talk to you as we do things.":"???", /// "Well. Let's get started.":"???" - /// [rest of string was truncated]";. + ///}. /// </summary> internal static string Choice2 { get { @@ -395,7 +396,7 @@ namespace ShiftOS.Properties { /// "Reading your logs, well, it seems you want out of this all, don't you?":"???", /// "Well, Hacker101, tell the user what we can do.":"???" /// "Well I've got good news and bad news for you, user.":"Hacker101", - /// "Good news is, [rest of string was truncated]";. + /// "Good news is, when Dev [rest of string was truncated]";. /// </summary> internal static string Choice3 { get { @@ -466,19 +467,17 @@ namespace ShiftOS.Properties { /// <summary> /// Looks up a localized string similar to ShiftOS #VER# /// + ///== Developers == + ///Michael VanOverbeek + ///Philip Adams + ///Carver Harrison + ///William + ///GabrielTK + ///PCSource + ///AShifter /// /// - ///A game by Michael VanOverbeek - /// - /// - /// - /// - /// - /// - /// - /// - /// - /// == External Libraries / Dependencies == + ///== External Libraries / Dependencies == /// /// JSON.NET - Version 8.0.2 /// By James Newton-King @@ -493,15 +492,12 @@ namespace ShiftOS.Properties { /// GeckoFX .NET wrapper for Gecko and xulrunner - 1.0.5 /// By EmaGht /// - /// /// and various other amazing .NET libraries /// /// - /// - /// ///== Music == /// - ///All music in ShiftOS is provided by Free Songs to Use, whose YouTube channel ca [rest of string was truncated]";. + ///All music in ShiftOS is provided by Free Songs to Use, wh [rest of string was truncated]";. /// </summary> internal static string Credits { get { @@ -520,7 +516,7 @@ namespace ShiftOS.Properties { /// break; /// case 2: /// txtterm.Text = txtterm.Text + "IP 199.108.232.1 Connecting..." + Environment.NewLine + "User@" + SaveSystem.Utilities.LoadedSave.osname + " $> "; - /// [rest of string was truncated]";. + /// [rest of string was truncated]";. /// </summary> internal static string DecompiledCode { get { @@ -568,7 +564,7 @@ namespace ShiftOS.Properties { /// <summary> /// Looks up a localized string similar to - ///{"Name":"DevX Secondary","FriendDesc":"I will DESTROY you.","Description":"I will DESTROY you.","FriendSpeed":0,"FriendSkill":0,"Difficulty":"unknown","Network":[{"Hostname":"devx_secondary","ModuleType":0,"Type":0,"HP":0,"Grade":1,"X":0,"Y":0},{"Hostname":"trt_alpha","ModuleType":0,"Type":3,"HP":0,"Grade":4,"X":535,"Y":221},{"Hostname":"trt_beta","ModuleType":0,"Type":3,"HP":0,"Grade":4,"X":534,"Y":268},{"Hostname":"trt_charlie","ModuleType":0,"Type":3,"HP":0,"Grade":4,"X":532,"Y":174},{"Hostname":"trt_d [rest of string was truncated]";. + ///{"Name":"DevX Secondary","FriendDesc":"I will DESTROY you.","Description":"I will DESTROY you.","FriendSpeed":0,"FriendSkill":0,"Difficulty":"unknown","Network":[{"Hostname":"devx_secondary","ModuleType":0,"Type":0,"HP":0,"Grade":1,"X":0,"Y":0},{"Hostname":"trt_alpha","ModuleType":0,"Type":3,"HP":0,"Grade":4,"X":535,"Y":221},{"Hostname":"trt_beta","ModuleType":0,"Type":3,"HP":0,"Grade":4,"X":534,"Y":268},{"Hostname":"trt_charlie","ModuleType":0,"Type":3,"HP":0,"Grade":4,"X":532,"Y":174},{"Hostname":"trt_de [rest of string was truncated]";. /// </summary> internal static string DevX_Secondary { get { @@ -618,16 +614,6 @@ namespace ShiftOS.Properties { /// <summary> /// Looks up a localized resource of type System.Drawing.Bitmap. /// </summary> - internal static System.Drawing.Bitmap DSC01042 { - get { - object obj = ResourceManager.GetObject("DSC01042", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// <summary> - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// </summary> internal static System.Drawing.Bitmap fileicondirectory { get { object obj = ResourceManager.GetObject("fileicondirectory", resourceCulture); @@ -1140,7 +1126,7 @@ namespace ShiftOS.Properties { /// "Remember that hacker friend I told you about earlier?":"Richard Ladouceur", /// "Yeah - that's me...":"Hacker101", /// "Me and Richard have plans - and we need your help.":"Hacker101", - /// "We're plannin [rest of string was truncated]";. + /// "We're planning on sto [rest of string was truncated]";. /// </summary> internal static string MidGame_Holochat { get { @@ -1151,10 +1137,11 @@ namespace ShiftOS.Properties { /// <summary> /// Looks up a localized string similar to { ///"StartURL":"http://michael.playshiftos.ml/shiftos/soundtrack/", - ///"Files":{"endgame":["Tom Vanko & Mark Vank - Origin"], "hackerbattle_ambient":["HardMix - Evolution", "Lastep - NeveS", "Timmo Hendriks - That Happen", "Eric Rodriguez - Lion", "Mark Vank & Miza - Dark Generation"]}, + ///"Files":{"endgame":["Tom Vanko & Mark Vank - Origin"], "hackerbattle_ambient":["HardMix - Evolution", "Lastep - NeveS", "Timmo Hendriks - That Happen", "Mark Vank & Miza - Dark Generation"]}, ///"Visualizers":{ /// "Mark Vank & Miza - Dark Generation":[{"R":false, "G":true, "B":false, "type":"Pulse", "startTime":0, "endTime":30}, - /// {"R":false, "G":true, "B":false, "type":"BuildUp", "startTime":30, "endTime" [rest of string was truncated]";. + /// {"R":false, "G":true, "B":false, "type":"BuildUp", "startTime":30, "endTime":60}, + /// {"R":false, [rest of string was truncated]";. /// </summary> internal static string MusicData { get { @@ -1164,7 +1151,7 @@ namespace ShiftOS.Properties { /// <summary> /// Looks up a localized string similar to { - ///"BufferOverflow":{"IsLeader":false,"Name":"BufferOverflow","FriendDesc":"BufferOverflow is a question-and-answer site with millions of Shifters willing to share their knowledge.","Description":"BufferOverflow is a question-and-answer site with millions of Shifters willing to share their knowledge.","FriendSpeed":65,"FriendSkill":50,"Difficulty":"easy","Network":[{"Hostname":"bufferoverflow","ModuleType":0,"Type":0,"HP":100,"Grade":1,"X":0,"Y":0},{"Hostname":"main_av","ModuleType":0,"Type":1,"HP":0,"Grade [rest of string was truncated]";. + ///"BufferOverflow":{"IsLeader":false,"Name":"BufferOverflow","FriendDesc":"BufferOverflow is a question-and-answer site with millions of Shifters willing to share their knowledge.","Description":"BufferOverflow is a question-and-answer site with millions of Shifters willing to share their knowledge.","FriendSpeed":65,"FriendSkill":50,"Difficulty":"easy","Network":[{"Hostname":"bufferoverflow","ModuleType":0,"Type":0,"HP":100,"Grade":1,"X":0,"Y":0},{"Hostname":"main_av","ModuleType":0,"Type":1,"HP":0,"Grade" [rest of string was truncated]";. /// </summary> internal static string NetBrowser_Enemies { get { @@ -3278,7 +3265,7 @@ namespace ShiftOS.Properties { /// ///You see, ShiftOS was a test. It was a test to see how an average computer user would cope with having their data lost, and having to test an experimental operating system and help develop it into a full, usable environment. /// - ///You were the first to make it to the end, so it's time I tell you the truth [rest of string was truncated]";. + ///You were the first to make it to the end, so it's time I tell you the truth. Everyth [rest of string was truncated]";. /// </summary> internal static string You_Passed { get { diff --git a/source/WindowsFormsApplication1/Properties/Resources.resx b/source/WindowsFormsApplication1/Properties/Resources.resx index e8fecc6..47c43f9 100644 --- a/source/WindowsFormsApplication1/Properties/Resources.resx +++ b/source/WindowsFormsApplication1/Properties/Resources.resx @@ -811,9 +811,6 @@ <data name="upgradetrm" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\upgradetrm.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="DSC01042" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\DSC01042.JPG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="iconorcwrite" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\iconorcwrite.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> diff --git a/source/WindowsFormsApplication1/ShiftOS.csproj b/source/WindowsFormsApplication1/ShiftOS.csproj index 65c7d44..5caa388 100644 --- a/source/WindowsFormsApplication1/ShiftOS.csproj +++ b/source/WindowsFormsApplication1/ShiftOS.csproj @@ -673,7 +673,6 @@ <None Include="Resources\dodge.png" /> <None Include="Resources\downarrow.png" /> <None Include="Resources\downloadmanagericon.png" /> - <None Include="Resources\DSC01042.JPG" /> <None Include="Resources\fileiconsaa.png" /> <None Include="Resources\fileskimmericon.fw.png" /> <None Include="Resources\floodgateicn.png" /> |