Jason Wen d2dbbd4e69 Merge branch 'master-priv' into master-dev-c3 ...

# Conflicts:
#	CHANGELOGS.md
#	selfdrive/controls/lib/desire_helper.py
#	selfdrive/ui/qt/widgets/controls.h

2024-05-29 22:44:32 -04:00

..

installer

remove dashcam branch (#31081)

2024-01-19 14:05:03 -08:00

qt

Merge branch 'master-priv' into master-dev-c3

2024-05-29 22:44:32 -04:00

tests

Merge branch 'upstream/openpilot/master' into sync-20240502

2024-05-04 23:49:28 -04:00

translations

Merge branch 'master' into SP-59-sync-priv-20240507

2024-05-15 16:04:19 -04:00

__init__.py

Soundd: move to python (#30567)

2023-12-05 18:10:01 -08:00

.gitignore

fix spinner asset paths (#31524)

2024-02-20 18:01:28 -08:00

main.cc

ui: add translation files to assets.qrc (#29597)

2023-08-25 19:05:35 -07:00

mui.cc

bring this back

2024-02-09 12:46:06 -08:00

SConscript

Disable Screen Recorder

2024-05-28 02:26:26 +00:00

soundd.py

Merge branch 'master' into sync-priv-20240227

2024-02-27 21:22:16 -05:00

spinner

fix spinner asset paths (#31524)

2024-02-20 18:01:28 -08:00

text

fix spinner asset paths (#31524)

2024-02-20 18:01:28 -08:00

ui.cc

ui: Force offroad from settings when the car is on

2024-05-17 06:00:29 +00:00

ui.h

Merge branch 'master' into SP-59-sync-priv-20240507

2024-05-09 15:48:29 -04:00

ui.py

fix status -> state typo

2024-03-09 23:31:50 -08:00

update_translations.py

use pyupgrade to update to new typing syntax (#31580)

2024-02-24 16:41:23 -08:00

watch3.cc

Revert "UI: single-threaded CameraView (#30397)"

2024-01-07 14:54:39 -08:00