Skip to content

Commit 0695351

Browse files
committed
merge: integra main remoto (v2.3.0) com velocimetro em tempo real
Conflito so no html/index.js (bundle buildado). Fonte mergeou limpo. Resolvido rebuildando do fonte mergeado (pnpm install p/ ui-kit 4.14.0 + pnpm build), regenerando o bundle com ambas as mudancas.
2 parents a9c1a7c + d480bb0 commit 0695351

16 files changed

Lines changed: 492 additions & 105 deletions

.release/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
22
"name": "ps-hud",
3-
"version": "2.2.0",
3+
"version": "2.3.0",
44
"description": "Ultra customizable FiveM HUD with analog gauges, positioning mode, and multi-vehicle support.",
55
"main": "index.js",
66
"scripts": {
77
"test": "echo \"Error: no test specified\" && exit 1"
88
},
99
"repository": {
1010
"type": "git",
11-
"url": "git+https://github.com/g5-studio/ps-hud.git"
11+
"url": "git+https://github.com/mri-Qbox-Brasil/mri-hud.git"
1212
},
1313
"keywords": [],
1414
"author": "",
1515
"license": "GPL-3.0",
1616
"type": "commonjs",
1717
"bugs": {
18-
"url": "https://github.com/g5-studio/ps-hud/issues"
18+
"url": "https://github.com/mri-Qbox-Brasil/mri-hud/issues"
1919
},
20-
"homepage": "https://github.com/g5-studio/ps-hud#readme",
20+
"homepage": "https://github.com/mri-Qbox-Brasil/mri-hud#readme",
2121
"devDependencies": {
2222
"@semantic-release/changelog": "^6.0.3",
2323
"@semantic-release/commit-analyzer": "^13.0.1",

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
# [2.3.0](https://github.com/mri-Qbox-Brasil/mri-hud/compare/v2.2.0...v2.3.0) (2026-06-24)
2+
3+
4+
### Bug Fixes
5+
6+
* **ci:** corrige repositoryUrl do semantic-release para mri-Qbox-Brasil/mri-hud ([cbe0193](https://github.com/mri-Qbox-Brasil/mri-hud/commit/cbe0193553a674494444c0b20d87909fdc44ffbb))
7+
* ESC sai do positioning + remove borda custom do minimap ([35512b9](https://github.com/mri-Qbox-Brasil/mri-hud/commit/35512b91565ae16ac477349ecbd4e53047b4c20e)), closes [#bababa](https://github.com/mri-Qbox-Brasil/mri-hud/issues/bababa)
8+
* F10 so fecha o positioning mode quando ja esta ativo ([2f649ac](https://github.com/mri-Qbox-Brasil/mri-hud/commit/2f649acbff6aba661e0dd9993b40d9ea50683df0))
9+
10+
11+
### Features
12+
13+
* consome HUD shapes do @mriqbox/ui-kit (4.11.0) ([0b652c2](https://github.com/mri-Qbox-Brasil/mri-hud/commit/0b652c26f0ca9ab649026371b5bbd4f74455f473))
14+
* integra @mriqbox/ui-kit + accent suite-wide via convar mri:color ([26a6133](https://github.com/mri-Qbox-Brasil/mri-hud/commit/26a6133c8327ec0ad539246829041f1518613cb7)), closes [#00E699](https://github.com/mri-Qbox-Brasil/mri-hud/issues/00E699) [#RRGGBB](https://github.com/mri-Qbox-Brasil/mri-hud/issues/RRGGBB) [#RRGGBBAA](https://github.com/mri-Qbox-Brasil/mri-hud/issues/RRGGBBAA) [#00E699](https://github.com/mri-Qbox-Brasil/mri-hud/issues/00E699)
15+
* migra UI da hud pro design system MRI (ui-kit + tokens neutros) ([745683e](https://github.com/mri-Qbox-Brasil/mri-hud/commit/745683e20ff0665a780db0c575c21fe92da9fc88))
16+
* player escolhe unidade de velocidade (MPH/km-h) no menu ([ea6b9e4](https://github.com/mri-Qbox-Brasil/mri-hud/commit/ea6b9e402d58d4dfa8d83419c0edcdc46a5b9c67))
17+
* Shape Lab, defaults calibrados, posicoes e migracao de icones ([e55f0ee](https://github.com/mri-Qbox-Brasil/mri-hud/commit/e55f0ee0ed42db256c817b3fceb28ac59324c2d9))
18+
119
# [2.2.0](https://github.com/g5-studio/ps-hud/compare/v2.1.8...v2.2.0) (2026-05-05)
220

321

fxmanifest.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ game 'gta5'
33

44
description 'Ultra customizable hud featuring a unique and robust settings menu. Change eveything about your experience!'
55
author 'Project-Sloth & GFive'
6-
version "2.2.0"
6+
version "2.3.0"
77

88
shared_scripts {
99
'@qb-core/shared/locale.lua',

html/index.js

Lines changed: 34 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "ps-hud",
3-
"version": "2.2.0",
3+
"version": "2.3.0",
44
"description": "Ultra customizable FiveM HUD with analog gauges, positioning mode, and multi-vehicle support.",
55
"repository": {
66
"type": "git",
7-
"url": "git+https://github.com/g5-studio/ps-hud.git"
7+
"url": "git+https://github.com/mri-Qbox-Brasil/mri-hud.git"
88
},
99
"license": "GPL-3.0",
1010
"bugs": {
11-
"url": "https://github.com/g5-studio/ps-hud/issues"
11+
"url": "https://github.com/mri-Qbox-Brasil/mri-hud/issues"
1212
},
13-
"homepage": "https://github.com/g5-studio/ps-hud#readme"
13+
"homepage": "https://github.com/mri-Qbox-Brasil/mri-hud#readme"
1414
}

web/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ps-hud-react",
33
"private": true,
4-
"version": "2.2.0",
4+
"version": "2.3.0",
55
"type": "module",
66
"scripts": {
77
"dev": "node ./scripts/toggleDebug.js true && vite --host",
@@ -14,7 +14,7 @@
1414
"@fortawesome/free-regular-svg-icons": "^6.7.2",
1515
"@fortawesome/free-solid-svg-icons": "^6.7.2",
1616
"@fortawesome/react-fontawesome": "^0.2.2",
17-
"@mriqbox/ui-kit": "^4.11.0",
17+
"@mriqbox/ui-kit": "^4.14.0",
1818
"@radix-ui/react-checkbox": "^1.1.4",
1919
"@radix-ui/react-label": "^2.1.2",
2020
"@radix-ui/react-select": "^2.1.6",

web/pnpm-lock.yaml

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/src/components/menu/SingleStatusIconPanel.tsx

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useState } from "react";
1+
import { useEffect, useState } from "react";
22
import { shapes, iconNames } from "../../types/types";
33
import { usePlayerStatusHudStore } from "../../stores/playerStatusHudStore";
44
import { useColorEffectStore } from "../../stores/colorEffectStore";
@@ -35,10 +35,14 @@ export default function SingleStatusIconPanel() {
3535
const iconIndex = iconNames.indexOf(iconName);
3636
const panelIconColor = iconColors[iconIndex] ?? "#FFFFFF";
3737

38-
// Sync editSingleIconName/Stage into globalColorSettings for design-mode preview
39-
useColorEffectStore.setState((s) => ({
40-
globalColorSettings: { ...s.globalColorSettings, editSingleIconName: iconName, editSingleIconStage: stageIndex },
41-
}));
38+
// Sync editSingleIconName/Stage into globalColorSettings for design-mode preview.
39+
// Em useEffect (nao no corpo do render) pra nao disparar setState durante o
40+
// render — isso causava re-renders extras e travava a interacao dos controles.
41+
useEffect(() => {
42+
useColorEffectStore.setState((s) => ({
43+
globalColorSettings: { ...s.globalColorSettings, editSingleIconName: iconName, editSingleIconStage: stageIndex },
44+
}));
45+
}, [iconName, stageIndex]);
4246

4347
function handleIconChange(name: string) {
4448
setIconName(name as iconNamesKind);

web/src/components/organisms/AircraftHud.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default function AircraftHud() {
2626
return (
2727
<>
2828
<DraggableHudElement id="aircraftHorizon" label="Horizonte" zIndex={15}>
29-
<ScaledHudContent style={{ position: "fixed", bottom: "2vh", left: "43vw", pointerEvents: "none" }}>
29+
<ScaledHudContent style={{ position: "fixed", bottom: "2.16vh", left: "43.43vw", pointerEvents: "none" }}>
3030
<ArtificialHorizon size={160} pitch={pitch} roll={roll} />
3131
</ScaledHudContent>
3232
</DraggableHudElement>

web/src/components/organisms/DevPanel.tsx

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ import {
77
import { usePositioningStore } from "../../stores/positioningStore";
88
import { useMenuStore } from "../../stores/menuStore";
99
import { usePlayerStatusHudStore } from "../../stores/playerStatusHudStore";
10+
import ShapeLab from "./ShapeLab";
1011

1112
export default function DevPanel() {
1213
const [open, setOpen] = useState(false);
14+
const [shapeLab, setShapeLab] = useState(false);
1315

1416
const positioningActive = usePositioningStore((s) => s.active);
1517
const togglePositioning = usePositioningStore((s) => s.toggle);
@@ -76,6 +78,13 @@ export default function DevPanel() {
7678
}
7779
/>
7880

81+
<DevButton
82+
icon={faVectorSquare}
83+
label="Shape Lab"
84+
active={shapeLab}
85+
onClick={() => setShapeLab((v) => !v)}
86+
/>
87+
7988
{positioningActive && (
8089
<button
8190
onClick={resetAll}
@@ -121,6 +130,8 @@ export default function DevPanel() {
121130
<FontAwesomeIcon icon={faCode} />
122131
<FontAwesomeIcon icon={open ? faChevronDown : faChevronUp} style={{ fontSize: 9 }} />
123132
</button>
133+
134+
{shapeLab && <ShapeLab onClose={() => setShapeLab(false)} />}
124135
</div>
125136
);
126137
}

0 commit comments

Comments
 (0)