Page MenuHomeWildfire Games
Differential D1260

Adjust setting sizes in gamesetup
ClosedPublic
Actions

Authored by bb on Jan 27 2018, 6:36 PM.

Details

Reviewers
elexis
ffffffff
Imarok
Commits
rP21204: Make the 'g' in 'last man standing' visible in gamesetup
Trac Tickets
#5015
Summary

The "g" in "last man standing" is slightly cut of, so adjusting the height.

For some languages, some map names translations use too many characters for the current space, however we need to have two columns in settings on min res thus, the maximum width there is (1024-315)/2=354.5, but even that is not enough. So putting back the original width (before rP20945), when the resolution allows, and using all space if the resolution is less.

Test Plan

See all titles now fix in height

Find shorter map name translations
Use min res too see that nothing is broken

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

bb created this revision.Jan 27 2018, 6:36 PM
bb added inline comments.
binaries/data/mods/public/gui/gamesetup/gamesetup.js
1394–1396 ↗(On Diff #5520)

this could be stored in a global instead (no strong opinion)

Vulcan added a subscriber: Vulcan.Jan 27 2018, 7:29 PM

Successful build - Chance fights ever on the side of the prudent.

Updating workspaces...
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (309 tests).....................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (309 tests).....................................................................................................................................................................................................................................................................................................................OK!
Checking XML files...
Vulcan added a comment.Jan 27 2018, 7:31 PM
Executing section Default...
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  53|  53| var g_RomanNumbers = [undefined, "I", "II", "III", "IV", "V", "VI", "VII", "VIII"];
|  54|  54| 
|  55|  55| var g_PlayerTeamList = prepareForDropdown([{
|  56|    |-		"label": translateWithContext("team", "None"),
|    |  56|+	"label": translateWithContext("team", "None"),
|  57|  57| 		"id": -1
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  54|  54| 
|  55|  55| var g_PlayerTeamList = prepareForDropdown([{
|  56|  56| 		"label": translateWithContext("team", "None"),
|  57|    |-		"id": -1
|    |  57|+	"id": -1
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 0 tabs but found 1.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  55|  55| var g_PlayerTeamList = prepareForDropdown([{
|  56|  56| 		"label": translateWithContext("team", "None"),
|  57|  57| 		"id": -1
|  58|    |-	}].concat(
|    |  58|+}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|  61|  61| 			"id": i
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  56|  56| 		"label": translateWithContext("team", "None"),
|  57|  57| 		"id": -1
|  58|  58| 	}].concat(
|  59|    |-		Array(g_MaxTeams).fill(0).map((v, i) => ({
|    |  59|+	Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|  61|  61| 			"id": i
|  62|  62| 		}))
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  57|  57| 		"id": -1
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|    |-			"label": i + 1,
|    |  60|+		"label": i + 1,
|  61|  61| 			"id": i
|  62|  62| 		}))
|  63|  63| 	)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|  61|    |-			"id": i
|    |  61|+		"id": i
|  62|  62| 		}))
|  63|  63| 	)
|  64|  64| );
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.j
Harbormaster completed remote builds in B4691: Diff 5520.Jan 27 2018, 7:31 PM
elexis added a reviewer: ffffffff.Jan 27 2018, 10:51 PM
elexis added a comment.Jan 31 2018, 11:10 PM

MP gamesetup 1024x768 got some issue with that new Send button.

longstrings.7z277 KBDownload

ffffffff added a comment.Feb 1 2018, 8:40 AM

looks odd the area above send button there is something wrong


dont like that the rated checkbox option from lobby games is dependency for cheat option on other tab.
unseeable that depends on each other -> put cheat same tab "Game Type"? Or needs tooltip hint but i prefer first idea.

bb updated this revision to Diff 5636.Feb 2 2018, 4:38 PM

Making everything fit for all obscure languages in current svn

send button fixed

