Skip to content

feat: Add alliance request panel with colored circle indicators (#2905) #2906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zimri-leisher wants to merge 9 commits into
base: main
Choose a base branch
from
Open

feat: Add alliance request panel with colored circle indicators (#2905) #2906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
112326f
feat: Add alliance request panel with colored circle indicators (#2905)
zimri-leisher Jan 15, 2026
7e6f7c7
fix: Add translation keys for alliance request panel strings
zimri-leisher Jan 15, 2026
4f26885
Revert testing change
zimri-leisher Jan 15, 2026
8e38979
Radial menu, show skins, tests, small ui changes
zimri-leisher Jan 24, 2026
3369fca
Move to top left
zimri-leisher Jan 24, 2026
b0b5c58
Move request panel down a bit
zimri-leisher Jan 24, 2026
c45a4f3
small ui changes
zimri-leisher Jan 24, 2026
cd3d685
revert testing changes
zimri-leisher Jan 24, 2026
0620276
Merge branch 'main' into feature/2905-alliance-request-panel
ryanbarlow97 Jan 25, 2026
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
16 changes: 10 additions & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,17 +241,20 @@
<div
class="left-0 bottom-0 sm:left-4 sm:bottom-4 w-full flex-col-reverse sm:flex-row z-50 md:w-[320px] fixed pointer-events-none"
>
<div
class="w-full md:w-2/3 md:fixed sm:right-0 md:bottom-0 md:flex flex-col items-end pointer-events-none"
>
<chat-display></chat-display>
<events-display></events-display>
</div>
<div>
<control-panel></control-panel>
</div>
</div>

<div
class="fixed right-0 bottom-0 sm:right-4 sm:bottom-4 z-50 flex flex-row items-end pointer-events-none"
>
<div class="flex flex-col items-end">
<chat-display></chat-display>
<events-display></events-display>
</div>
</div>

<!-- Game modals and overlays -->
<emoji-table></emoji-table>
<build-menu></build-menu>
Expand All @@ -271,6 +274,7 @@
<chat-modal></chat-modal>
<multi-tab-modal></multi-tab-modal>
<game-left-sidebar></game-left-sidebar>
<alliance-request-panel></alliance-request-panel>
<performance-overlay></performance-overlay>
<player-info-overlay></player-info-overlay>
<leader-board></leader-board>
Expand Down
2 changes: 2 additions & 0 deletions resources/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,8 @@
"alliance_renewed": "Your alliance with {name} has been renewed",
"wants_to_renew_alliance": "{name} wants to renew your alliance",
"ignore": "Ignore",
"seconds_remaining": "{seconds}s remaining",
"wants_to_renew": "✓ Wants to renew!",
"unit_voluntarily_deleted": "Unit voluntarily deleted",
"betrayal_debuff_ends": "{time} seconds left until betrayal debuff ends",
"attack_cancelled_retreat": "Attack cancelled, {troops} soldiers killed during retreat",
Expand Down
11 changes: 11 additions & 0 deletions src/client/graphics/GameRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { TransformHandler } from "./TransformHandler";
import { UIState } from "./UIState";
import { AdTimer } from "./layers/AdTimer";
import { AlertFrame } from "./layers/AlertFrame";
import { AllianceRequestPanel } from "./layers/AllianceRequestPanel";
import { BuildMenu } from "./layers/BuildMenu";
import { ChatDisplay } from "./layers/ChatDisplay";
import { ChatModal } from "./layers/ChatModal";
Expand Down Expand Up @@ -122,6 +123,15 @@ export function createRenderer(
eventsDisplay.game = game;
eventsDisplay.uiState = uiState;

const allianceRequestPanel = document.querySelector(
"alliance-request-panel",
) as AllianceRequestPanel;
if (!(allianceRequestPanel instanceof AllianceRequestPanel)) {
console.error("alliance request panel not found");
}
allianceRequestPanel.eventBus = eventBus;
allianceRequestPanel.game = game;

const chatDisplay = document.querySelector("chat-display") as ChatDisplay;
if (!(chatDisplay instanceof ChatDisplay)) {
console.error("chat display not found");
Expand Down Expand Up @@ -261,6 +271,7 @@ export function createRenderer(
new DynamicUILayer(game, transformHandler, eventBus),
new NameLayer(game, transformHandler, eventBus),
eventsDisplay,
allianceRequestPanel,
chatDisplay,
buildMenu,
new MainRadialMenu(
Expand Down
Loading
Loading