diff options
| author | Emma Miler <emma.pi@protonmail.com> | 2023-04-11 20:49:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-11 20:49:35 +0200 |
| commit | db2434b524c284913c91556c75ff1ebd4226c96e (patch) | |
| tree | 878b21866830ae4c6cc78963d7e93689ae16028c /Northstar.Client/mod/scripts/vscripts/ui | |
| parent | 7ec5413c0e71300814350164c69e6452136bd4cd (diff) | |
| download | NorthstarMods-db2434b524c284913c91556c75ff1ebd4226c96e.tar.gz NorthstarMods-db2434b524c284913c91556c75ff1ebd4226c96e.zip | |
New presence code for plugins v2 (#532)
* test
* Update cl_presence.nut
* Update Northstar.Client/mod/scripts/vscripts/presence/ui_presence.nut
* Apply suggestions from code review
* New scripts
* fix playlist and add native funcs to build
* remove snake cases from GameStateStruct
* I forgor
---------
Co-authored-by: cat_or_not <41955154+catornot@users.noreply.github.com>
Diffstat (limited to 'Northstar.Client/mod/scripts/vscripts/ui')
3 files changed, 2 insertions, 14 deletions
diff --git a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut index 90a535ee0..c83381fdb 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/_menus.nut @@ -187,6 +187,7 @@ bool function UICodeCallback_LevelLoadingStarted( string levelname ) CloseAllDialogs() uiGlobal.loadingLevel = levelname + uiGlobal.isLoading = true StopMusic() @@ -235,6 +236,7 @@ void function UICodeCallback_LevelLoadingFinished( bool error ) } uiGlobal.loadingLevel = "" + uiGlobal.isLoading = false Signal( uiGlobal.signalDummy, "LevelFinishedLoading" ) } diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_lobby.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_lobby.nut index 938e0d3fe..3c868aab2 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/menu_lobby.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_lobby.nut @@ -372,8 +372,6 @@ void function StartPrivateMatch( var button ) return ClientCommand( "StartPrivateMatchSearch" ) - NSSetLoading(true) - NSUpdateListenServer() } void function DoRoomInviteIfAllowed( var button ) diff --git a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut index 030282557..b2e2a8b6c 100644 --- a/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut +++ b/Northstar.Client/mod/scripts/vscripts/ui/menu_ns_serverbrowser.nut @@ -1058,18 +1058,6 @@ void function ThreadedAuthAndConnectToServer( string password = "" ) } file.cancelConnection = false - NSSetLoading( true ) - NSUpdateServerInfo( - NSGetServerID( file.lastSelectedServer ), - NSGetServerName( file.lastSelectedServer ), - password, - NSGetServerPlayerCount( file.lastSelectedServer ), - NSGetServerMaxPlayerCount( file.lastSelectedServer ), - NSGetServerMap( file.lastSelectedServer ), - Localize( GetMapDisplayName( NSGetServerMap( file.lastSelectedServer ) ) ), - NSGetServerPlaylist( file.lastSelectedServer ), - Localize( GetPlaylistDisplayName( NSGetServerPlaylist( file.lastSelectedServer ) ) ) - ) if ( NSWasAuthSuccessful() ) { |