diff options
| author | GeckoEidechse <gecko.eidechse+git@pm.me> | 2022-08-24 15:06:20 +0200 |
|---|---|---|
| committer | GeckoEidechse <gecko.eidechse+git@pm.me> | 2022-08-24 15:06:20 +0200 |
| commit | 9038770ad6859ba4364444d216d637d1b4400bf1 (patch) | |
| tree | f3048dc062fd1884349a2de0a7a5a4a2fafed77d | |
| parent | bc64aa511214f73c40ad87f39ca14f0603efe915 (diff) | |
| parent | 6fa65f27a8f9708a977deec8fe13b9a863792aa4 (diff) | |
| download | NorthstarLauncher-9038770ad6859ba4364444d216d637d1b4400bf1.tar.gz NorthstarLauncher-9038770ad6859ba4364444d216d637d1b4400bf1.zip | |
Merge remote-tracking branch 'origin/bobs-big-refactor-pr' into refactor-temp-test
| -rw-r--r-- | .github/pull_request_template.md | 18 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | NorthstarDLL/ns_startup_args.txt | 1 | ||||
| -rw-r--r-- | NorthstarDLL/ns_startup_args_dedi.txt | 1 | ||||
| -rw-r--r-- | NorthstarLauncher/ns_startup_args.txt | 1 | ||||
| -rw-r--r-- | NorthstarLauncher/ns_startup_args_dedi.txt | 1 |
6 files changed, 20 insertions, 6 deletions
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..727a3060 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,18 @@ +<!-- +WHEN OPENING A PULL REQUEST KEEP IN MIND: +-> If the changes you made can be summarised in a screenshot, add one (e.g. you changed the layout of an in-game menu) +-> If the changes you made can be summarised in a screenrecording, add one (e.g. proof that you fixed a certain bug) + +-> For fixes, description on how to reproduce the bug are appreciated and help your PR get merged faster +-> For features, description on how to use the feature is appreciated and will help your PR get merged faster + +-> Please use a sensible title for your pull request + +-> Please describe the changes you made. The easier it is to understand what you changed, the higher the chances of your PR being merged (in a timely manner). + +-> If you made multiple independent changes, please make a new PR for each one. This prevents your PR being blocked from merging by one of the changes you made. + +Note that commit messages in PRs will generally be squashed to keep commit history clean. +--> + +Replace this line with a description of your change (and screenshots/screenrecordings if applicable). diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index affe0a37..d49a62f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,8 +34,8 @@ jobs: - uses: actions/checkout@v2 - uses: DoozyX/clang-format-lint-action@v0.13 with: - source: 'NorthstarDedicatedTest LauncherInjector' - exclude: 'NorthstarDedicatedTest/include loader_launcher_proxy loader_wsock32_proxy' + source: 'NorthstarDLL NorthstarLauncher' + exclude: 'NorthstarDLL/include loader_launcher_proxy loader_wsock32_proxy' extensions: 'h,cpp' clangFormatVersion: 13 style: file diff --git a/NorthstarDLL/ns_startup_args.txt b/NorthstarDLL/ns_startup_args.txt deleted file mode 100644 index 02b3865d..00000000 --- a/NorthstarDLL/ns_startup_args.txt +++ /dev/null @@ -1 +0,0 @@ --multiple diff --git a/NorthstarDLL/ns_startup_args_dedi.txt b/NorthstarDLL/ns_startup_args_dedi.txt deleted file mode 100644 index 9d292777..00000000 --- a/NorthstarDLL/ns_startup_args_dedi.txt +++ /dev/null @@ -1 +0,0 @@ -+setplaylist private_match diff --git a/NorthstarLauncher/ns_startup_args.txt b/NorthstarLauncher/ns_startup_args.txt deleted file mode 100644 index 02b3865d..00000000 --- a/NorthstarLauncher/ns_startup_args.txt +++ /dev/null @@ -1 +0,0 @@ --multiple diff --git a/NorthstarLauncher/ns_startup_args_dedi.txt b/NorthstarLauncher/ns_startup_args_dedi.txt deleted file mode 100644 index 9d292777..00000000 --- a/NorthstarLauncher/ns_startup_args_dedi.txt +++ /dev/null @@ -1 +0,0 @@ -+setplaylist private_match |