Skip to content
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.

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

v2 MVP #53

Merged
merged 107 commits into from
Sep 30, 2023
Merged
Changes from 1 commit
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
2cf3512
#52: data dump theme (from scratch)
drweissbrot May 27, 2023
597343d
#52: make theme overrides and appends work
drweissbrot May 27, 2023
c2e35c4
#52: serve Quantico font
drweissbrot May 27, 2023
858516a
#52 Fennec: Players Alive section
drweissbrot May 27, 2023
f6c96c5
#52: add theme options
drweissbrot May 28, 2023
6e6b190
#52 Fennec: use Vue transitions to fade out PlayersAlive
drweissbrot May 28, 2023
1014a87
#52 Fennec: add weapon icons
drweissbrot May 28, 2023
a303d3a
#52 Fennec: Focused Player section
drweissbrot May 28, 2023
f8cf13c
#52 Fennec: remove empty space from grenade icons
drweissbrot May 28, 2023
94433f8
#52 Raw: GSI parser fixes
drweissbrot May 28, 2023
7d12bd0
#52: silence vue3-sfc-loader sourcemap warning
drweissbrot May 28, 2023
dfecb7b
#52: replace .vue files with dynamically generated files
drweissbrot May 28, 2023
c433868
#52 Fennec: add transitions to FocusedPlayer
drweissbrot May 28, 2023
628c4b5
#52: fix two flashbangs
drweissbrot May 28, 2023
6a1b3e5
#52 Fennec: Top Bar section
drweissbrot May 29, 2023
16f353e
#52 Fennec: un-nest CSS
drweissbrot May 30, 2023
2c19cf2
#52 Fennec: split Top Bar center into components
drweissbrot May 30, 2023
299c692
#52 Fennec: split Top Bar team into components
drweissbrot May 30, 2023
5b64542
#52 Fennec: fix FocusedPlayer changing width when switching players
drweissbrot May 30, 2023
2cb3148
#52 Fennec: skew top bar progress bars
drweissbrot May 30, 2023
423a0ec
#52: Series Name panel
drweissbrot Jun 2, 2023
a9856d5
#54: add nodemon for easier developing
drweissbrot Jun 4, 2023
452ea9f
#54: move sfc loader options to shared dependency endpoint
drweissbrot Jun 4, 2023
8d8ad6d
#54: config page
drweissbrot Jun 4, 2023
3146524
#54: try to read an example state for easier development
drweissbrot Jun 4, 2023
e6c792e
#54: Section descriptions and styling
drweissbrot Jun 4, 2023
28e3d55
#54 Fennec: CSS overrides
drweissbrot Jun 4, 2023
0659a94
Merge pull request #64 from drweissbrot/54-v2-config-page
drweissbrot Jun 4, 2023
b20bb4e
#52 Fennec: add Noto Sans as fallback font
drweissbrot Jun 4, 2023
08c796a
#52 Fennec: Player sidebars
drweissbrot Jun 9, 2023
c781633
#52 Fennec: work around CSS imports not being scoped
drweissbrot Jun 9, 2023
c88c892
#52 Fennec: make player sidebars a bit more narrow
drweissbrot Jun 9, 2023
a41861d
#52 Raw: fix sorting grenades
drweissbrot Jun 9, 2023
d32087e
#52 Fennec: rework player sidebar widths
drweissbrot Jun 9, 2023
c4f3ed1
#52 Fennec: sidebar grenades panel
drweissbrot Jun 9, 2023
d7748e1
#52 Fennec: sidebar team money and equip panel
drweissbrot Jun 9, 2023
c74ea17
#52 Fennec: option to hide grenade panel during round
drweissbrot Jun 9, 2023
fdd7af6
#52 Fennec: add map images
drweissbrot Jun 9, 2023
8bc5de0
#52 Fennec: Series and Round Graph (static maps)
drweissbrot Jun 9, 2023
f07e45a
#52 Fennec: Dynamic series graph
drweissbrot Jun 9, 2023
9d2ca42
#52 Fennec: Rename sidebars
drweissbrot Jun 9, 2023
27a426b
#52 Fennec: wait for series graph to fade out before showing focused …
drweissbrot Jun 9, 2023
0ad1d9c
#52 Raw: delete removed options live
drweissbrot Jun 9, 2023
16b3a14
#52 Fennec: Sidebar player positioning fixes
drweissbrot Jun 9, 2023
4bd30f8
#52 Fennec: dynamic map wins and number
drweissbrot Jun 9, 2023
4f92a8f
#52 Fennec: handle BO1s in match point rounds panel
drweissbrot Jun 9, 2023
d6c4a15
#52 Fennec: fix top bar breaking apart on wide aspect ratios
drweissbrot Jun 10, 2023
d90a1f7
#52 Fennec: round scale-factor
drweissbrot Jun 10, 2023
eecee85
#52 Fennec: fix series graph shadow shining through when hidden
drweissbrot Jun 10, 2023
3fc8054
#65: add ?theme= query param
drweissbrot Jun 10, 2023
9202fe6
#52 Fennec: add ingame radars
drweissbrot Jun 18, 2023
959573d
#52 Fennec: add Simple Radar radars
drweissbrot Jun 18, 2023
d5ea263
#52: Misc tiny fixes
drweissbrot Jun 18, 2023
859510e
#52 Fennec: Cleanup
drweissbrot Jun 18, 2023
dad9d6c
#52 Fennec: Radar bomb
drweissbrot Jun 18, 2023
757947a
#52 Fennec: Radar players
drweissbrot Jun 18, 2023
63ec3ac
#52 Fennec: Radar grenades
drweissbrot Jun 18, 2023
e229bb9
#52 Raw, Fennec: guess the firebomb type
drweissbrot Jun 18, 2023
e1ea625
#63: Separate Radar page
drweissbrot Jun 18, 2023
8565689
#63: Link to HUD and Radar on Config page
drweissbrot Jun 18, 2023
d7e02cf
Merge pull request #66 from drweissbrot/63-v2-show-radar-on-config-page
drweissbrot Jun 18, 2023
c810380
#52 Cleanup: add unprefixedName to weapons
drweissbrot Jun 18, 2023
79ad527
#52 Cleanup: only load shared CSS once
drweissbrot Jun 18, 2023
a39d29e
#52 Cleanup: skip importing teamColorClass as component method
drweissbrot Jun 18, 2023
24bccca
#52 Cleanup: split config options css
drweissbrot Jun 18, 2023
0367f0e
#52 Cleanup: space after negation
drweissbrot Jun 18, 2023
24a3813
#52 Cleanup: rename series graph map name component
drweissbrot Jun 18, 2023
4a166fd
#52 Cleanup: Misc cleanup and comments
drweissbrot Jun 18, 2023
87908a0
#52 Cleanup: move radar helpers
drweissbrot Jun 18, 2023
c926b56
#52 Cleanup: move general helpers out of GSI directory
drweissbrot Jun 18, 2023
16ae047
#52 Cleanup: series map numbers helper
drweissbrot Jun 18, 2023
66dd48c
#52 Cleanup: use positionClass helper
drweissbrot Jun 18, 2023
f4e4527
Merge pull request #67 from drweissbrot/52-cleanup
drweissbrot Jun 18, 2023
bbf3c99
#52 Fennec: sidebar player, red damage taken health bar
drweissbrot Jun 18, 2023
0dca0da
#52: ADR
drweissbrot Jun 18, 2023
23c43e1
#52: Money spent this round
drweissbrot Jun 18, 2023
6eb6866
#52 Fennec: Clock red at <= 10 seconds
drweissbrot Jun 18, 2023
032c21f
#52 Fennec: fix top bar team panel widths
drweissbrot Jun 18, 2023
05bd3cc
#52: Rework boolean options to be always false by default
drweissbrot Jun 18, 2023
c8ce19a
#52 Fennec: configurable: match point rounds only during freezetime
drweissbrot Jun 18, 2023
4823f2f
#52 Fennec: configurable: show round winner panel into freezetime
drweissbrot Jun 18, 2023
3b5e429
#52 Fennec: fix up top bar spacing again
drweissbrot Jun 18, 2023
6b8ae1b
#52 Fennec: Restructure CSS variables
drweissbrot Jun 18, 2023
9e92ad4
#52 Fennec: fix SvgFilters in OBS
drweissbrot Jun 18, 2023
a4dd837
#52 Fennec: fix clock showing 0:60
drweissbrot Jun 18, 2023
9c8be88
#52 Fennec: update colors
drweissbrot Jun 18, 2023
60bacf8
#52 Fennec: fixes
drweissbrot Jun 18, 2023
66bae85
#60: add license
drweissbrot Jun 20, 2023
a34e55c
#60: extract third party licenses so they can be embedded in executables
drweissbrot Jun 20, 2023
24fbdb9
#60: use separate root directories for builtin and custom
drweissbrot Jun 20, 2023
189ecff
#60: add endpoint to show licenses
drweissbrot Jun 20, 2023
a031b57
#60: build script
drweissbrot Jun 20, 2023
7e0ad6d
#60: add ?transparent query param to /hud
drweissbrot Jun 21, 2023
19fe970
#60: Electron-based wrappers around HUD, config, radar
drweissbrot Jun 21, 2023
452c157
Merge pull request #70 from drweissbrot/60-v2-executables-electron-forge
drweissbrot Jun 21, 2023
f523614
#60: add changelog
drweissbrot Jul 28, 2023
b1ef8c7
#60: update checking
drweissbrot Jul 28, 2023
0971171
Merge pull request #69 from drweissbrot/60-v2-exectuables
drweissbrot Jul 28, 2023
c71ff66
#52 Fennec: fix color overrides
drweissbrot Jul 28, 2023
e2e8dd3
fix round graph in MR12 overtimes
drweissbrot Sep 29, 2023
2df951a
#59: add some basic docs
drweissbrot Sep 29, 2023
b0ef0eb
handle radar grenades sometimes missing owner (CS2)
drweissbrot Sep 30, 2023
0c808ec
#59: add screenshot to readme
drweissbrot Sep 30, 2023
01f7064
#59: add cvars
drweissbrot Sep 30, 2023
762e134
rebrand to cs-hud
drweissbrot Sep 30, 2023
1b6d039
update dependencies
drweissbrot Sep 30, 2023
0922250
release 2.0.0
drweissbrot Sep 30, 2023
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
Prev Previous commit
Next Next commit
#52: Series Name panel
drweissbrot committed Jun 2, 2023