Owners added a subscriber: Restricted Owners Package.Feb 2 2018, 4:38 PM
Vulcan added a comment.Feb 2 2018, 4:40 PM
Executing section Default...
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  53|  53| var g_RomanNumbers = [undefined, "I", "II", "III", "IV", "V", "VI", "VII", "VIII"];
|  54|  54| 
|  55|  55| var g_PlayerTeamList = prepareForDropdown([{
|  56|    |-		"label": translateWithContext("team", "None"),
|    |  56|+	"label": translateWithContext("team", "None"),
|  57|  57| 		"id": -1
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  54|  54| 
|  55|  55| var g_PlayerTeamList = prepareForDropdown([{
|  56|  56| 		"label": translateWithContext("team", "None"),
|  57|    |-		"id": -1
|    |  57|+	"id": -1
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 0 tabs but found 1.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  55|  55| var g_PlayerTeamList = prepareForDropdown([{
|  56|  56| 		"label": translateWithContext("team", "None"),
|  57|  57| 		"id": -1
|  58|    |-	}].concat(
|    |  58|+}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|  61|  61| 			"id": i
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  56|  56| 		"label": translateWithContext("team", "None"),
|  57|  57| 		"id": -1
|  58|  58| 	}].concat(
|  59|    |-		Array(g_MaxTeams).fill(0).map((v, i) => ({
|    |  59|+	Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|  61|  61| 			"id": i
|  62|  62| 		}))
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  57|  57| 		"id": -1
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|    |-			"label": i + 1,
|    |  60|+		"label": i + 1,
|  61|  61| 			"id": i
|  62|  62| 		}))
|  63|  63| 	)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|  61|    |-			"id": i
|    |  61|+		"id": i
|  62|  62| 		}))
|  63|  63| 	)
|  64|  64| );
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.j
Vulcan added a comment.Feb 2 2018, 5:34 PM

Successful build - Chance fights ever on the side of the prudent.

Updating workspaces...
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (309 tests).....................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (309 tests).....................................................................................................................................................................................................................................................................................................................OK!
Checking XML files...
Harbormaster completed remote builds in B4795: Diff 5636.Feb 2 2018, 5:34 PM
Imarok added a subscriber: Imarok.Feb 3 2018, 9:44 PM

Seems like this separating gap is gone with your patch:

bb updated this revision to Diff 5646.Feb 4 2018, 8:36 PM

re-add separation

Vulcan added a comment.Feb 4 2018, 8:39 PM

Successful build - Chance fights ever on the side of the prudent.

Updating workspaces...
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (309 tests).....................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (309 tests).....................................................................................................................................................................................................................................................................................................................OK!
Checking XML files...
Vulcan added a comment.Feb 4 2018, 8:40 PM
Executing section Default...
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  53|  53| var g_RomanNumbers = [undefined, "I", "II", "III", "IV", "V", "VI", "VII", "VIII"];
|  54|  54| 
|  55|  55| var g_PlayerTeamList = prepareForDropdown([{
|  56|    |-		"label": translateWithContext("team", "None"),
|    |  56|+	"label": translateWithContext("team", "None"),
|  57|  57| 		"id": -1
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  54|  54| 
|  55|  55| var g_PlayerTeamList = prepareForDropdown([{
|  56|  56| 		"label": translateWithContext("team", "None"),
|  57|    |-		"id": -1
|    |  57|+	"id": -1
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 0 tabs but found 1.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  55|  55| var g_PlayerTeamList = prepareForDropdown([{
|  56|  56| 		"label": translateWithContext("team", "None"),
|  57|  57| 		"id": -1
|  58|    |-	}].concat(
|    |  58|+}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|  61|  61| 			"id": i
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  56|  56| 		"label": translateWithContext("team", "None"),
|  57|  57| 		"id": -1
|  58|  58| 	}].concat(
|  59|    |-		Array(g_MaxTeams).fill(0).map((v, i) => ({
|    |  59|+	Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|  61|  61| 			"id": i
|  62|  62| 		}))
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  57|  57| 		"id": -1
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|    |-			"label": i + 1,
|    |  60|+		"label": i + 1,
|  61|  61| 			"id": i
|  62|  62| 		}))
|  63|  63| 	)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|  61|    |-			"id": i
|    |  61|+		"id": i
|  62|  62| 		}))
|  63|  63| 	)
|  64|  64| );
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.j
Harbormaster completed remote builds in B4809: Diff 5646.Feb 4 2018, 8:40 PM
Imarok requested changes to this revision.EditedFeb 8 2018, 8:13 PM

Checkboxes are broken with this patch.

They are only clickable on the left border.

This revision now requires changes to proceed.Feb 8 2018, 8:13 PM
Imarok resigned from this revision.Feb 8 2018, 8:16 PM

Seems not to be this patch.

Imarok added a comment.Feb 8 2018, 8:53 PM

It appeared once without this patch, but I can only reproduce the issue with this patch...

