-
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 requiredonclient-warning
- Loading branch information
Showing
42 changed files
with
501 additions
and
72 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,4 @@ | ||
| /Northstar.Client/mod/resource/northstar_client_localisation_*.txt text diff working-tree-encoding=UTF-16LE-BOM | ||
| /Northstar.Client/mod/resource/northstar_client_localisation_*.txt text diff working-tree-encoding=UTF-16LE-BOM | ||
|
|
||
| # Highlight `.gnut` like `.nut` files | ||
| *.gnut linguist-language=Squirrel |
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 |
|---|---|---|
|
|
@@ -4,6 +4,9 @@ on: | |
| issues: | ||
| types: | ||
| - opened | ||
| pull_request_target: | ||
| types: | ||
| - opened | ||
|
|
||
| jobs: | ||
| add-to-project: | ||
|
|
||
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
20 changes: 12 additions & 8 deletions
20
Northstar.Client/mod/scripts/vscripts/presence/ui_presence.nut
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 |
|---|---|---|
| @@ -1,12 +1,16 @@ | ||
| untyped | ||
| globalize_all_functions | ||
|
|
||
| void function NorthstarCodeCallback_GenerateUIPresence() { | ||
| UIPresenceStruct uis | ||
| UIPresenceStruct function DiscordRPC_GenerateUIPresence( UIPresenceStruct uis ) | ||
| { | ||
| if ( uiGlobal.isLoading ) | ||
| uis.gameState = eDiscordGameState.LOADING; | ||
| else if ( uiGlobal.loadedLevel == "" ) | ||
| uis.gameState = eDiscordGameState.MAINMENU; | ||
| else if ( IsLobby() || uiGlobal.loadedLevel == "mp_lobby" ) | ||
| uis.gameState = eDiscordGameState.LOBBY; | ||
| else | ||
| uis.gameState = eDiscordGameState.INGAME; | ||
|
|
||
| uis.isLoading = uiGlobal.isLoading | ||
| uis.isLobby = IsLobby() | ||
| uis.loadingLevel = uiGlobal.loadingLevel | ||
| uis.loadedLevel = uiGlobal.loadedLevel | ||
| NSPushUIPresence(uis) | ||
| } | ||
| return uis | ||
| } |
117 changes: 117 additions & 0 deletions
117
Northstar.Client/mod/scripts/vscripts/ui/menu_ns_moddownload.nut
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,117 @@ | ||
| global function DownloadMod | ||
| global function DisplayModDownloadErrorDialog | ||
|
|
||
| global enum eModInstallStatus | ||
| { | ||
| DOWNLOADING, | ||
| CHECKSUMING, | ||
| EXTRACTING, | ||
| DONE, | ||
| FAILED, | ||
| FAILED_READING_ARCHIVE, | ||
| FAILED_WRITING_TO_DISK, | ||
| MOD_FETCHING_FAILED, | ||
| MOD_CORRUPTED, | ||
| NO_DISK_SPACE_AVAILABLE, | ||
| NOT_FOUND | ||
| } | ||
|
|
||
| const int MB = 1024*1000; | ||
|
|
||
| bool function DownloadMod( RequiredModInfo mod ) | ||
| { | ||
| // Downloading mod UI | ||
| DialogData dialogData | ||
| dialogData.header = Localize( "#DOWNLOADING_MOD_TITLE" ) | ||
| dialogData.message = Localize( "#DOWNLOADING_MOD_TEXT", mod.name, mod.version ) | ||
| dialogData.showSpinner = true; | ||
|
|
||
| // Prevent user from closing dialog | ||
| dialogData.forceChoice = true; | ||
| OpenDialog( dialogData ) | ||
|
|
||
| // Save reference to UI elements, to update their content | ||
| var menu = GetMenu( "Dialog" ) | ||
| var header = Hud_GetChild( menu, "DialogHeader" ) | ||
| var body = GetSingleElementByClassname( menu, "DialogMessageClass" ) | ||
|
|
||
| // Start actual mod downloading | ||
| NSDownloadMod( mod.name, mod.version ) | ||
|
|
||
| ModInstallState state = NSGetModInstallState() | ||
| while ( state.status < eModInstallStatus.DONE ) | ||
| { | ||
| state = NSGetModInstallState() | ||
| UpdateModDownloadDialog( mod, state, menu, header, body ) | ||
| WaitFrame() | ||
| } | ||
|
|
||
| printt( "Mod status:", state.status ) | ||
|
|
||
| // Close loading dialog | ||
| CloseActiveMenu() | ||
|
|
||
| return state.status == eModInstallStatus.DONE | ||
| } | ||
|
|
||
| void function UpdateModDownloadDialog( RequiredModInfo mod, ModInstallState state, var menu, var header, var body ) | ||
| { | ||
| switch ( state.status ) | ||
| { | ||
| case eModInstallStatus.DOWNLOADING: | ||
| Hud_SetText( header, Localize( "#DOWNLOADING_MOD_TITLE_W_PROGRESS", string( state.ratio ) ) ) | ||
| Hud_SetText( body, Localize( "#DOWNLOADING_MOD_TEXT_W_PROGRESS", mod.name, mod.version, floor( state.progress / MB ), floor( state.total / MB ) ) ) | ||
| break | ||
| case eModInstallStatus.CHECKSUMING: | ||
| Hud_SetText( header, Localize( "#CHECKSUMING_TITLE" ) ) | ||
| Hud_SetText( body, Localize( "#CHECKSUMING_TEXT", mod.name, mod.version ) ) | ||
| break | ||
| case eModInstallStatus.EXTRACTING: | ||
| Hud_SetText( header, Localize( "#EXTRACTING_MOD_TITLE", string( state.ratio ) ) ) | ||
| Hud_SetText( body, Localize( "#EXTRACTING_MOD_TEXT", mod.name, mod.version, floor( state.progress / MB ), floor( state.total / MB ) ) ) | ||
| break | ||
| default: | ||
| break | ||
| } | ||
| } | ||
|
|
||
| void function DisplayModDownloadErrorDialog( string modName ) | ||
| { | ||
| ModInstallState state = NSGetModInstallState() | ||
|
|
||
| DialogData dialogData | ||
| dialogData.header = Localize( "#FAILED_DOWNLOADING", modName ) | ||
| dialogData.image = $"ui/menu/common/dialog_error" | ||
|
|
||
| switch ( state.status ) | ||
| { | ||
| case eModInstallStatus.FAILED_READING_ARCHIVE: | ||
| dialogData.message = Localize( "#FAILED_READING_ARCHIVE" ) | ||
| break | ||
| case eModInstallStatus.FAILED_WRITING_TO_DISK: | ||
| dialogData.message = Localize( "#FAILED_WRITING_TO_DISK" ) | ||
| break | ||
| case eModInstallStatus.MOD_FETCHING_FAILED: | ||
| dialogData.message = Localize( "#MOD_FETCHING_FAILED" ) | ||
| break | ||
| case eModInstallStatus.MOD_CORRUPTED: | ||
| dialogData.message = Localize( "#MOD_CORRUPTED" ) | ||
| break | ||
| case eModInstallStatus.NO_DISK_SPACE_AVAILABLE: | ||
| dialogData.message = Localize( "#NO_DISK_SPACE_AVAILABLE" ) | ||
| break | ||
| case eModInstallStatus.NOT_FOUND: | ||
| dialogData.message = Localize( "#NOT_FOUND" ) | ||
| break | ||
| case eModInstallStatus.FAILED: | ||
| default: | ||
| dialogData.message = Localize( "#MOD_FETCHING_FAILED_GENERAL" ) | ||
| break | ||
| } | ||
|
|
||
| AddDialogButton( dialogData, "#DISMISS" ) | ||
| AddDialogFooter( dialogData, "#A_BUTTON_SELECT" ) | ||
| AddDialogFooter( dialogData, "#B_BUTTON_DISMISS_RUI" ) | ||
|
|
||
| OpenDialog( dialogData ) | ||
| } |
Oops, something went wrong.