Verified

This commit was signed with the committer’s verified signature.
drweissbrot Pierre Borgmann
commit 423a0ec5f9839f592e3f2c2dafe6cd94928c3a34
6 changes: 4 additions & 2 deletions src/themes/fennec/css/vars.css
Original file line number Diff line number Diff line change
@@ -7,12 +7,14 @@
--red: #f00;

--counter-terrorists-rgb: 29, 158, 222;
--counter-terrorists: #1d9ede;
--counter-terrorists: rgb(var(--counter-terrorists-rgb));
--terrorists-rgb: 193, 136, 3;
--terrorists: #c18803;
--terrorists: rgba(var(--terrorists-rgb));

--progress-bar-fill-color-bomb: var(--red);

--top-bar-maps-color: rgba(255, 255, 255, 0.5);

/*
* Spacing, Sizes
*/
21 changes: 21 additions & 0 deletions src/themes/fennec/theme.json
Original file line number Diff line number Diff line change
@@ -42,6 +42,27 @@
"value": true,
"section": "Preferences",
"label": "Hide \"Players Alive\" during freezetime"
},

"series.name.left": {
"type": "string",
"value": "",
"section": "Series",
"label": "Series Name (left)"
},

"series.name.center": {
"type": "string",
"value": "",
"section": "Series",
"label": "Series Name (center)"
},

