Skip to content

OBS 31.1.2 Merge#5684

Open
aleksandr-voitenko wants to merge 15 commits intostagingfrom
obs_merge_31.1.2
Open

OBS 31.1.2 Merge#5684
aleksandr-voitenko wants to merge 15 commits intostagingfrom
obs_merge_31.1.2

Conversation

@aleksandr-voitenko
Copy link
Collaborator

@aleksandr-voitenko aleksandr-voitenko commented Dec 10, 2025

This PR includes both master and staging branches.
The only unique change has made to the test/regular/obs-importer.ts to work around a data race I was unlucky to face.

@CLAassistant
Copy link

CLAassistant commented Dec 10, 2025

CLA assistant check
All committers have signed the CLA.

@aleksandr-voitenko aleksandr-voitenko changed the base branch from master to staging December 11, 2025 12:37
@aleksandr-voitenko aleksandr-voitenko changed the title [WIP] OBS 31.1.2 Merge OBS 31.1.2 Merge Dec 15, 2025
@aleksandr-voitenko
Copy link
Collaborator Author

/Azurepipelines run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

sandboxcoder and others added 6 commits January 14, 2026 10:57
* enable enhanced broadcasting checkbox for Apple Silicon
* bump OSN to 0.26.1test4
* feat(controls): add callout control

* feat(multistream): add ultra features page

* pr: address feedback
@michelinewu michelinewu added the staging Pull requests that can't be bundled label Feb 18, 2026
cmm21 and others added 2 commits February 24, 2026 15:00
* feat(reactive_widgets): add reactive widget source bp, link apis, UI (wip)

* reactive widget menu, add trigger settings, WIP

* reactive widget menu, add trigger settings, WIP

* add data binding to reactive widgets (WIP)

* reactive widgets submit new trigger binding (WIP)

* reactive widgete settings bindings, (WIP)

* reacrtive widgets data binding, ui polish (WIP)

* add manage on web button (WIP)

* reactive widgets ux polish, WIP

* refactor reactive widget settings (WIP)

* refactor reactive widget settings (WIP)

* refactor reactive widget settings (WIP)

* refactor reactive widget settings (WIP)

* refactor reactive widget settings (WIP)

* refactor reactive widget settings (WIP)

* refactor reactive widget settings (WIP)

* tab routing, types (WIP)

* refactor reactive widgets, WIP

* add types, sanitize triggers, WIP

* add reactive widget typings

* reactive widget types and safe checks

* rm console logs

* reactive widget typings and refactor, WIP

* add new fields to reactive widgets

* refactor reactive widgets (WIP)

* reactive widgets: rm stale fields (wip)

* reactive widgets: extract types, refactor (WIP)

* Update deleteTrigger API calls to include scopeId parameter

* feat: add tts support to reactive widget

* feat: update ReactiveWidgetTriggerDetails with voice and volume label changes

* feat: improve reactive widget trigger details and media handling

* feat: remove unused flattenAnimationOptions function and replace with mapAnimationGroups

* move playReactiveAlert to useReactiveWidgets

* refactor groupedlistinput, refactor reactive tab menu parsing

* refactor trigger details, enable searchable input in trigger create form

* rename reactive widget to game pulse

* game pulse

* feat: add tutorial and default settings functionality to GamePulse widget

* add x-force-test header to widget preview

* refactor structuredclones out of gamepulse

* undo icon for gamepulse (temp)

* extract game pulse initdefaults flow

* rename gamepulse preview fn

* move gamepulse consts to consts file

* optimize trigger preview handling

* update onSubmit type on create trigger form

* rm inline styles

* update relative imports

* improve game_pulse_api typing

* add missing translations to gamepulse

* fix typo

* merge groupedlist into listinput

* lint, move setIsSubmitting to finally block

* lint

* remove 'satisfies' operator to resolve ESLint parsing error

* pr updates

* replace types, consts, helpers file with model on gamepulse widget

* add widget-game-pulse to fallback.ts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

staging Pull requests that can't be bundled

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants