Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<on event="x" run="port browser sort"/>
<on event="y" run="port browser favorite"/>
<on event="right_trigger" run="port browser refresh"/>
<on event="left_trigger" run="port browser filters" open="main_menu/settings_select/player_setup/player_profile_edit/network_setup/browser_filters/browser_filters_screen"/>
<child widget="main_menu/multiplayer_type_select/join_game/header_join_game"/>
<child widget="main_menu/multiplayer_type_select/join_game/browser_counts"/>
<child widget="main_menu/settings/tab_prompt_previous" x="24" y="76" platform="pointer"/>
Expand All @@ -28,7 +29,7 @@
</widget>
<widget name="main_menu/multiplayer_type_select/join_game/header_lan" controller="1" left="35" top="11" width="363" height="59" bitmap="main_menu/multiplayer_type_select/join_game/header_local_network">
</widget>
<widget name="main_menu/multiplayer_type_select/join_game/browser_counts" type="text" controller="1" left="420" top="46" width="192" height="18" font="ui\small_ui" color="#FF6F9CD0" align="right" wide="106 0" text_flags="no_focus_test">
<widget name="main_menu/multiplayer_type_select/join_game/browser_counts" type="text" controller="1" left="372" top="46" width="240" height="18" font="ui\small_ui" color="#FF6F9CD0" align="right" wide="106 0" text_flags="no_focus_test">
</widget>
<widget name="main_menu/multiplayer_type_select/join_game/browser_columns_line" controller="1" left="28" top="118" width="404" height="4" bitmap="main_menu/parts/line_404" wide="-106 144">
</widget>
Expand Down Expand Up @@ -409,6 +410,7 @@
<child widget="main_menu/multiplayer_type_select/join_game/prompt_refresh" x="156" y="1"/>
<child widget="main_menu/multiplayer_type_select/join_game/prompt_paste" x="156" y="1"/>
<child widget="main_menu/multiplayer_type_select/join_game/prompt_sort" x="304" y="1"/>
<child widget="main_menu/multiplayer_type_select/join_game/prompt_filters" x="408" y="1"/>
<child widget="main_menu/multiplayer_type_select/join_game/prompt_back" x="516" y="1"/>
</widget>
<widget name="main_menu/multiplayer_type_select/join_game/prompt_favorite" type="text" width="124" height="24" wide="-106 0" bitmap="main_menu/parts/item_124x24" text="%y-button FAVORITE" font="ui\small_ui" color="#FFCFE3FF" text_x="8" text_y="3">
Expand All @@ -431,6 +433,11 @@
<on event="start" run="port browser sort"/>
<on event="left_mouse" run="mouse emit accept event"/>
</widget>
<widget name="main_menu/multiplayer_type_select/join_game/prompt_filters" type="text" width="100" height="24" wide="106 0" bitmap="main_menu/parts/item_100x24" text="%left-trigger FILTERS" font="ui\small_ui" color="#FFCFE3FF" text_x="8" text_y="3">
<on event="a" run="port browser filters" open="main_menu/settings_select/player_setup/player_profile_edit/network_setup/browser_filters/browser_filters_screen"/>
<on event="start" run="port browser filters" open="main_menu/settings_select/player_setup/player_profile_edit/network_setup/browser_filters/browser_filters_screen"/>
<on event="left_mouse" run="mouse emit accept event"/>
</widget>
<widget name="main_menu/multiplayer_type_select/join_game/prompt_back" type="text" width="96" height="24" wide="106 0" bitmap="main_menu/parts/item_96x24" text="%b-button BACK" font="ui\small_ui" color="#FFCFE3FF" text_x="8" text_y="3">
<on event="a" run="mouse emit back event"/>
<on event="start" run="mouse emit back event"/>
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/op_allow_upnp" x="28" y="145" platform="desktop android"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/op_join_from_clipboard" x="28" y="166" platform="desktop android"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/op_discord_account" x="28" y="187"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_5" x="28" y="214" platform="desktop android"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/op_map_download" x="28" y="234" platform="desktop android"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/op_map_seed" x="28" y="255" platform="desktop android"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/op_map_seed_upload" x="28" y="276" platform="desktop android"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_9" x="28" y="303" platform="desktop android"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/op_auto" x="28" y="323" platform="desktop android"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/op_server_browser_filters" x="28" y="208"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_6" x="28" y="235" platform="desktop android"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/op_map_download" x="28" y="255" platform="desktop android"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/op_map_seed" x="28" y="276" platform="desktop android"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/op_map_seed_upload" x="28" y="297" platform="desktop android"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_10" x="28" y="324" platform="desktop android"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/op_auto" x="28" y="344" platform="desktop android"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/button_bar" y="414"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/tabs" y="76"/>
</widget>
Expand Down Expand Up @@ -128,16 +129,24 @@
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/discord_account_value" type="text" controller="1" width="140" height="16" color="#FF2896FF" align="center" text_y="-1" text_flags="no_focus_test" wide="120 0" font="ui\small_ui">
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_5" width="344" height="18" bitmap="main_menu/settings/section" platform="desktop android" wide="-106 120">
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_5_title"/>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/op_server_browser_filters" width="344" height="20" flags="pass_unhandled_to_focused_child" bitmap="main_menu/settings/row" color="#FF2896FF" wide="-106 120">
<on event="a" open="main_menu/settings_select/player_setup/player_profile_edit/network_setup/browser_filters/browser_filters_screen"/>
<on event="start" open="main_menu/settings_select/player_setup/player_profile_edit/network_setup/browser_filters/browser_filters_screen"/>
<on event="left_mouse" run="mouse emit accept event"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/server_browser_filters_label"/>
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/server_browser_filters_label" type="text" controller="1" width="332" height="20" string_list="main_menu/settings_select/player_setup/player_profile_edit/network_setup/labels" string_index="5" color="#FF2896FF" text_x="10" text_y="1" wide="0 120" font="ui\small_ui">
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_6" width="344" height="18" bitmap="main_menu/settings/section" platform="desktop android" wide="-106 120">
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_6_title"/>
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_5_title" type="text" controller="1" width="344" height="18" wide="0 120" string_list="main_menu/settings_select/player_setup/player_profile_edit/network_setup/labels" string_index="5" color="#FF6F9CD0" text_x="2" text_y="1" font="ui\small_ui">
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_6_title" type="text" controller="1" width="344" height="18" wide="0 120" string_list="main_menu/settings_select/player_setup/player_profile_edit/network_setup/labels" string_index="6" color="#FF6F9CD0" text_x="2" text_y="1" font="ui\small_ui">
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/op_map_download" width="344" height="20" flags="pass_unhandled_to_focused_child" bitmap="main_menu/settings/row" color="#FF2896FF" platform="desktop android" wide="-106 120">
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/map_download_label"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/map_download_spinner" x="188"/>
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/map_download_label" type="text" controller="1" width="184" height="20" string_list="main_menu/settings_select/player_setup/player_profile_edit/network_setup/labels" string_index="6" color="#FF2896FF" text_x="10" text_y="1" wide="0 120" font="ui\small_ui">
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/map_download_label" type="text" controller="1" width="184" height="20" string_list="main_menu/settings_select/player_setup/player_profile_edit/network_setup/labels" string_index="7" color="#FF2896FF" text_x="10" text_y="1" wide="0 120" font="ui\small_ui">
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/map_download_spinner" type="spinner" top="1" width="140" height="18" flags="pass_unhandled_to_focused_child left_right_tabs_items" strings="ON|OFF" setting="network.map_download" values="true|false" font="ui\small_ui" color="#FF2896FF" align="center" text_y="0" header_bitmap="bitmaps/arrow_sm_left" footer_bitmap="bitmaps/arrow_sm_right" header_bounds="4 -6 16 0" footer_bounds="4 140 16 146" wide="120 0">
<on event="created" run="port setting load"/>
Expand All @@ -146,7 +155,7 @@
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/map_seed_label"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/map_seed_spinner" x="188"/>
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/map_seed_label" type="text" controller="1" width="184" height="20" string_list="main_menu/settings_select/player_setup/player_profile_edit/network_setup/labels" string_index="7" color="#FF2896FF" text_x="10" text_y="1" wide="0 120" font="ui\small_ui">
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/map_seed_label" type="text" controller="1" width="184" height="20" string_list="main_menu/settings_select/player_setup/player_profile_edit/network_setup/labels" string_index="8" color="#FF2896FF" text_x="10" text_y="1" wide="0 120" font="ui\small_ui">
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/map_seed_spinner" type="spinner" top="1" width="140" height="18" flags="pass_unhandled_to_focused_child left_right_tabs_items" strings="ON|OFF" setting="network.map_seed" values="true|false" font="ui\small_ui" color="#FF2896FF" align="center" text_y="0" header_bitmap="bitmaps/arrow_sm_left" footer_bitmap="bitmaps/arrow_sm_right" header_bounds="4 -6 16 0" footer_bounds="4 140 16 146" wide="120 0">
<on event="created" run="port setting load"/>
Expand All @@ -155,21 +164,21 @@
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/map_seed_upload_label"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/map_seed_upload_spinner" x="188"/>
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/map_seed_upload_label" type="text" controller="1" width="184" height="20" string_list="main_menu/settings_select/player_setup/player_profile_edit/network_setup/labels" string_index="8" color="#FF2896FF" text_x="10" text_y="1" wide="0 120" font="ui\small_ui">
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/map_seed_upload_label" type="text" controller="1" width="184" height="20" string_list="main_menu/settings_select/player_setup/player_profile_edit/network_setup/labels" string_index="9" color="#FF2896FF" text_x="10" text_y="1" wide="0 120" font="ui\small_ui">
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/map_seed_upload_spinner" type="spinner" top="1" width="140" height="18" flags="pass_unhandled_to_focused_child left_right_tabs_items" strings="64 KB/S|128 KB/S|256 KB/S|512 KB/S|1 MB/S|2 MB/S|4 MB/S|8 MB/S|10 MB/S" setting="network.map_seed_upload" values="64|128|256|512|1024|2048|4096|8192|10240" font="ui\small_ui" color="#FF2896FF" align="center" text_y="0" header_bitmap="bitmaps/arrow_sm_left" footer_bitmap="bitmaps/arrow_sm_right" header_bounds="4 -6 16 0" footer_bounds="4 140 16 146" wide="120 0">
<on event="created" run="port setting load"/>
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_9" width="344" height="18" bitmap="main_menu/settings/section" platform="desktop android" wide="-106 120">
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_9_title"/>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_10" width="344" height="18" bitmap="main_menu/settings/section" platform="desktop android" wide="-106 120">
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_10_title"/>
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_9_title" type="text" controller="1" width="344" height="18" wide="0 120" string_list="main_menu/settings_select/player_setup/player_profile_edit/network_setup/labels" string_index="9" color="#FF6F9CD0" text_x="2" text_y="1" font="ui\small_ui">
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/section_10_title" type="text" controller="1" width="344" height="18" wide="0 120" string_list="main_menu/settings_select/player_setup/player_profile_edit/network_setup/labels" string_index="10" color="#FF6F9CD0" text_x="2" text_y="1" font="ui\small_ui">
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/op_auto" width="344" height="20" flags="pass_unhandled_to_focused_child" bitmap="main_menu/settings/row" color="#FF2896FF" platform="desktop android" wide="-106 120">
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/auto_label"/>
<child widget="main_menu/settings_select/player_setup/player_profile_edit/network_setup/auto_spinner" x="188"/>
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/auto_label" type="text" controller="1" width="184" height="20" string_list="main_menu/settings_select/player_setup/player_profile_edit/network_setup/labels" string_index="10" color="#FF2896FF" text_x="10" text_y="1" wide="0 120" font="ui\small_ui">
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/auto_label" type="text" controller="1" width="184" height="20" string_list="main_menu/settings_select/player_setup/player_profile_edit/network_setup/labels" string_index="11" color="#FF2896FF" text_x="10" text_y="1" wide="0 120" font="ui\small_ui">
</widget>
<widget name="main_menu/settings_select/player_setup/player_profile_edit/network_setup/auto_spinner" type="spinner" top="1" width="140" height="18" flags="pass_unhandled_to_focused_child left_right_tabs_items" strings="ON|OFF" setting="update.auto" values="true|false" font="ui\small_ui" color="#FF2896FF" align="center" text_y="0" header_bitmap="bitmaps/arrow_sm_left" footer_bitmap="bitmaps/arrow_sm_right" header_bounds="4 -6 16 0" footer_bounds="4 140 16 146" wide="120 0">
<on event="created" run="port setting load"/>
Expand All @@ -180,6 +189,7 @@
<string text="OPEN ROUTER PORT"/>
<string text="JOIN FROM CLIPBOARD"/>
<string text="DISCORD ACCOUNT ›"/>
<string text="SERVER BROWSER FILTERS ›"/>
<string text="MAP SHARING"/>
<string text="DOWNLOAD MAPS"/>
<string text="HELP SEND MAPS"/>
Expand All @@ -194,6 +204,7 @@
<string text="Asks your router to open the game's port (UPnP), so that players can reach the games you host."/>
<string text="Joins a game when you switch to the game with its invite link copied."/>
<string text="Link your Discord account, so that servers that block VPNs let you in while you use one."/>
<string text="Which games the server browser and the local network's list show: full and empty games, a password, the ping, the game types, and words to search for."/>
<string text=""/>
<string text="Joining a game on a Custom Edition map you do not have downloads it from the players, if they share it."/>
<string text="In another player's game, sends its map to the players who join without it, as a torrent's peers do."/>
Expand Down
1 change: 1 addition & 0 deletions port/assets/menus/menus.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"ce/main_menu.settings_select.player_setup.player_profile_edit.interface_settings.xml",
"ce/main_menu.settings_select.player_setup.player_profile_edit.mouse_settings.xml",
"ce/main_menu.settings_select.player_setup.player_profile_edit.name_edit.xml",
"ce/main_menu.settings_select.player_setup.player_profile_edit.network_setup.browser_filters.xml",
"ce/main_menu.settings_select.player_setup.player_profile_edit.network_setup.discord_account.xml",
"ce/main_menu.settings_select.player_setup.player_profile_edit.network_setup.xml",
"ce/main_menu.settings_select.player_setup.player_profile_edit.profile_settings.xml",
Expand Down
Loading
Loading