diff options
| author | Michael <[email protected]> | 2017-04-16 09:48:33 -0400 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-04-16 09:48:33 -0400 |
| commit | a0fc2b5e701659d1ed17eba9c2888cae6d519c1e (patch) | |
| tree | 4a76428de6c261f5d0f003f471de9813d4abed10 /ShiftOS.WinForms | |
| parent | c1457428399f815d51dd535752b74ce3bcb484af (diff) | |
| download | shiftos_thereturn-a0fc2b5e701659d1ed17eba9c2888cae6d519c1e.tar.gz shiftos_thereturn-a0fc2b5e701659d1ed17eba9c2888cae6d519c1e.tar.bz2 shiftos_thereturn-a0fc2b5e701659d1ed17eba9c2888cae6d519c1e.zip | |
More documentation
Diffstat (limited to 'ShiftOS.WinForms')
| -rw-r--r-- | ShiftOS.WinForms/Applications/Pong.cs | 11 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Applications/Terminal.cs | 1 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Resources/Shiftorium.txt | 7 | ||||
| -rw-r--r-- | ShiftOS.WinForms/WinformsWindowManager.cs | 6 |
4 files changed, 6 insertions, 19 deletions
diff --git a/ShiftOS.WinForms/Applications/Pong.cs b/ShiftOS.WinForms/Applications/Pong.cs index 5d09ca0..0ef4da3 100644 --- a/ShiftOS.WinForms/Applications/Pong.cs +++ b/ShiftOS.WinForms/Applications/Pong.cs @@ -115,11 +115,12 @@ namespace ShiftOS.WinForms.Applications paddleHuman.BackColor = SkinEngine.LoadedSkin.ControlTextColor; //Check if paddle upgrade has been bought and change paddles accordingly - if (ShiftoriumFrontend.UpgradeInstalled("pong_increased_paddle_size")) - { - paddleHuman.Height = 150; - paddleComputer.Height = 150; - } + //if (ShiftoriumFrontend.UpgradeInstalled("pong_increased_paddle_size")) + //{ + // paddleHuman.Height = 150; + // paddleComputer.Height = 150; + //} + //I don't know the point of this but I'm fucking 86ing it. - Michael //Set the computer player to move according to the ball's position. if (aiShouldIsbeEnabled) diff --git a/ShiftOS.WinForms/Applications/Terminal.cs b/ShiftOS.WinForms/Applications/Terminal.cs index c0fdf01..8d29cba 100644 --- a/ShiftOS.WinForms/Applications/Terminal.cs +++ b/ShiftOS.WinForms/Applications/Terminal.cs @@ -321,7 +321,6 @@ namespace ShiftOS.WinForms.Applications { if (SaveSystem.CurrentSave != null) { if (!ShiftoriumFrontend.UpgradeInstalled("window_manager")) { - rtbterm.Text = AppearanceManager.LastTerminalText; rtbterm.Select(rtbterm.TextLength, 0); } TerminalBackend.PrintPrompt(); diff --git a/ShiftOS.WinForms/Resources/Shiftorium.txt b/ShiftOS.WinForms/Resources/Shiftorium.txt index 2260198..82ee613 100644 --- a/ShiftOS.WinForms/Resources/Shiftorium.txt +++ b/ShiftOS.WinForms/Resources/Shiftorium.txt @@ -260,13 +260,6 @@ Description: "With the free placement upgrade, you can place windows of any size anywhere on the desktop, which means theoretically you could add kernel coherence between ShiftOS and another GUI-based operating system and run their applications inside ShiftOS. This upgrade unlocks that.", }, { - Name: "Pong Increased Paddle Size", - Cost: 1000, - Dependencies: "pong_upgrade", - Category: "Enhancements", - Description: "Having trouble keeping that darn ball in front of you? Well, with this upgrade, your paddle increases in height.... slightly.", - }, - { Name: "WM 4 Windows", Cost: 150, Description: "Display up to 4 simultaneous windows on-screen in a 2x2 grid.", diff --git a/ShiftOS.WinForms/WinformsWindowManager.cs b/ShiftOS.WinForms/WinformsWindowManager.cs index 4fcd185..8bff387 100644 --- a/ShiftOS.WinForms/WinformsWindowManager.cs +++ b/ShiftOS.WinForms/WinformsWindowManager.cs @@ -125,12 +125,6 @@ namespace ShiftOS.WinForms public override void SetupWindow(IShiftOSWindow form) { - if (!AppearanceManager.CanOpenWindow(form)) - { - Infobox.Show("{MULTIPLAYER_ONLY}", "{MULTIPLAYER_ONLY_EXP}"); - return; - } - foreach(var attr in form.GetType().GetCustomAttributes(true)) { if(attr is MultiplayerOnlyAttribute) |