bb added inline comments.Feb 8 2018, 11:41 PM
binaries/data/mods/public/gui/gamesetup/gamesetup.xml
179 ↗(On Diff #5646)

but it is this patch, nice find (180 should be 193)

Imarok added inline comments.Feb 8 2018, 11:42 PM
binaries/data/mods/public/gui/gamesetup/gamesetup.xml
179 ↗(On Diff #5646)

Good to know ?

bb updated this revision to Diff 5733.Feb 8 2018, 11:44 PM
Imarok added a comment.Feb 9 2018, 12:41 AM

Now it looks good.

Vulcan added a comment.Feb 9 2018, 1:34 AM
Executing section Default...
Executing section Source...
Executing section JS...
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  53|  53| var g_RomanNumbers = [undefined, "I", "II", "III", "IV", "V", "VI", "VII", "VIII"];
|  54|  54| 
|  55|  55| var g_PlayerTeamList = prepareForDropdown([{
|  56|    |-		"label": translateWithContext("team", "None"),
|    |  56|+	"label": translateWithContext("team", "None"),
|  57|  57| 		"id": -1
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  54|  54| 
|  55|  55| var g_PlayerTeamList = prepareForDropdown([{
|  56|  56| 		"label": translateWithContext("team", "None"),
|  57|    |-		"id": -1
|    |  57|+	"id": -1
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 0 tabs but found 1.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  55|  55| var g_PlayerTeamList = prepareForDropdown([{
|  56|  56| 		"label": translateWithContext("team", "None"),
|  57|  57| 		"id": -1
|  58|    |-	}].concat(
|    |  58|+}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|  61|  61| 			"id": i
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  56|  56| 		"label": translateWithContext("team", "None"),
|  57|  57| 		"id": -1
|  58|  58| 	}].concat(
|  59|    |-		Array(g_MaxTeams).fill(0).map((v, i) => ({
|    |  59|+	Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|  61|  61| 			"id": i
|  62|  62| 		}))
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  57|  57| 		"id": -1
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|    |-			"label": i + 1,
|    |  60|+		"label": i + 1,
|  61|  61| 			"id": i
|  62|  62| 		}))
|  63|  63| 	)
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 2 tabs but found 3.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|  58|  58| 	}].concat(
|  59|  59| 		Array(g_MaxTeams).fill(0).map((v, i) => ({
|  60|  60| 			"label": i + 1,
|  61|    |-			"id": i
|    |  61|+		"id": i
|  62|  62| 		}))
|  63|  63| 	)
|  64|  64| );
|    | [NORMAL] ESLintBear (indent):
|    | Expected indentation of 1 tab but found 2.
|----|    | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.js
|    |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/gamesetup/gamesetup.j
Vulcan added a comment.Feb 9 2018, 5:07 AM

Successful build - Chance fights ever on the side of the prudent.

Updating workspaces...
Build (release)...
Build (debug)...
Running release tests...
Running cxxtest tests (309 tests).....................................................................................................................................................................................................................................................................................................................OK!
Running debug tests...
Running cxxtest tests (309 tests).....................................................................................................................................................................................................................................................................................................................OK!
Checking XML files...
Harbormaster completed remote builds in B4884: Diff 5733.Feb 9 2018, 5:07 AM
Imarok accepted this revision.Feb 13 2018, 5:43 PM

Sorry, I thought I already accepted this diff ^^

binaries/data/mods/public/gui/gamesetup/gamesetup.xml
216 ↗(On Diff #5733)

I'd use 100%-60 instead of 100%-58, so that the chat window and the settings window align correctly.

This revision is now accepted and ready to land.Feb 13 2018, 5:43 PM
bb updated the Trac tickets for this revision.Feb 13 2018, 8:12 PM
bb added a comment.Feb 13 2018, 8:17 PM

thx

Closed by commit rP21204: Make the 'g' in 'last man standing' visible in gamesetup (authored by bb). · Explain WhyFeb 13 2018, 8:24 PM
This revision was automatically updated to reflect the committed changes.
elexis added a comment.Feb 13 2018, 8:47 PM

same

Revision Contents
Changeset List

PathSize
ps/
trunk/
binaries/
data/
mods/
public/
gui/
gamesetup/
24 lines
18 lines

Diff 5782

View Options

ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js

Loading...
View Options

ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml

Loading...
Wildfire Games · Phabricator