Merge branch 'main' into docs/discordrpc-release-creation

R2Northstar · Dec 18, 2023 · 73b6189 · 73b6189
2 parents 58166d1 + c9abbe3
commit 73b6189
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,6 +1,5 @@
 <!-- 
 BEFORE OPENING A PULL REQUEST:
--> Check which version of Northstar your change targets. Documentation about feature not yet released should be merged into the `next-release` branch instead
 -> If you're adding multiple independent changes (e.g. adding a section about modding while also fixing a typo on another page) it's generally recommended to split these changes into separate pull requests.
 
 Note that pull requests containing lots of unhelpful commit messages will generally be squashed to keep commit history clean.

diff --git a/docs/development/releases.md b/docs/development/releases.md
@@ -39,7 +39,7 @@ The current process of making release (includinging release candidate) is:
    Push tags ending in `-rcX` where `X` is integer for
     1. Launcher
     2. Mods
-    3. Release (wait until launcher has finished building)
+    3. Release
 
 4. Make draft notes\
    You can use FlightCore to generate them and then format them manually.\
@@ -61,7 +61,7 @@ The current process of making release (includinging release candidate) is:
    Push tags for
     1. Launcher
     2. Mods
-    3. Release (wait until launcher has finished building)
+    3. Release
 
 10. Once release has finished building
     1. Go to GitHub release and select the new unpublished release

diff --git a/docs/installing-northstar/troubleshooting.md b/docs/installing-northstar/troubleshooting.md
@@ -128,14 +128,14 @@ Go to Mods at the bottom of your screen on the main menu, then click Authenticat
 ## Adding Launch Options <a href="#launch-opts" id="launch-opts"></a>
 
 Adding `-northstar` will start Northstar when launching from your library\
-Adding `-vanilla` or removing the `-northstar` will start the normal game when you have Northstar installed
+Adding `-nonorthstardll` or removing the `-northstar` will start the normal game when you have Northstar installed
 
 * For Steam
-  * `Your library > Right click TF|2 > Properties > General > Launch Options > -northstar or -vanilla`
+  * `Your library > Right click TF|2 > Properties > General > Launch Options > -northstar or -nonorthstardll`
 * For EA app
-  * `My collection > Click the three dots on TF|2 > Properties > Advanced launch options > -northstar or -vanilla`
+  * `My collection > Click the three dots on TF|2 > Properties > Advanced launch options > -northstar or -nonorthstardll`
 * For Origin
-  * `Your library > Right click TF|2 > Game Properties > Advanced Launch Options > Command Line Arguments > -northstar or -vanilla`
+  * `Your library > Right click TF|2 > Game Properties > Advanced Launch Options > Command Line Arguments > -northstar or -nonorthstardll`
 
 ## Verifying Game Files <a href="#verify-files" id="verify-files"></a>
 

diff --git a/docs/using-northstar/launch-arguments.md b/docs/using-northstar/launch-arguments.md
@@ -5,8 +5,9 @@ Here's a list of new command line arguments that Northstar introduces, they shou
 | Argument           | Description                                                                                        | Value                            |
 | ------------------ | -------------------------------------------------------------------------------------------------- | -------------------------------- |
 | `-disablelogs`     | Disable logging and creation of log files                                                          |                                  |
-| `-vanilla`         | Disables Northstar loading                                                                         |                                  |
+| `-nonorthstardll`  | Disables Northstar loading                                                                         |                                  |
 | `-northstar`       | Enables Northstar loading                                                                          |                                  |
+| `-vanilla`         | Enables vanilla compatibility                                                                      |                                  |
 | `-dedicated`       | Starts a dedicated server without video output                                                     |                                  |
 | `-waitfordebugger` | Waits for debugger to connect before launching game                                                |                                  |
 | `-language`        | Forces loading of client localisation                                                              | language string ex: `portuguese` |