"series.name.right": {
"type": "string",
"value": "",
"section": "Series",
"label": "Series Name (right)"
}
}
}
2 changes: 2 additions & 0 deletions src/themes/fennec/top-bar/center/center.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.center {
grid-area: center;

display: grid;
grid-template-columns: 1fr 3fr 1fr;
grid-template-rows: 2fr 1fr 1fr;
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
align-items: center;
justify-content: center;

background: rgba(255, 255, 255, 0.75);
background: var(--top-bar-maps-color);
color: #000;
font-size: 1.35rem;
font-weight: 700;
2 changes: 1 addition & 1 deletion src/themes/fennec/top-bar/center/map-wins/map-wins.css
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
align-items: center;
justify-content: center;

background: rgba(255, 255, 255, 0.75);
background: var(--top-bar-maps-color);
}

.map-wins.--left {
50 changes: 50 additions & 0 deletions src/themes/fennec/top-bar/series-name/series-name.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
.series-name {
grid-area: series-name;

display: grid;
grid-template-columns: 4fr 5fr 4fr;
grid-template-areas: 'left center right';
width: 90%;
margin: 0 auto;
}

.left,
.center,
.right {
padding: 0.475rem;

color: #000;
font-size: 1.35rem;
}

.left,
.right {
background: rgba(255, 255, 255, 0.5);
}

.left {
grid-area: left;
transform: skewX(20deg) translateX(0.425rem);
}

.left .inner {
transform: skewX(-20deg);
}

.center {
grid-area: center;

background: rgba(255, 255, 255, 0.75);
clip-path: polygon(0 0, 100% 0, calc(100% - 0.85rem) 100%, 0.85rem 100%);
font-weight: 700;
letter-spacing: 0.2em;
}

.right {
grid-area: right;
transform: skewX(-20deg) translateX(-0.425rem);
}

.right .inner {
transform: skewX(20deg);
}
19 changes: 19 additions & 0 deletions src/themes/fennec/top-bar/series-name/series-name.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<div class="series-name">
<div v-if="$opts['series.name.left']" class="left">
<div class="inner">
{{ $opts['series.name.left'] }}
</div>
</div>

<div v-if="$opts['series.name.center']" class="center">
<div class="inner">
{{ $opts['series.name.center'] }}
</div>
</div>

<div v-if="$opts['series.name.right']" class="right">
<div class="inner">
{{ $opts['series.name.right'] }}
</div>
</div>
</div>
3 changes: 3 additions & 0 deletions src/themes/fennec/top-bar/series-name/series-name.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default {
//
}
2 changes: 2 additions & 0 deletions src/themes/fennec/top-bar/team/team.css
Original file line number Diff line number Diff line change
@@ -4,10 +4,12 @@

/* TODO the 1.65rem magic number breaks at aspect ratios >= ca. 2.2:1 */
.team.--left {
grid-area: team-left;
transform: skewX(20deg) translateX(-1.65rem);
}

/* TODO the 1.65rem magic number breaks at aspect ratios >= ca. 2.2:1 */
.team.--right {
grid-area: team-right;
transform: skewX(-20deg) translateX(1.65rem);
}
3 changes: 3 additions & 0 deletions src/themes/fennec/top-bar/top-bar.css
Original file line number Diff line number Diff line change
@@ -6,6 +6,9 @@

display: grid;
grid-template-columns: 20fr 13fr 20fr;
grid-template-areas:
'series-name series-name series-name'
'team-left center team-right';
align-items: start;

filter: var(--filter-drop-shadow);
1 change: 1 addition & 0 deletions src/themes/fennec/top-bar/top-bar.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<div class="top-bar">
<SeriesName />
<Team :team="$teams[0]" position="left" />
<Center />
<Team :team="$teams[1]" position="right" />
2 changes: 2 additions & 0 deletions src/themes/fennec/top-bar/top-bar.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import Center from '/hud/top-bar/center/center.vue'
import Digits from '/hud/digits/digits.vue'
import SeriesName from '/hud/top-bar/series-name/series-name.vue'
import Team from '/hud/top-bar/team/team.vue'

export default {
components: {
Center,
SeriesName,
Team,
},
}