Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.5 #107

Merged
merged 112 commits into from
Feb 3, 2024
Merged

1.5 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
1bda2a4
Revert "Im not sure what i did and i dont care"
Owen2k6 Dec 8, 2023
813e272
Comment out networking
9xbt Jan 14, 2024
f77d7b3
Fix networking!!
9xbt Jan 14, 2024
3a15d12
Merge pull request #91 from 9xbt/1.5fwwlo
Owen2k6 Jan 14, 2024
751ddd0
OOBE Redesign
Owen2k6 Jan 14, 2024
6722b63
Fix GoStore and other stuff
9xbt Jan 17, 2024
29e5ee3
Merge pull request #92 from 9xbt/1.5fwwlo
Owen2k6 Jan 17, 2024
dc5e3c7
kurwa
Owen2k6 Jan 17, 2024
c518fbe
Cleanup
Owen2k6 Jan 18, 2024
883209f
git push
9xbt Jan 18, 2024
a4fcbf1
Merge branch '1.5fwwlo' into 1.5fwwlo
9xbt Jan 18, 2024
27b9778
Merge pull request #93 from 9xbt/1.5fwwlo
Owen2k6 Jan 18, 2024
1cdf656
Reformatting
Owen2k6 Jan 18, 2024
f9949bc
GonerStore
9xbt Jan 18, 2024
ce2286f
Merge pull request #94 from 9xbt/1.5
Owen2k6 Jan 18, 2024
d8f9210
korenal
Owen2k6 Jan 18, 2024
3474a62
Search doesn't work but I am not deleting my work
ekeleze Jan 18, 2024
b887203
Fixed one bug, caused 2 more.
ekeleze Jan 19, 2024
51aad65
Update .gitignore
9xbt Jan 19, 2024
4dcf291
Revert last 2 commits
ekeleze Jan 19, 2024
5e272de
Merge branch 'Owen2k6:1.5' into 1.5
9xbt Jan 19, 2024
c261f17
Merge pull request #95 from 9xbt/1.5
Owen2k6 Jan 19, 2024
7a3b6d2
polodfkvbfdkjnfdghshjrgnfb
Owen2k6 Jan 19, 2024
f8e2e9a
ive been trying to fix pages for hours
9xbt Jan 19, 2024
5753b36
vj
Owen2k6 Jan 19, 2024
8fb59ca
Fix OOBE bug
ekeleze Jan 19, 2024
9f96b74
GoStor
9xbt Jan 19, 2024
4e53354
a
Owen2k6 Jan 19, 2024
dd1547e
Merge pull request #96 from 9xbt/1.5
Owen2k6 Jan 19, 2024
d7d0364
Update MainFrame.cs
9xbt Jan 19, 2024
dffd8c1
Merge branch '1.5' of https://github.com/9xbt/GoOS into 1.5
9xbt Jan 19, 2024
b6c013e
Merge pull request #97 from 9xbt/1.5
Owen2k6 Jan 19, 2024
d03bcf7
GoShisse
Owen2k6 Jan 20, 2024
e1e9dd3
imag
Owen2k6 Jan 20, 2024
6660049
Push. Push it good
9xbt Jan 20, 2024
271decd
Merge pull request #98 from 9xbt/1.5
Owen2k6 Jan 20, 2024
4363374
aeiou
Owen2k6 Jan 20, 2024
c6d53d2
FM
Owen2k6 Jan 20, 2024
4264c36
daerfdgsdfh
Owen2k6 Jan 20, 2024
57ead8b
licen
Owen2k6 Jan 20, 2024
9c2d6a4
ijp0ohtgrfypijger0ihupj8wfet0iphyuwerfguohertgoipuyerfwguiyhoswerotiu…
Owen2k6 Jan 20, 2024
f29cc27
felder
Owen2k6 Jan 20, 2024
e16f800
A lot of changes
9xbt Jan 20, 2024
81db6cd
Merge pull request #99 from 9xbt/1.5
Owen2k6 Jan 20, 2024
465e8f6
Ignore and stop tracking caches from Rider
Owen2k6 Jan 20, 2024
228afbf
Merge branch '1.5' of https://github.com/Owen2k6/GoOS into 1.5
Owen2k6 Jan 20, 2024
6f43ab3
Unfinished buisness
9xbt Jan 20, 2024
7c6b49a
Merge pull request #100 from 9xbt/1.5
Owen2k6 Jan 20, 2024
8f20b50
sb
Owen2k6 Jan 21, 2024
b108db9
ffs
Owen2k6 Jan 21, 2024
a6a6061
Unfinished changes
9xbt Jan 21, 2024
a3b3a5d
ghfkhjgf
Owen2k6 Jan 21, 2024
46d2f4a
Kurwa Mac
9xbt Jan 21, 2024
1cbd719
Merge branch '1.5' into 1.5
9xbt Jan 21, 2024
3012ff6
Merge pull request #101 from 9xbt/1.5
Owen2k6 Jan 21, 2024
c82d1eb
Init GoWeb
Jspa2 Jan 21, 2024
c41ea3a
Merge
Jspa2 Jan 21, 2024
2a73f9c
App pinning
ekeleze Jan 21, 2024
b2faff1
Almost finished Gosplorer
9xbt Jan 21, 2024
800dce8
Merge pull request #102 from 9xbt/1.5
ekeleze Jan 21, 2024
c7b5e16
upd
Jspa2 Jan 21, 2024
fbd3cb8
Merge branch '1.5' into 1.5
Jspa2 Jan 21, 2024
4d64ac5
Merge pull request #103 from Jspa2/1.5
Owen2k6 Jan 21, 2024
d5222b1
elongated moose
Owen2k6 Jan 22, 2024
7d598a8
elastic worm
ekeleze Jan 22, 2024
d001f28
Weaponised Assault Penguins
Owen2k6 Jan 22, 2024
5545449
Angry Ape
ekeleze Jan 22, 2024
1f2ca26
QC
Owen2k6 Jan 22, 2024
c9e715b
pragim maypeeaii
Owen2k6 Jan 22, 2024
7ddaf02
nevermind
ekeleze Jan 22, 2024
37a16fd
put da pedal to da metal
Owen2k6 Jan 22, 2024
175bcdb
the bite of 1080p
Owen2k6 Jan 22, 2024
b24185c
new
Owen2k6 Jan 22, 2024
ec2e4c6
klksdtfhf;oiljkhdfjh;lsjkdgfhj;lkjsdgf
Owen2k6 Jan 22, 2024
f4b4629
Buttons!
ekeleze Jan 22, 2024
9dc6c49
khjgfckhgf
Owen2k6 Jan 22, 2024
d391a88
hhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
Owen2k6 Jan 22, 2024
b2991d2
devMode & pin fix
ekeleze Jan 22, 2024
6b15d79
5
Owen2k6 Jan 22, 2024
bec6584
Merge branch '1.5' of https://github.com/Owen2k6/GoOS into 1.5
Owen2k6 Jan 22, 2024
becdcb4
whatever xrc was doing
ekeleze Jan 22, 2024
ebce1b1
hhhhhhh
Owen2k6 Jan 22, 2024
395525c
Turn devMode off
ekeleze Jan 22, 2024
ccf9b93
Gosplorer context menus and context menu fixx
ekeleze Jan 23, 2024
e5c4fa6
Spaces?
ekeleze Jan 23, 2024
a063b32
Better CLI Copy & Move + Better sized context menus in the 'splorer
ekeleze Jan 23, 2024
d79cfbf
devMode upgrades
ekeleze Jan 23, 2024
f3d44d8
Fix "Pinned Apps Bug"
ekeleze Jan 23, 2024
007d633
Fix "Fix "Pinned Apps Bug""
ekeleze Jan 23, 2024
2d8ec6b
Fix "GoIDE allows you to create a project on 1:\"
ekeleze Jan 23, 2024
d692ac3
Fix Gosplorer allowing to create files on the CD drive
9xbt Jan 23, 2024
8dc603e
Finish fixing Gosplorer
9xbt Jan 23, 2024
5169007
Merge pull request #104 from 9xbt/1.5
Owen2k6 Jan 23, 2024
540e98a
Fix "Textbox Click Bug"
ekeleze Jan 23, 2024
ee4aad7
Fix "Mouse Positioning issue on boot"
ekeleze Jan 23, 2024
f52c926
Final touches to the start men fixes
ekeleze Jan 23, 2024
290d4ff
Fix "Context Menu Startup Bug"
ekeleze Jan 24, 2024
39ec246
re-enable UserFrame.cs dialogs
ekeleze Jan 24, 2024
01e1dbd
Fix "Cannot open start menu with Windows Key"
ekeleze Jan 24, 2024
703956c
Add "Pin App" to .goexe, .gexe, and .9xc files in the gosplorer
ekeleze Jan 24, 2024
a6dd4c4
GoOS VI modification
Owen2k6 Jan 26, 2024
c7959b9
a
Owen2k6 Jan 26, 2024
6f3ef73
.5: Auto stash before merge of "1.5" and "origin/1.5"
Owen2k6 Jan 26, 2024
9d6a0f3
GoGL update
Owen2k6 Jan 26, 2024
6a10139
GoGL
Owen2k6 Jan 26, 2024
5d667c8
idk
9xbt Jan 27, 2024
5848630
Merge branch '1.5' of https://github.com/9xbt/GoOS into 1.5
9xbt Jan 27, 2024
8578160
smoke weed everyday
Owen2k6 Jan 27, 2024
83dce2f
Fix
9xbt Jan 27, 2024
423a97d
Merge pull request #105 from 9xbt/1.5
Owen2k6 Jan 27, 2024
cb84cc9
e
Owen2k6 Jan 28, 2024
5b2e162
As is
Owen2k6 Feb 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,17 @@ GoOS/obj/GoOS.csproj.nuget.g.props
GoOS/obj/GoOS.csproj.nuget.g.targets
GoOS/obj/project.assets.json
GoOS/obj/project.nuget.cache
GoOS/obj/Debug/net6.0/GoOS.assets.cache
GoOS/obj/Debug/net6.0/GoOS.csproj.AssemblyReference.cache
GoOS/obj/GoOS.csproj.nuget.dgspec.json
GoOS/obj/GoOS.csproj.nuget.g.props
GoOS/obj/GoOS.csproj.nuget.g.targets
GoOS/obj/project.assets.json
GoOS/obj/project.nuget.cache
GoOS/obj/Debug/net6.0/GoOS.assets.cache
GoOS/obj/Debug/net6.0/GoOS.csproj.AssemblyReference.cache
GoOS/obj/GoOS.csproj.nuget.dgspec.json
GoOS/obj/GoOS.csproj.nuget.g.props
GoOS/obj/GoOS.csproj.nuget.g.targets
GoOS/obj/project.assets.json
GoOS/obj/project.nuget.cache
Binary file added Art/QC-GoStore.pdn
Binary file not shown.
Binary file added Art/QC-Gosplorer.pdn
Binary file not shown.
Binary file added Art/professional.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 5 additions & 2 deletions GoOS/9xCode/Interpreter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
using System.IO;
using System.Text;
using System.Threading;
using Cosmos.System;
using GoOS.GUI;
using PrismAPI.Graphics;
using GoGL.Graphics;
using static ConsoleColorEx;
using Console = BetterConsole;
using ConsoleColor = PrismAPI.Graphics.Color;
using ConsoleColor = GoGL.Graphics.Color;
using static GoOS.Resources;

