Skip to content

fix: obs change scene var menu and rotation var menu #2918

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.

Sign up for GitHub

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

Merged
ebiggz merged 7 commits into from
Dec 9, 2024
Merged

fix: obs change scene var menu and rotation var menu #2918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2d6dcf2
fix: command cooldown
CKY- Nov 28, 2024
6c84a65
Merge branch 'v5' into v5
ebiggz Nov 28, 2024
7e66da8
Merge branch 'v5' of https://github.com/CKY-/Firebot into v5
CKY- Dec 2, 2024
9cb87b4
Merge branch 'crowbartools:v5' into v5
CKY- Dec 2, 2024
be9e9f3
fix:vars menu in obs-change-scene effect
CKY- Dec 5, 2024
aeb73f5
fix:rotation variable menu
CKY- Dec 5, 2024
2ebe11b
Merge branch 'v5' into v5-obs-change-sceen-var-menu
ebiggz Dec 9, 2024
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
4 changes: 2 additions & 2 deletions src/backend/integrations/builtin/obs/effects/change-scene-effect-type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const ChangeSceneEffectType: EffectType<{
</ui-select>

<div ng-show="effect.custom === true" style="margin-top:10px;">
<firebot-input input-title="Custom Scene" model="effect.sceneName"></firebot-input>
<firebot-input input-title="Custom Scene" model="effect.sceneName" menu-position="under"></firebot-input>
</div>
</eos-container>
`,
Expand All @@ -52,7 +52,7 @@ export const ChangeSceneEffectType: EffectType<{
(scenes: string[]) => {
$scope.scenes = [];
if (scenes != null) {
scenes.forEach(scene => {
scenes.forEach((scene) => {
$scope.scenes.push({name: scene, custom: false});
});
}
Expand Down
1 change: 1 addition & 0 deletions src/gui/app/directives/effect-option-settings/eosOverlayRotation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
model="$ctrl.effect.rotation"
placeholder-text="Enter rotation"
data-type="number"
menu-position="under"
/>
<dropdown-select
style="margin: 0 0 0 10px;"
Expand Down