From 0f79060f585ed87476fbbc26ca7e3b7367c4863a Mon Sep 17 00:00:00 2001 From: evanpelle Date: Tue, 7 Oct 2025 18:06:16 -0700 Subject: [PATCH 1/2] add openfront copyright to loading screen (#2151) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description: This will make the copyright notice more clear. Screenshot 2025-10-07 at 6 03 44 PM ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced ## Please put your Discord username so you can be contacted if a bug or regression is found: evan --- resources/lang/en.json | 1 + src/client/GameStartingModal.ts | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/resources/lang/en.json b/resources/lang/en.json index e4771d029..24d5e297d 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -249,6 +249,7 @@ }, "game_starting_modal": { "title": "Game is Starting...", + "code_license": "Code licensed under AGPL-3.0", "desc": "Preparing for the lobby to start. Please wait." }, "difficulty": { diff --git a/src/client/GameStartingModal.ts b/src/client/GameStartingModal.ts index 9ae0ad232..ebbeea98b 100644 --- a/src/client/GameStartingModal.ts +++ b/src/client/GameStartingModal.ts @@ -84,13 +84,20 @@ export class GameStartingModal extends LitElement { .modal button:active { transform: translateY(1px); } + + .copyright { + font-size: 32px; + margin-top: 20px; + opacity: 1; + } `; render() { return html` `; } From af50e5e9c868a516b1943475901955caf954e452 Mon Sep 17 00:00:00 2001 From: FloPinguin Date: Wed, 8 Oct 2025 03:10:00 +0200 Subject: [PATCH 2/2] "Spectate" instead of "Keep playing" after loss (#2150) ## Description: Fixes #2149 Losing a game now causes the "Keep playing" button to say "Spectate" instead. ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced ## Please put your Discord username so you can be contacted if a bug or regression is found: FloPinguin --- resources/lang/en.json | 1 + src/client/graphics/layers/WinModal.ts | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/resources/lang/en.json b/resources/lang/en.json index 24d5e297d..860f3f7ae 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -497,6 +497,7 @@ "other_won": "{player} has won!", "exit": "Exit Game", "keep": "Keep Playing", + "spectate": "Spectate", "wishlist": "Wishlist on Steam!" }, "leaderboard": { diff --git a/src/client/graphics/layers/WinModal.ts b/src/client/graphics/layers/WinModal.ts index 753572f2f..af41ddde3 100644 --- a/src/client/graphics/layers/WinModal.ts +++ b/src/client/graphics/layers/WinModal.ts @@ -28,6 +28,9 @@ export class WinModal extends LitElement implements Layer { @state() showButtons = false; + @state() + private isWin = false; + @state() private patternContent: TemplateResult | null = null; @@ -68,7 +71,9 @@ export class WinModal extends LitElement implements Layer { @click=${this.hide} class="flex-1 px-3 py-3 text-base cursor-pointer bg-blue-500/60 text-white border-0 rounded transition-all duration-200 hover:bg-blue-500/80 hover:-translate-y-px active:translate-y-px" > - ${translateText("win_modal.keep")} + ${this.isWin + ? translateText("win_modal.keep") + : translateText("win_modal.spectate")} @@ -230,10 +235,12 @@ export class WinModal extends LitElement implements Layer { this.eventBus.emit(new SendWinnerEvent(wu.winner, wu.allPlayersStats)); if (wu.winner[1] === this.game.myPlayer()?.team()) { this._title = translateText("win_modal.your_team"); + this.isWin = true; } else { this._title = translateText("win_modal.other_team", { team: wu.winner[1], }); + this.isWin = false; } this.show(); } else { @@ -250,10 +257,12 @@ export class WinModal extends LitElement implements Layer { winnerClient === this.game.myPlayer()?.clientID() ) { this._title = translateText("win_modal.you_won"); + this.isWin = true; } else { this._title = translateText("win_modal.other_won", { player: winner.name(), }); + this.isWin = false; } this.show(); }