Diffusion 0 A.D. Public Repository rP26438

Fix not selectable civilisations not showing if defined by the map
rP26438
Actions

Description

Fix not selectable civilisations not showing if defined by the map

Fix displaying unknow civilisation when civilisation defined by map is not selectable but exists by switching two lists based on if selection is locked or not.

Differential revision: D4429
Fixes: #6145
Reviewed by: @bb

Details

Committed

Silier

Feb 20 2022, 8:34 AM

Reviewer

Differential Revision

D4429: Fix #6145

Parents

rP26437: Fix landscape settings for unknown map

Branches

Unknown

Tags

Unknown

Build Status

Buildable 19568
Build 46811: Post-Commit Build	Jenkins
Build 46810: Post-Commit Build (macOS)	Jenkins

Event Timeline

Silier committed rP26438: Fix not selectable civilisations not showing if defined by the map.Feb 20 2022, 8:34 AM

Silier added an edge: D4429: Fix #6145.

Silier added a subscriber: bb.

Harbormaster completed building B19568: rP26438: Fix not selectable civilisations not showing if defined by the map.Feb 20 2022, 9:23 AM

bb raised a concern with this commit.Mar 4 2022, 4:28 PM

bb added inline comments.

/ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/Dropdowns/PlayerCiv.js
7	Removing this is problematic, see https://wildfiregames.com/forum/topic/71578-feedbacks-from-a26-svn-tests/page/4/#comment-483282 this.values is not defined anymore until we rebuild (and actually do something).

This commit now has outstanding concerns.Mar 4 2022, 4:28 PM

bb mentioned this in D4522: Make sure PlayerCiv values are initialized.Mar 4 2022, 5:22 PM

strange because autocomplete works for me

bb mentioned this in rP26572: Make sure PlayerCiv values are initialized.Mar 6 2022, 10:40 AM

Silier requested verification of this commit.Mar 6 2022, 5:33 PM

This commit now requires verification by auditors.Mar 6 2022, 5:33 PM

Stan removed an auditor: bb.Jun 6 2022, 11:55 PM

This commit no longer requires audit.Jun 6 2022, 11:55 PM

Changes (1)

Path

Size

ps/

trunk/

binaries/

data/

mods/

public/

gui/

gamesetup/

Pages/

GameSetupPage/

GameSettings/

PerPlayer/

Dropdowns/

PlayerCiv.js

rP26438

View Options

ps/trunk/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/Dropdowns/PlayerCiv.js