Skip to content

[pull] master from beyond-all-reason:master #52

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Sep 17, 2026
Merged

[pull] master from beyond-all-reason:master #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 19 additions & 3 deletions lang/dev/lobby.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,13 @@
"players": "Plyreas",
"runningFor": "Rnuinng for",
"join": "Jion"
},
"lobby": {
"title": "Lbboy",
"gameVersion": "Gmae Vosiren",
"engineVersion": "Egnnie Vosiren",
"maps": "Maps",
"map": "Map"
}
}
},
Expand Down Expand Up @@ -292,7 +299,8 @@
"message": "Msaesge",
"userID": "User {id}",
"userIDPlaceholder": "32452",
"send": "Sned"
"send": "Sned",
"noMessages": "No maegesss in tihs caht htoisry."
},
"settings": {
"title": "seinttgs",
Expand Down Expand Up @@ -482,7 +490,14 @@
"startBoxes3": "AylmaeTls whoutit one are full-map sbrxoteats.",
"allyTeamCount": "AyaeTllm Cunot: ",
"teamsPerAllyTeam": "Tmaes per AyaeTllm: ",
"map": "Map"
"map": "Map",
"areBossesEnabled": "Eblnae Bosses? Tihs caonnt be cngeahd letar.",
"conflictWarning": "Seevrr cngaehs cilnocft wtih your lcoal dafrt.",
"useServer": "Use sveerr",
"keepMine": "Keep mine",
"lobbyNameChanged": "Lbboy name cngeahd on the sveerr.",
"mapNameChanged": "Map cngeahd on the sveerr.",
"allyTeamConfigChanged": "Team stuep cngeahd on the sveerr."
},
"votePanel": {
"vote": "Vtoe:",
Expand Down Expand Up @@ -520,7 +535,8 @@
"spectatorsComponent": {
"spectators": "Setptacros",
"memberCount": "0 Mrembes | 1 Meembr | {n} Mrembes",
"join": "Jion"
"join": "Jion",
"queue": "Quuee"
},
"battlePreview": {
"preview": "Pevierw",
Expand Down
22 changes: 19 additions & 3 deletions lang/en/lobby.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,13 @@
"players": "Players",
"runningFor": "Running for",
"join": "Join"
},
"lobby": {
"title": "Lobby",
"gameVersion": "Game Version",
"engineVersion": "Engine Version",
"maps": "Maps",
"map": "Map"
}
}
},
Expand Down Expand Up @@ -292,7 +299,8 @@
"message": "Message",
"userID": "User {id}",
"userIDPlaceholder": "32452",
"send": "Send"
"send": "Send",
"noMessages": "No messages in this chat history."
},
"settings": {
"title": "settings",
Expand Down Expand Up @@ -482,7 +490,14 @@
"startBoxes3": "AllyTeams without one are full-map startboxes.",
"allyTeamCount": "AllyTeam Count: ",
"teamsPerAllyTeam": "Teams per AllyTeam: ",
"map": "Map"
"map": "Map",
"areBossesEnabled": "Enable Bosses? This cannot be changed later.",
"conflictWarning": "Server changes conflict with your local draft.",
"useServer": "Use server",
"keepMine": "Keep mine",
"lobbyNameChanged": "Lobby name changed on the server.",
"mapNameChanged": "Map changed on the server.",
"allyTeamConfigChanged": "Team setup changed on the server."
},
"votePanel": {
"vote": "Vote:",
Expand Down Expand Up @@ -520,7 +535,8 @@
"spectatorsComponent": {
"spectators": "Spectators",
"memberCount": "0 Members | 1 Member | {n} Members",
"join": "Join"
"join": "Join",
"queue": "Queue"
},
"battlePreview": {
"preview": "Preview",
Expand Down
6 changes: 3 additions & 3 deletions src/main/game/battle/battle-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export type Restriction = {
};

export type Player = {
id: number;
id: string;
name: string;
user: User;
contentSyncState: {
Expand All @@ -128,8 +128,8 @@ export type Player = {
};

export type Bot = {
id: number;
host: number;
id: string;
host: string;
aiShortName: string;
name: string;
aiOptions: Record<string, unknown>;
Expand Down
18 changes: 9 additions & 9 deletions src/main/model/start-script.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export interface Restriction {
}

export interface AllyTeam {
id: number;
id: string;
numallies?: number;
startrecttop?: number;
startrectleft?: number;
Expand All @@ -71,9 +71,9 @@ export interface AllyTeam {
}

export interface Team {
id: number;
allyteam: number;
teamleader: number;
id: string;
allyteam: string;
teamleader: string;
rgbcolor?: string;
side?: string;
handicap?: number;
Expand All @@ -85,9 +85,9 @@ export interface Team {
}

export interface Player {
id: number;
id: string;
name: string;
team?: number;
team?: string;
password?: string;
spectator?: number;
isfromdemo?: number;
Expand All @@ -97,10 +97,10 @@ export interface Player {
}

export interface Bot {
id: number;
team: number;
id: string;
team: string;
shortname: string;
host: number;
host: string;
name?: string;
version?: string;
options?: {
Expand Down
2 changes: 1 addition & 1 deletion src/main/utils/start-script-converter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class StartScriptConverter {
const bots: Bot[] = [];

Object.entries(battle.teams).forEach((entry) => {
const teamId = Number(entry[0]);
const teamId = entry[0];
const team = entry[1];
const allyTeam: AllyTeam = {
id: teamId,
Expand Down
22 changes: 19 additions & 3 deletions src/renderer/assets/languages/cs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2176,6 +2176,13 @@
"players": null,
"runningFor": null,
"join": null
},
"lobby": {
"title": null,
"gameVersion": null,
"engineVersion": null,
"maps": null,
"map": null
}
}
},
Expand Down Expand Up @@ -2275,7 +2282,8 @@
"message": null,
"userID": null,
"userIDPlaceholder": null,
"send": null
"send": null,
"noMessages": null
},
"settings": {
"title": null,
Expand Down Expand Up @@ -2465,7 +2473,14 @@
"startBoxes3": null,
"allyTeamCount": null,
"teamsPerAllyTeam": null,
"map": null
"map": null,
"areBossesEnabled": null,
"conflictWarning": null,
"useServer": null,
"keepMine": null,
"lobbyNameChanged": null,
"mapNameChanged": null,
"allyTeamConfigChanged": null
},
"votePanel": {
"vote": null,
Expand Down Expand Up @@ -2503,7 +2518,8 @@
"spectatorsComponent": {
"spectators": null,
"memberCount": null,
"join": null
"join": null,
"queue": null
},
"battlePreview": {
"preview": null,
Expand Down
22 changes: 19 additions & 3 deletions src/renderer/assets/languages/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2047,6 +2047,13 @@
"players": null,
"runningFor": null,
"join": null
},
"lobby": {
"title": null,
"gameVersion": null,
"engineVersion": null,
"maps": null,
"map": null
}
}
},
Expand Down Expand Up @@ -2146,7 +2153,8 @@
"message": null,
"userID": null,
"userIDPlaceholder": null,
"send": null
"send": null,
"noMessages": null
},
"settings": {
"title": null,
Expand Down Expand Up @@ -2336,7 +2344,14 @@
"startBoxes3": null,
"allyTeamCount": null,
"teamsPerAllyTeam": null,
"map": null
"map": null,
"areBossesEnabled": null,
"conflictWarning": null,
"useServer": null,
"keepMine": null,
"lobbyNameChanged": null,
"mapNameChanged": null,
"allyTeamConfigChanged": null
},
"votePanel": {
"vote": null,
Expand Down Expand Up @@ -2374,7 +2389,8 @@
"spectatorsComponent": {
"spectators": null,
"memberCount": null,
"join": null
"join": null,
"queue": null
},
"battlePreview": {
"preview": null,
Expand Down
22 changes: 19 additions & 3 deletions src/renderer/assets/languages/dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,13 @@
"players": "Plyreas",
"runningFor": "Rnuinng for",
"join": "Jion"
},
"lobby": {
"title": "Lbboy",
"gameVersion": "Gmae Vosiren",
"engineVersion": "Egnnie Vosiren",
"maps": "Maps",
"map": "Map"
}
}
},
Expand Down Expand Up @@ -292,7 +299,8 @@
"message": "Msaesge",
"userID": "User {id}",
"userIDPlaceholder": "32452",
"send": "Sned"
"send": "Sned",
"noMessages": "No maegesss in tihs caht htoisry."
},
"settings": {
"title": "seinttgs",
Expand Down Expand Up @@ -482,7 +490,14 @@
"startBoxes3": "AylmaeTls whoutit one are full-map sbrxoteats.",
"allyTeamCount": "AyaeTllm Cunot: ",
"teamsPerAllyTeam": "Tmaes per AyaeTllm: ",
"map": "Map"
"map": "Map",
"areBossesEnabled": "Eblnae Bosses? Tihs caonnt be cngeahd letar.",
"conflictWarning": "Seevrr cngaehs cilnocft wtih your lcoal dafrt.",
"useServer": "Use sveerr",
"keepMine": "Keep mine",
"lobbyNameChanged": "Lbboy name cngeahd on the sveerr.",
"mapNameChanged": "Map cngeahd on the sveerr.",
"allyTeamConfigChanged": "Team stuep cngeahd on the sveerr."
},
"votePanel": {
"vote": "Vtoe:",
Expand Down Expand Up @@ -520,7 +535,8 @@
"spectatorsComponent": {
"spectators": "Setptacros",
"memberCount": "0 Mrembes | 1 Meembr | {n} Mrembes",
"join": "Jion"
"join": "Jion",
"queue": "Quuee"
},
"battlePreview": {
"preview": "Pevierw",
Expand Down
22 changes: 19 additions & 3 deletions src/renderer/assets/languages/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2024,6 +2024,13 @@
"players": "Players",
"runningFor": "Running for",
"join": "Join"
},
"lobby": {
"title": "Lobby",
"gameVersion": "Game Version",
"engineVersion": "Engine Version",
"maps": "Maps",
"map": "Map"
}
}
},
Expand Down Expand Up @@ -2123,7 +2130,8 @@
"message": "Message",
"userID": "User {id}",
"userIDPlaceholder": "32452",
"send": "Send"
"send": "Send",
"noMessages": "No messages in this chat history."
},
"settings": {
"title": "settings",
Expand Down Expand Up @@ -2313,7 +2321,14 @@
"startBoxes3": "AllyTeams without one are full-map startboxes.",
"allyTeamCount": "AllyTeam Count: ",
"teamsPerAllyTeam": "Teams per AllyTeam: ",
"map": "Map"
"map": "Map",
"areBossesEnabled": "Enable Bosses? This cannot be changed later.",
"conflictWarning": "Server changes conflict with your local draft.",
"useServer": "Use server",
"keepMine": "Keep mine",
"lobbyNameChanged": "Lobby name changed on the server.",
"mapNameChanged": "Map changed on the server.",
"allyTeamConfigChanged": "Team setup changed on the server."
},
"votePanel": {
"vote": "Vote:",
Expand Down Expand Up @@ -2351,7 +2366,8 @@
"spectatorsComponent": {
"spectators": "Spectators",
"memberCount": "0 Members | 1 Member | {n} Members",
"join": "Join"
"join": "Join",
"queue": "Queue"
},
"battlePreview": {
"preview": "Preview",
Expand Down
Loading
Loading