// 9xCode Beta 3.1
Expand Down Expand Up @@ -60,6 +61,8 @@ private static void Interpret(string[] code)
{
WindowManager.Update(); // Don't lock the WM

if (KeyboardManager.TryReadKey(out var k) && k.Modifiers == ConsoleModifiers.Control && k.Key == ConsoleKeyEx.C) return;

string line = code[i].Trim().Replace("\\n", "\n");

#region Globals
Expand Down
2 changes: 1 addition & 1 deletion GoOS/9xCode/StringToConsoleColor.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using ConsoleColor = PrismAPI.Graphics.Color;
using ConsoleColor = GoGL.Graphics.Color;
using static ConsoleColorEx;

namespace GoOS._9xCode
Expand Down
4 changes: 2 additions & 2 deletions GoOS/BetterConsole/BetterConsole.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
using Cosmos.System;
using GoOS.GUI;
using GoOS.Themes;
using PrismAPI.Graphics;
using GoGL.Graphics;
using static GoOS.Resources;

/// <summary>
/// <see cref="BetterConsole"/> class
/// </summary>
public static class BetterConsole
public static class BetterConsole //Shitter Console
{
/* The canvas for the console */
public static Canvas Canvas;
Expand Down
6 changes: 3 additions & 3 deletions GoOS/BetterConsole/VMBetterConsole.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
using GoOS.GUI;
using GoOS.Themes;
using IL2CPU.API.Attribs;
using PrismAPI.Graphics;
using PrismAPI.Graphics.Fonts;
using GoGL.Graphics;
using GoGL.Graphics.Fonts;

/// <summary>
/// <see cref="VMBetterConsole"/> class
/// </summary>
public class VMBetterConsole
public class VMBetterConsole //Shitter Console
{
/* The raw global font */
[ManifestResourceStream(ResourceName = "GoOS.Resources.Font_1x.btf")]
Expand Down
2 changes: 1 addition & 1 deletion GoOS/Commands/Delete.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static void DeleteFile(string args)
;
}

public static void UniveralDelete(string args)
public static void UniversalDelete(string args)
{
if (args.Contains("0:\\"))
{
Expand Down
16 changes: 8 additions & 8 deletions GoOS/Commands/ExtendedFilesystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ public static void CopyFile(string from, string to)

string name = FullName.Substring(FullName.IndexOf("."));

var Contents = File.ReadAllText(from);
var Contents = File.ReadAllBytes(from);
File.Create(to + FullName);
File.WriteAllText(to + FullName, Contents);
File.WriteAllBytes(to + FullName, Contents);
}
else
{
Expand All @@ -34,9 +34,9 @@ public static void CopyFile(string from, string to)

string name = FullName.Substring(FullName.IndexOf("."));

var Contents = File.ReadAllText(from);
var Contents = File.ReadAllBytes(from);
File.Create(to + FullName);
File.WriteAllText(to + FullName, Contents);
File.WriteAllBytes(to + FullName, Contents);
}
}

Expand All @@ -50,9 +50,9 @@ public static void MoveFile(string from, string to)

string name = FullName.Substring(FullName.IndexOf("."));

var Contents = File.ReadAllText(from);
var Contents = File.ReadAllBytes(from);
File.Create(to + FullName);
File.WriteAllText(to + FullName, Contents);
File.WriteAllBytes(to + FullName, Contents);
File.Delete(from);
}
else
Expand All @@ -61,9 +61,9 @@ public static void MoveFile(string from, string to)

string name = FullName.Substring(FullName.IndexOf("."));

var Contents = File.ReadAllText(from);
var Contents = File.ReadAllBytes(from);
File.Create(to + FullName);
File.WriteAllText(to + FullName, Contents);
File.WriteAllBytes(to + FullName, Contents);
File.Delete(from);
}
}
Expand Down
2 changes: 1 addition & 1 deletion GoOS/Commands/dir.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static void Run()

