Merge branch 'main' into fixed-postmatch-deaths

EnderBoy9217 · Sep 10, 2024 · dd11ed3 · dd11ed3
2 parents 691c158 + ee33fd3
commit dd11ed3
Show file tree

Hide file tree

Showing 10 changed files with 715 additions and 488 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -0,0 +1,9 @@
+# Add 'needs code review' label to any changes within the entire repository
+needs code review:
+- changed-files:
+  - any-glob-to-any-file: '**'
+
+# Add 'needs testing' label to any changes within the entire repository
+needs testing:
+- changed-files:
+  - any-glob-to-any-file: '**'
diff --git a/.github/workflows/auto-label-pr.yml b/.github/workflows/auto-label-pr.yml
@@ -0,0 +1,14 @@
+name: Auto-Labeler
+on:
+  pull_request_target:
+    types:
+      - opened
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v5
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
@@ -379,8 +379,8 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"DOWNLOADING_MOD_TITLE_W_PROGRESS" 	"Downloading mod (%s1%)"
 		"DOWNLOADING_MOD_TEXT"				"Downloading %s1 v%s2..."
 		"DOWNLOADING_MOD_TEXT_W_PROGRESS"	"Downloading %s1 v%s2...\n(%s3/%s4 MB)"
-		"CHECKSUMING_TITLE"					"Checksuming mod"
-		"CHECKSUMING_TEXT"					"Verifying contents of %s1 v%s2..."
+		"CHECKSUMING_TITLE"					"Verifying mod integrity"
+		"CHECKSUMING_TEXT"					"Validating files of %s1 v%s2..."
 		"EXTRACTING_MOD_TITLE"				"Extracting mod (%s1%)"
 		"EXTRACTING_MOD_TEXT"				"Extracting %s1 v%s2...\n(%s3/%s4 MB)"
 		"FAILED_DOWNLOADING"				"Failed downloading mod"

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_german.txt b/Northstar.Client/mod/resource/northstar_client_localisation_german.txt
@@ -17,9 +17,9 @@
 Drücke Ja, um zuzustimmen. Du kannst diese Entscheidung jederzeit im Modmenü ändern."
 		"BACK_AUTHENTICATION_AGREEMENT" "Authentifizierungs-Einwilligung"
 		"AUTHENTICATION_AGREEMENT" "Authentifizierungs-Einwilligung"
-		"AUTHENTICATION_AGREEMENT_RESTART" "Ein Neustart ist notwendig, um diese Änderung zu übernehmen"
+		"AUTHENTICATION_AGREEMENT_RESTART" "Ein Neustart ist notwendig, um diese Änderung zu übernehmen."
 
-		"DIALOG_AUTHENTICATING_MASTERSERVER" "Authentifizierung mit Master Server"
+		"DIALOG_AUTHENTICATING_MASTERSERVER" "Authentifizierung mit Master Server."
 		"AUTHENTICATIONAGREEMENT_NO" "Du hast dich gegen die Authentifizierung mit Northstar entschieden. Du kannst die Authentifizierungs-Einwilligung im Modmenü ansehen."
 
 		"MENU_TITLE_SERVER_BROWSER" "Server Browser"

