Skip to content

Commit

Permalink
Merge branch 'Development' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Owen2k6 authored Nov 4, 2023
2 parents 88cc270 + 9d702f1 commit 5b755d6
Show file tree
Hide file tree
Showing 121 changed files with 9,015 additions and 1,410 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,12 @@ GoOS/.vs/GoOS/v17/.suo
/.idea/

GoOS/.idea/
/.vs
/GoOS/obj/*
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/Screenshot1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Art/Screenshot2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 9 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Contributing
All Contributions should be made in the form of a Pull Request
(unless i Owen2k6 have added you as a contributor)
(unless Owen2k6 added you as a collaborator)

Your Pull request will require me to review and approve it before merging into the code.
Your Pull request will require Owen to review and approve it before merging into the code.

Do not mess up anything VS does. keep the directory similar for gods sake!
Do not mess up anything Visual Studio (if you don't use Rider) does. keep the directory similar for god's sake!

Pull Request guidelines:
1. all changes must be presented
2. a video must be attached showing this code working in a VM
¬ If anything is missed, the PR will be denied.
3. Code must be reviewed by either Owen2k6 or other developers "and Owen2k6" before this PR is merged in fully
## Pull Request guidelines:
- All changes must be presented
- A video must be attached showing this code working in a VM
- If anything is missed, the PR will be denied.
- Code must be reviewed by either Owen2k6 or other developers "and Owen2k6" before this PR is merged in fully.
Loading

0 comments on commit 5b755d6

Please sign in to comment.