foreach (var file in directory_list)
{
if (file.EndsWith(".gms"))
if (file.EndsWith(".gms") && !Kernel.devMode)
{
log(ThemeManager.ErrorText, "<System> Protected File");
}
Expand Down
103 changes: 0 additions & 103 deletions GoOS/Commands/systest.cs

This file was deleted.

2 changes: 1 addition & 1 deletion GoOS/Core.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Threading;
using Console = BetterConsole;
using ConsoleColor = PrismAPI.Graphics.Color;
using ConsoleColor = GoGL.Graphics.Color;

namespace GoOS
{
Expand Down
3 changes: 1 addition & 2 deletions GoOS/GUI/Apps/About.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
using System.Text;
using System.Threading.Tasks;
using IL2CPU.API.Attribs;
using PrismAPI.Graphics;
using PrismAPI.UI;
using GoGL.Graphics;

namespace GoOS.GUI.Apps
{
Expand Down
18 changes: 17 additions & 1 deletion GoOS/GUI/Apps/AppManager.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using IL2CPU.API.Attribs;
using PrismAPI.Graphics;
using GoGL.Graphics;
using static GoOS.Resources;

namespace GoOS.GUI.Apps
Expand Down Expand Up @@ -72,6 +72,18 @@ public AppManager()
Image = GoStoreicon,
Clicked = Store_Click
},
#if BUILD_GOWEB
new Button(this, 84, 100, 64, 80, "GoWeb")
{
UseSystemStyle = false,
BackgroundColour = Color.LightGray,
SelectionColour = new Color(100, 100, 100),
TextColour = Color.White,

Image = goWebIcon,
Clicked = GoWeb_Click
},
#endif
};
CloseButton = new Button(this, Convert.ToUInt16(Contents.Width - 90), Convert.ToUInt16(Contents.Height - 30), 80, 20, "Close") { Clicked = CloseButton_Click };

Expand All @@ -93,6 +105,10 @@ public AppManager()

private void Store_Click() => WindowManager.AddWindow(new GoStore.MainFrame());

#if BUILD_GOWEB
private void GoWeb_Click() => WindowManager.AddWindow(new GoWeb.GoWebWindow());
#endif

private void CloseButton_Click() => Dispose();
}
}
29 changes: 0 additions & 29 deletions GoOS/GUI/Apps/BrownGhost.cs

This file was deleted.

3 changes: 1 addition & 2 deletions GoOS/GUI/Apps/Clock.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
using System.Text;
using System.Threading.Tasks;
using IL2CPU.API.Attribs;
using PrismAPI.Graphics;
using PrismAPI.UI;
using GoGL.Graphics;
using static GoOS.Resources;

namespace GoOS.GUI.Apps
Expand Down
2 changes: 1 addition & 1 deletion GoOS/GUI/Apps/CustomInterface.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;
using IL2CPU.API.Attribs;
using PrismAPI.Graphics;
using GoGL.Graphics;
using static GoOS.Resources;

namespace GoOS.GUI.Apps
Expand Down
2 changes: 1 addition & 1 deletion GoOS/GUI/Apps/Cut.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
using IL2CPU.API.Attribs;
using PrismAPI.Graphics;
using GoGL.Graphics;
using System.IO;
using System.Threading;
using static GoOS.Resources;
Expand Down
Loading