From 31441ac3ddc5f370279e4204ef6cac27cf3e2f65 Mon Sep 17 00:00:00 2001 From: APuddle210 Date: Fri, 11 Apr 2025 23:56:13 -0400 Subject: [PATCH 1/4] Add Clean Ver of New Contribution Template (#468) ## Description: Clean version of the New Contribution Template without the example text, for once people are familiar or when they need to create a bunch all at once to clear a backlog (like me, today). Fixes #469 ## Please complete the following: - [X] I have added screenshots for all UI updates - [X] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced - [X] I understand that submitting code with bugs that could have been caught through manual testing blocks releases and new features for all contributors ## Please put your Discord username so you can be contacted if a bug or regression is found: aPuddle --- .../new-contribution-template.md | 59 ++----------------- 1 file changed, 5 insertions(+), 54 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/new-contribution-template.md b/.github/ISSUE_TEMPLATE/new-contribution-template.md index 731517927..3851903bc 100644 --- a/.github/ISSUE_TEMPLATE/new-contribution-template.md +++ b/.github/ISSUE_TEMPLATE/new-contribution-template.md @@ -1,75 +1,26 @@ --- -name: New Contribution Template -about: "For new Contributions to be added to the Project Management Process " +name: New Contribution Template (Clean) +about: "For new Contributions to be added to the Project Management Process, examples removed" title: "" labels: "" assignees: "" --- -By the time the contribution is ready for final review, the main post of the Issue should be able to serve as the PR description, supplemented by the testing results/peer reviews. - ## Purpose -Very brief statement as to what this contribution's purpose is. Examples: - -- Add new feature that allows users to create custom flags. -- Fix bug: modals not closing on game start. -- Add new Iceland map. +. --- ## Objectives -Please provide a short list of objectives for the contribution, the number and level of specificity of the items will depend on the scope of the contribution. Is the means by which completion can be measured and success of the changes assessed. May be the starting point for the creation of sub-issues if collaboration is needed/desired. Examples: - -**For the Custom Flags Feature** - -- Create UI for Flag Customization. -- Create customization features that provide a wide range of possibilities for users to express themselves. -- Ensure some customization features are limited to users with certain traits. -- Assess user traits related to limited customization against Discord roles. -- Create method for customized flags to be displayed correctly on all connected clients. -- Create means of restricting certain customization combinations to prevent hate symbols, or ensure it is not possible to create hate symbols with provided customizations. - -**For a Bug Fix** - -- Ensure all open modals except game start (and any other expected) modal close as expected when the game starts. -- Ensure all modals still function as expected prior to game start. - -**For New Map** - -- Add New Map, Iceland to the game for use in Singleplayer and Custom lobbies. -- Add map to lobby rotation. +- . --- ## Description -Please provide a more detailed description of what is being changed/added, how it is being changed/added, provide any additional detail related to the objectives which would be needed or useful in assessing the contribution overall. - -Examples of what info would be expected: - -**For the Custom Flags Feature** - -- Details about where the UI would be accessed from, mockups of a concept UI if they exist. -- What kind of customizations will be available. -- What traits will be provided limited customization features? (Patreons, Devs, Owner, etc.) -- What kind of customizations will be limited. -- Any high-level technical implementation details that may be useful in assessing viability, or which will require assistance from other contributors or the project owner (communication between the clients, use or access to a backend DB, discord integration, etc.) - -**For a Bug Fix** - -- Details about the bug's behavior -- Details about the cause of the bug (once known) -- Details about the fix -- Any secondary effects of implementing the fix - -**For a New Map** - -- Size of the map -- Number of Nation Bots -- Images of the Map -- Any interesting features of the map +. --- From 77abece577a1bddc505d6017b373ea168f5665e0 Mon Sep 17 00:00:00 2001 From: Aotumuri Date: Sat, 12 Apr 2025 12:58:40 +0900 Subject: [PATCH 2/4] Fixed flag size (#431) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description: before スクリーンショット 2025-04-05 16 45 08 now スクリーンショット 2025-04-05 16 44 43 Fixes #474 ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced - [x] I understand that submitting code with bugs that could have been caught through manual testing blocks releases and new features for all contributors ## Please put your Discord username so you can be contacted if a bug or regression is found: Aotumuri --- resources/flags/uk_us_flag.svg | 424 ++++++++++++++++++++++++--------- src/client/LangSelector.ts | 2 +- 2 files changed, 314 insertions(+), 112 deletions(-) diff --git a/resources/flags/uk_us_flag.svg b/resources/flags/uk_us_flag.svg index a4f09a725..231cb4e04 100644 --- a/resources/flags/uk_us_flag.svg +++ b/resources/flags/uk_us_flag.svg @@ -1,112 +1,314 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/client/LangSelector.ts b/src/client/LangSelector.ts index fa3bf9462..d177f2cbf 100644 --- a/src/client/LangSelector.ts +++ b/src/client/LangSelector.ts @@ -246,7 +246,7 @@ export class LangSelector extends LitElement { : { native: "English", en: "English", - svg: "xx", + svg: "uk_us_flag", }); return html` From 608f57b2a9bc21406c8f651d16c198731d960627 Mon Sep 17 00:00:00 2001 From: Tom <88888824+ImDarkTom@users.noreply.github.com> Date: Sat, 12 Apr 2025 16:57:04 +0100 Subject: [PATCH 3/4] Improve private lobby code readability (#438) ## Description: Use mono font for code generated for private lobbies, making it easier to distinguish some letters (lowercase L's vs. capital I's). Fixes #391. Fixes #462 Before: ![image](https://github.com/user-attachments/assets/0b6f6f15-5e7c-4c31-abed-3301a3f508e9) After: ![image](https://github.com/user-attachments/assets/abd7b6f7-75e6-4461-85fa-528ebf92cc14) ## Please complete the following: - [X] I have added screenshots for all UI updates - [X] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced - [X] I understand that submitting code with bugs that could have been caught through manual testing blocks releases and new features for all contributors ## Please put your Discord username so you can be contacted if a bug or regression is found: imdarktom --- src/client/styles.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client/styles.css b/src/client/styles.css index b7c531151..9409a90fa 100644 --- a/src/client/styles.css +++ b/src/client/styles.css @@ -214,6 +214,8 @@ label.option-card:hover { font-size: 14px; color: #fff; text-align: center; + font-family: monospace; + font-weight: 600; } .players-list { From 4c777412b6efc3260c75ffacb4c1ec3a9fd8b0a9 Mon Sep 17 00:00:00 2001 From: Aotumuri Date: Sun, 13 Apr 2025 01:34:15 +0900 Subject: [PATCH 4/4] Improve Key Interaction Visibility (#428) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description: Enhanced the visual clarity of key inputs using custom CSS. Keyboard keys now appear more distinct and intuitive, making the help modal easier to understand at a glance. Keys can be changed easily. Fixes #477 ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced - [x] I understand that submitting code with bugs that could have been caught through manual testing blocks releases and new features for all contributors ## Please put your Discord username so you can be contacted if a bug or regression is found: aotumuri(.w. / (๑-̀ㅂ-́)و✧) --- src/client/HelpModal.ts | 61 ++++++++++++++--- src/client/styles.css | 1 + src/client/styles/components/controls.css | 80 +++++++++++++++++++++++ 3 files changed, 132 insertions(+), 10 deletions(-) create mode 100644 src/client/styles/components/controls.css diff --git a/src/client/HelpModal.ts b/src/client/HelpModal.ts index 8de819377..3fb41cc97 100644 --- a/src/client/HelpModal.ts +++ b/src/client/HelpModal.ts @@ -35,43 +35,84 @@ export class HelpModal extends LitElement { - Space + Space ${translateText("help_modal.action_alt_view")} - Shift + left click + +
+ Shift + + +
+
+
+
+
+ ${translateText("help_modal.action_attack_altclick")} - Ctrl + left click + +
+ Ctrl + + +
+
+
+
+
+ ${translateText("help_modal.action_build")} - Alt + left click + +
+ Alt + + +
+
+
+
+
+ ${translateText("help_modal.action_emote")} - C + C ${translateText("help_modal.action_center")} - Q / E + Q / E ${translateText("help_modal.action_zoom")} - W / A / S / D + W A S D ${translateText("help_modal.action_move_camera")} - 1 / 2 + 1 / 2 ${translateText("help_modal.action_ratio_change")} - Shift + scroll down / scroll up + +
+ Shift + + +
+
+
+
+
+
↑
+
↓
+
+
+
+ ${translateText("help_modal.action_ratio_change")} - ALT + R + ALT + R ${translateText("help_modal.action_reset_gfx")} diff --git a/src/client/styles.css b/src/client/styles.css index 9409a90fa..c85b38c60 100644 --- a/src/client/styles.css +++ b/src/client/styles.css @@ -8,6 +8,7 @@ @import url("./styles/layout/container.css"); @import url("./styles/components/button.css"); @import url("./styles/components/modal.css"); +@import url("./styles/components/controls.css"); * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; diff --git a/src/client/styles/components/controls.css b/src/client/styles/components/controls.css new file mode 100644 index 000000000..0bd8d162f --- /dev/null +++ b/src/client/styles/components/controls.css @@ -0,0 +1,80 @@ +.scroll-combo-horizontal { + display: inline-flex; + align-items: center; + gap: 12px; + font-family: sans-serif; + color: white; +} + +.key { + display: inline-block; + padding: 4px 14px; + border-radius: 6px; + background-color: #000; + color: #fff; + font-weight: bold; + box-shadow: 0 2px 0 #444; +} + +.plus { + font-size: 16px; + color: #ccc; +} + +.mouse-shell { + width: 28px; + height: 45px; + border: 2px solid #ccc; + border-radius: 50px; + position: relative; + background: transparent; +} + +.mouse-left-corner { + position: absolute; + top: 0; + left: 0; + width: 50%; + height: 50%; + background-color: #ff4d4d; + border-top-left-radius: 50px; +} + +.mouse-right-corner { + position: absolute; + top: 0; + right: 0; + width: 50%; + height: 50%; + background-color: #ff4d4d; + border-top-right-radius: 50px; +} + +.mouse-wheel { + width: 4px; + height: 8px; + background-color: #ccc; + border-radius: 2px; + position: absolute; + top: 8px; + left: 50%; + transform: translateX(-50%); +} + +#highlighted-wheel { + background-color: #ff4d4d; +} + +.mouse-with-arrows { + display: flex; + align-items: center; + gap: 6px; +} + +.mouse-arrows-side { + display: flex; + flex-direction: column; + gap: 4px; + font-size: 14px; + color: #ccc; +}