Skip to content

Commit 9891ff2

Browse files
QuitchQuitch
committed
Merge branch 'develop'
2 parents e5f87c5 + b5bf4cb commit 9891ff2

20 files changed

+240
-126
lines changed

‎.eslintrc.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"parserOptions": {
3+
"ecmaFeatures": {
4+
"impliedStrict": true
5+
}
6+
},
7+
"env": {
8+
"browser": true,
9+
"jquery": true,
10+
"amd": true,
11+
"es6": true // PA uses Chrome 40 which supports a subset of ES6
12+
},
13+
"extends": ["eslint:recommended", "plugin:lodash/v3", "prettier"],
14+
"globals": {
15+
"model": "readonly",
16+
"ko": "readonly",
17+
"loadHtml": "readonly"
18+
},
19+
"plugins": ["lodash"],
20+
"rules": {
21+
"lodash/prefer-lodash-method": 0,
22+
"no-inner-declarations": 0,
23+
"curly": [2, "all"]
24+
}
25+
}

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
.vscode/settings.json

‎.prettierrc.json‎

Whitespace-only changes.

‎.stylelintrc.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": ["stylelint-config-standard", "stylelint-config-prettier"],
3+
"rules": {
4+
"selector-class-pattern": "^([a-z][a-z0-9]*)((_|-)[a-z0-9]+)*$"
5+
}
6+
}

‎CHANGELOG.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
# CHANGELOG
22

3+
## v1.2.0 - 2022-07-24
4+
5+
- Expands the spectator panel by default
6+
37
## v1.1 - 2019-01-12
48

5-
- Added ALL2 tab with army metal count
6-
- Set ALL tab to be the default
9+
- Added ALL2 tab with army metal count
10+
- Set ALL tab to be the default
711

812
## v1.0 - 2018-10-01
913

10-
- Added ALL tab to spectator panel
14+
- Added ALL tab to spectator panel

‎README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# All-In-One Spectator Tab
22

3-
![alt text](https://i.imgur.com/k5fM6FD.png "All In One Spectator Tab")
3+
![An example of the mod in use](https://i.imgur.com/k5fM6FD.png "All In One Spectator Tab")
44

5-
Adds a two tabs to the spectator player panel: ALL and ALL2.
5+
Adds two tabs to the spectator player panel: ALL and ALL2.
66

77
ALL displays the following:
88

9-
- Metal income
10-
- Energy income
11-
- Efficiency
12-
- Army count
13-
- Fabber count
14-
- Factory count
9+
- Metal income
10+
- Energy income
11+
- Efficiency
12+
- Army count
13+
- Fabber count
14+
- Factory count
1515

1616
ALL2 displays army metal in place of army count. Army metal counts all units and structures owned by a player, not just offensive units.
1717

@@ -31,12 +31,12 @@ Because I wanted to avoid having the ALL tab be any wider than the other tabs. I
3131

3232
**Why does your mod wrap the text when the numbers get big?**
3333

34-
I've tried to ensure this is very unlikely to happen, but because the columns are narrower it *could* happen. Things will get more cramped though. You can switch to the other tabs still if things get ugly.
34+
I've tried to ensure this is very unlikely to happen, but because the columns are narrower it _could_ happen. Things will get more cramped though. You can switch to the other tabs still if things get ugly.
3535

3636
**Do you support translations?**
3737

3838
No. When you include translations in a Planetary Annihilation client mod, it breaks all other translations in the game. Until this is fixed this mod can't ship with translations.
3939

4040
## Thanks
4141

42-
- mikeyh, who once again covered for my total inability to inject Javascript and HTML
42+
- mikeyh, who once again covered for my total inability to inject Javascript and HTML

‎modinfo.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
"display_name": "All-In-One Spectator Tab",
55
"description": "Adds a tab called ALL to the spectator panel, which contains both economy and army information.",
66
"author": "Quitch",
7-
"version": "1.1",
8-
"build": "112595",
9-
"date": "2019/01/12",
7+
"version": "1.2.0",
8+
"build": "115872",
9+
"date": "2022/07/24",
1010
"signature": " ",
1111
"forum": "https://steamcommunity.com/app/386070/discussions/0/1694914736008697542/",
1212
"icon": "https://i.imgur.com/oF09PFr.jpg",
1313
"category": ["ui", "classic", "titans"],
1414
"priority": 100,
1515
"scenes": {
1616
"live_game_players": [
17-
"coui://ui/mods/com.quitch.qallinonetab/live_game_players.css",
18-
"coui://ui/mods/com.quitch.qallinonetab/live_game_players.js"
17+
"coui://ui/mods/com.quitch.qallinonetab/all_tabs.css",
18+
"coui://ui/mods/com.quitch.qallinonetab/all_tabs.js"
1919
]
2020
},
2121
"github": "https://github.com/Quitch/All-In-One-Spectator-Tab"

‎sonar-project.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
sonar.projectKey=Quitch_All-In-One-Spectator-Tab
2+
sonar.organization=quitch
3+
sonar.projectVersion=1.2.0

‎ui/mods/com.quitch.qallinonetab/all2_buttons.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<div
2+
class="div_spectator_panel_button"
3+
data-bind="click: function () { spectatorPanelMode('all2') }, css: { div_spectator_panel_button_active: showAllData2 } "
4+
>
5+
<loc>ALL2</loc>
6+
</div>

ui/mods/com.quitch.qallinonetab/live_game_players3.html renamed to ui/mods/com.quitch.qallinonetab/all2_headers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
<th class="div_spectator_headers div_army_factory_value_header_quitch">
1818
<loc>Fac</loc>
1919
</th>
20-
<!-- /ko -->
20+
<!-- /ko -->

0 commit comments

Comments
 (0)