diff --git a/Northstar.Client/mod/resource/ui/menus/mode_select.menu b/Northstar.Client/mod/resource/ui/menus/mode_select.menu
@@ -0,0 +1,343 @@
+resource/ui/menus/mode_select.menu
+{
+	menu
+	{
+		ControlName				Frame
+		xpos					0
+		ypos					0
+		zpos					3
+		wide					f0
+		tall					f0
+		autoResize				0
+		pinCorner				0
+		visible					1
+		enabled					1
+		PaintBackgroundType		0
+		infocus_bgcolor_override	"0 0 0 0"
+		outoffocus_bgcolor_override	"0 0 0 0"
+
+		MenuCommon
+		{
+			ControlName				CNestedPanel
+			xpos					0
+			ypos					0
+			wide					f0
+			tall					f0
+			visible					1
+			controlSettingsFile		"resource/ui/menus/panels/menu_common.res"
+		}
+
+		MatchmakingStatus
+		{
+			ControlName				CNestedPanel
+			xpos					0
+			ypos					0
+			wide					f0
+			tall					f0
+			visible					1
+			controlSettingsFile		"resource/ui/menus/panels/matchmaking_status.res"
+		}
+
+        NextModeImageFrame
+        {
+            ControlName				RuiPanel
+			xpos 					800
+			ypos					160
+			wide					860
+			tall					418
+            labelText				""
+            visible				    1
+            bgcolor_override        "0 0 0 0"
+            paintbackground         1
+            rui                     "ui/basic_border_box.rpak"
+        }
+
+		NextModeImage
+		{
+			ControlName				RuiPanel
+			pin_to_sibling			NextModeImageFrame
+			pin_corner_to_sibling	BOTTOM
+			pin_to_sibling_corner	BOTTOM
+//			xpos                    -12
+			ypos                    -12
+			wide					480
+			tall					240
+			visible					1
+			scaleImage				1
+            rui                     "ui/basic_menu_image.rpak"
+			zpos					2
+		}
+
+		ModeIconImage
+		{
+			ControlName				RuiPanel
+			pin_to_sibling			NextModeImage
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	TOP_LEFT
+			xpos                    0
+			ypos                    -16
+			wide					72
+			tall					72
+			visible					1
+			scaleImage				1
+            rui                     "ui/basic_image_add.rpak"
+			zpos					2
+		}
+
+		NextModeName
+		{
+			ControlName				Label
+			pin_to_sibling			NextModeImageFrame
+			pin_corner_to_sibling	TOP
+			pin_to_sibling_corner	TOP
+			ypos					-20
+			wide                    840
+			auto_tall_tocontents	1
+			visible					1
+			labelText				"Foo"
+			textAlignment           center
+			centerWrap              1
+			font					Default_43_DropShadow
+			allcaps					1
+			fgcolor_override		"255 255 255 255"
+		}
+
+		NextModeDesc
+		{
+			ControlName				Label
+			pin_to_sibling			NextModeName
+			pin_corner_to_sibling	TOP
+			pin_to_sibling_corner	BOTTOM
+			xpos					0
+			ypos					0
+			wide					840
+			wrap					1
+			auto_tall_tocontents	1
+			visible					1
+			labelText				"Bar"
+			textAlignment           center
+			centerWrap              1
+			font					Default_27
+			allcaps					0
+			fgcolor_override		"255 255 255 255"
+		}
+
+		MenuTitle
+		{
+			ControlName				Label
+			InheritProperties		MenuTitle
+			labelText				"#SELECT_GAME_MODE"
+		}
+
+		ButtonRowAnchor
+		{
+			ControlName				Label
+			labelText				""
+
+			xpos                    96
+            ypos                    160
+		}
+
+		BtnMode1
+		{
+			ControlName				RuiButton
+			InheritProperties		RuiSmallButton
+			classname 				ModeButton
+			scriptID				0
+			navUp					BtnMode15
+			navDown					BtnMode2
+
+			pin_to_sibling				ButtonRowAnchor
+			pin_corner_to_sibling		TOP_LEFT
+			pin_to_sibling_corner		TOP_LEFT
+		}
+		BtnMode2
+		{
+			ControlName				RuiButton
+			InheritProperties		RuiSmallButton
+			classname 				ModeButton
+			scriptID				1
+			pin_to_sibling			BtnMode1
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	BOTTOM_LEFT
+			navUp					BtnMode1
+			navDown					BtnMode3
+		}
+		BtnMode3
+		{
+			ControlName				RuiButton
+			InheritProperties		RuiSmallButton
+			classname 				ModeButton
+			scriptID				2
+			pin_to_sibling			BtnMode2
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	BOTTOM_LEFT
+			navUp					BtnMode2
+			navDown					BtnMode4
+		}
+		BtnMode4
+		{
+			ControlName				RuiButton
+			InheritProperties		RuiSmallButton
+			classname 				ModeButton
+			scriptID				3
+			pin_to_sibling			BtnMode3
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	BOTTOM_LEFT
+			//ypos					11
+			navUp					BtnMode3
+			navDown					BtnMode5
+		}
+		BtnMode5
+		{
+			ControlName				RuiButton
+			InheritProperties		RuiSmallButton
+			classname 				ModeButton
+			scriptID				4
+			pin_to_sibling			BtnMode4
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	BOTTOM_LEFT
+			navUp					BtnMode4
+			navDown					BtnMode6
+		}
+		BtnMode6
+		{
+			ControlName				RuiButton
+			InheritProperties		RuiSmallButton
+			classname 				ModeButton
+			scriptID				5
+			pin_to_sibling			BtnMode5
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	BOTTOM_LEFT
+			navUp					BtnMode5
+			navDown					BtnMode7
+		}
+		BtnMode7
+		{
+			ControlName				RuiButton
+			InheritProperties		RuiSmallButton
+			classname 				ModeButton
+			scriptID				6
+			pin_to_sibling			BtnMode6
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	BOTTOM_LEFT
+			navUp					BtnMode6
+			navDown					BtnMode8
+		}
+		BtnMode8
+		{
+			ControlName				RuiButton
+			InheritProperties		RuiSmallButton
+			classname 				ModeButton
+			scriptID				7
+			pin_to_sibling			BtnMode7
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	BOTTOM_LEFT
+			navUp					BtnMode7
+			navDown					BtnMode9
+		}
+		BtnMode9
+		{
+			ControlName				RuiButton
+			InheritProperties		RuiSmallButton
+			classname 				ModeButton
+			scriptID				8
+			pin_to_sibling			BtnMode8
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	BOTTOM_LEFT
+			navUp					BtnMode8
+			navDown					BtnMode10
+		}
+		BtnMode10
+		{
+			ControlName				RuiButton
+			InheritProperties		RuiSmallButton
+			classname 				ModeButton
+			scriptID				9
+			pin_to_sibling			BtnMode9
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	BOTTOM_LEFT
+			navUp					BtnMode9
+			navDown					BtnMode11
+		}
+		BtnMode11
+		{
+			ControlName				RuiButton
+			InheritProperties		RuiSmallButton
+			classname 				ModeButton
+			scriptID				10
+			pin_to_sibling			BtnMode10
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	BOTTOM_LEFT
+			navUp					BtnMode10
+			navDown					BtnMode12
+		}
+		BtnMode12
+		{
+			ControlName				RuiButton
+			InheritProperties		RuiSmallButton
+			classname 				ModeButton
+			scriptID				11
+			pin_to_sibling			BtnMode11
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	BOTTOM_LEFT
+			navUp					BtnMode11
+			navDown					BtnMode13
+		}
+		BtnMode13
+		{
+			ControlName				RuiButton
+			InheritProperties		RuiSmallButton
+			classname 				ModeButton
+			scriptID				12
+			pin_to_sibling			BtnMode12
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	BOTTOM_LEFT
+			navUp					BtnMode12
+			navDown					BtnMode14
+		}
+		BtnMode14
+		{
+			ControlName				RuiButton
+			InheritProperties		RuiSmallButton
+			classname 				ModeButton
+			scriptID				13
+			pin_to_sibling			BtnMode13
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	BOTTOM_LEFT
+			navUp					BtnMode13
+			navDown					BtnMode15
+		}
+		BtnMode15
+		{
+			ControlName				RuiButton
+			InheritProperties		RuiSmallButton
+			classname 				ModeButton
+			scriptID				14
+			pin_to_sibling			BtnMode14
+			pin_corner_to_sibling	TOP_LEFT
+			pin_to_sibling_corner	BOTTOM_LEFT
+			navUp					BtnMode14
+			navDown					BtnMode1
+		}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+		ButtonTooltip
+		{
+			ControlName				CNestedPanel
+			InheritProperties		ButtonTooltip
+		}
+
+		FooterButtons
+		{
+			ControlName				CNestedPanel
+			xpos					0
+			ypos					r119
+			wide					f0
+			tall					36
+			visible					1
+			controlSettingsFile		"resource/ui/menus/panels/footer_buttons.res"
+		}
+	}
+}