-
Notifications
You must be signed in to change notification settings - Fork 116
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into weapon-drop-callback
- Loading branch information
Showing
32 changed files
with
15,025 additions
and
164 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| name: add-to-project | ||
|
|
||
| on: | ||
| issues: | ||
| types: | ||
| - opened | ||
| pull_request_target: | ||
| types: | ||
| - opened | ||
|
|
||
| jobs: | ||
| add-to-project: | ||
| name: Add to project | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/[email protected] | ||
| with: | ||
| project-url: "https://github.com/orgs/R2Northstar/projects/3" | ||
| github-token: "${{ secrets.ADD_TO_PROJECT_PAT }}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| global function AtlasAuthDialog | ||
|
|
||
| void function AtlasAuthDialog() | ||
| { | ||
| thread AtlasAuthDialog_Threaded() | ||
| } | ||
|
|
||
| void function AtlasAuthDialog_Threaded() | ||
| { | ||
| // wait at least 1 frame so that the main menu can be loaded first | ||
| WaitFrame() | ||
|
|
||
| while ( !NSIsMasterServerAuthenticated() || GetConVarBool( "ns_auth_allow_insecure" ) ) | ||
| WaitFrame() | ||
|
|
||
| if ( GetConVarBool( "ns_auth_allow_insecure" ) ) | ||
| return | ||
|
|
||
| MasterServerAuthResult res = NSGetMasterServerAuthResult() | ||
|
|
||
| // do nothing on successful authentication | ||
| if ( res.success ) | ||
| return | ||
|
|
||
| EmitUISound( "blackmarket_purchase_fail" ) | ||
|
|
||
| DialogData dialogData | ||
| dialogData.image = $"ui/menu/common/dialog_error" | ||
| dialogData.header = Localize( "#AUTHENTICATION_FAILED_HEADER" ) | ||
|
|
||
| // if we got a special error message from Atlas, display it | ||
| if ( res.errorMessage != "" ) | ||
| dialogData.message = res.errorMessage | ||
| else | ||
| dialogData.message = Localize( "#AUTHENTICATION_FAILED_BODY" ) | ||
|
|
||
| if ( res.errorCode != "" ) | ||
| dialogData.message += format( "\n\n%s", Localize( "#AUTHENTICATION_FAILED_ERROR_CODE", res.errorCode ) ) | ||
|
|
||
| string link = "https://r2northstar.gitbook.io/r2northstar-wiki/installing-northstar/troubleshooting" | ||
| // link to generic troubleshooting page if we don't have an error code from Atlas | ||
| if ( res.errorCode != "" ) | ||
| link = format( "%s#%s", link, res.errorCode ) | ||
|
|
||
| CloseAllDialogs() | ||
| AddDialogButton( dialogData, "#OK" ) | ||
| AddDialogButton( dialogData, Localize( "#AUTHENTICATION_FAILED_HELP" ), void function() : ( dialogData, link ) | ||
| { | ||
| // todo: get MS to redirect, so i can use an MS link or something? | ||
| LaunchExternalWebBrowser( link, WEBBROWSER_FLAG_FORCEEXTERNAL ) | ||
| // keep the dialog open | ||
| OpenDialog( dialogData ) | ||
| } ) | ||
|
|
||
| OpenDialog( dialogData ) | ||
| } |
Oops, something went wrong.