4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
obs-studio/UI
History
gxalpha 8328609b20 UI: Don't transition in studio mode if scenes are the same 
Fixes an issue where when "Duplicate Scenes" and "Switch Preview/Program
after Transitioning" were disabled and preview and program were the same
scene, pressing "Transition" would just disable the menus without
anything happening. This is because a transition is initiated, but never
actually starts transitioning (since both scenes are the same). The
check for this already exists, but was only triggered in swapScenesMode.

Also renames the newScene variable to lastScene to make it more obvious
what it actually is (especially since now, it's not only the new scene
anymore).
2022-05-21 15:42:36 -07:00
..
data UI: Use correct terminology for Program in Studio Mode 2022-05-20 07:38:30 -04:00
forms UI: Use Shift instead of Alt for Copy/Paste Transform 2022-05-14 16:11:07 -07:00
frontend-plugins decklink-output-ui: Fix crash when stopping preview 2022-05-20 21:15:53 -04:00
importers UI/importers: Fix compiler warning 2022-04-23 16:12:45 -07:00
installer UI: Improve installer, add release notes & Quickstart link 2021-10-10 17:19:10 +11:00
obs-frontend-api UI: Update CMakeLists.txt for main OBS app 2022-03-16 23:11:58 +01:00
win-update UI: Update CMakeLists.txt for main OBS app 2022-03-16 23:11:58 +01:00
xdg-data UI: Update CMakeLists.txt for main OBS app 2022-03-16 23:11:58 +01:00
adv-audio-control.cpp UI: Add rename signal to adv audio dialog 2022-05-14 16:36:00 -07:00
adv-audio-control.hpp UI: Add rename signal to adv audio dialog 2022-05-14 16:36:00 -07:00
api-interface.cpp obs-frontend-api: Add function to get frontend translated string 2022-03-10 06:27:18 -08:00
audio-encoders.cpp UI: Fix audio ids not being stored properly 2022-03-13 07:05:02 -07:00
audio-encoders.hpp UI: Fix audio ids not being stored properly 2022-03-13 07:05:02 -07:00
auth-base.cpp UI: Rework YouTube broadcast setup flow 2021-09-12 13:45:51 +02:00
auth-base.hpp UI: Rework YouTube broadcast setup flow 2021-09-12 13:45:51 +02:00
auth-listener.cpp UI: Fix AuthListener error HTTP response body 2021-09-16 15:03:28 +02:00
auth-listener.hpp UI: Properly verify state parameter for YouTube auth 2021-09-15 06:16:29 -07:00
auth-oauth.cpp UI: Make OAuth base URL configurable 2022-05-19 09:31:38 -07:00
auth-oauth.hpp UI: Add support for external browser OAuth 2021-07-24 15:50:59 -07:00
auth-restream.cpp UI: Make OAuth base URL configurable 2022-05-19 09:31:38 -07:00
auth-restream.hpp UI: Specify exact service to auth login callbacks 2021-07-24 15:50:59 -07:00
auth-twitch.cpp UI: Make OAuth base URL configurable 2022-05-19 09:31:38 -07:00
auth-twitch.hpp UI: Add UUID to Twitch panel URLs 2021-12-11 14:39:19 -08:00
auth-youtube.cpp UI: Fix unused-parameter warnings 2022-05-04 01:37:10 -07:00
auth-youtube.hpp UI: Use STL random as fallback 2021-09-17 02:59:21 -07:00
balance-slider.hpp UI: Add ability to reset sliders when double clicked 2018-09-07 09:27:20 -05:00
clickable-label.hpp clang-format: Apply formatting 2019-06-23 23:49:10 -07:00
CMakeLists.txt UI: Make OAuth base URL configurable 2022-05-19 09:31:38 -07:00
context-bar-controls.cpp UI: Use std::unique_ptr for ui variables 2022-02-20 00:30:37 -08:00
context-bar-controls.hpp UI: Use std::unique_ptr for ui variables 2022-02-20 00:30:37 -08:00
crash-report.cpp clang-format: Apply formatting 2019-06-23 23:49:10 -07:00
crash-report.hpp UI: Rename 'obs' dir to 'UI' 2016-08-27 20:19:45 -07:00
display-helpers.hpp UI: Add option to draw safe areas in preview 2021-08-20 15:20:59 -07:00
double-slider.cpp clang-format: Apply formatting 2019-06-23 23:49:10 -07:00
double-slider.hpp clang-format: Apply formatting 2019-06-23 23:49:10 -07:00
expand-checkbox.hpp UI, libobs, text-freetype2: Add missing pragma once in header files 2019-04-01 02:48:28 -05:00
focus-list.cpp UI: Rename 'obs' dir to 'UI' 2016-08-27 20:19:45 -07:00
focus-list.hpp clang-format: Apply formatting 2019-06-23 23:49:10 -07:00
horizontal-scroll-area.cpp UI: Add Vertical Mixer option 2018-05-19 00:17:58 -03:00
horizontal-scroll-area.hpp clang-format: Apply formatting 2019-06-23 23:49:10 -07:00
hotkey-edit.cpp UI: Don't recreate entire Hotkey Settings tab 2022-01-05 23:56:34 -08:00
hotkey-edit.hpp UI: Don't recreate entire Hotkey Settings tab 2022-01-05 23:56:34 -08:00
item-widget-helpers.cpp UI: Rename 'obs' dir to 'UI' 2016-08-27 20:19:45 -07:00
item-widget-helpers.hpp UI: sort audio sources by name locale aware 2020-04-12 19:33:02 +02:00
locked-checkbox.cpp UI: Source Toolbar 2020-08-17 07:18:18 -07:00
locked-checkbox.hpp UI: Source Toolbar 2020-08-17 07:18:18 -07:00
log-viewer.cpp UI: Create Log Viewer window XML file, migrate code 2022-04-10 11:52:11 +10:00
log-viewer.hpp UI: Create Log Viewer window XML file, migrate code 2022-04-10 11:52:11 +10:00
media-controls.cpp UI: Use std::unique_ptr for ui variables 2022-02-20 00:30:37 -08:00
media-controls.hpp UI: Use std::unique_ptr for ui variables 2022-02-20 00:30:37 -08:00
media-slider.cpp UI: Allow adjusting media slider with arrow buttons 2020-09-05 23:53:54 -05:00
media-slider.hpp UI: Allow adjusting media slider with arrow buttons 2020-09-05 23:53:54 -05:00
menu-button.cpp UI: Rename 'obs' dir to 'UI' 2016-08-27 20:19:45 -07:00
menu-button.hpp clang-format: Apply formatting 2019-06-23 23:49:10 -07:00
mute-checkbox.hpp UI: Rename 'obs' dir to 'UI' 2016-08-27 20:19:45 -07:00
obf.c clang-format: Apply formatting 2019-06-23 23:49:10 -07:00
obf.h UI: Add obfuscation func 2019-02-07 14:47:15 -08:00
obs-app.cpp UI: Restore portable mode on Windows 2022-05-08 06:47:09 +02:00
obs-app.hpp UI: Add option to hide OBS windows on Windows 2022-01-22 15:14:16 -08:00
obs-proxy-style.cpp UI: Disable wheel scrolling on QComboBoxes 2022-04-02 16:04:51 -07:00
obs-proxy-style.hpp UI: Disable wheel scrolling on QComboBoxes 2022-04-02 16:04:51 -07:00
obs.manifest UI: Supply Windows manifest file 2020-01-01 15:58:48 +11:00
obs.rc.in UI: Update CMakeLists.txt for main OBS app 2022-03-16 23:11:58 +01:00
platform-osx.mm UI: Move taskbar overlay functions into platform.hpp 2022-05-20 20:16:56 +10:00
platform-windows.cpp UI: Move taskbar overlay functions into platform.hpp 2022-05-20 20:16:56 +10:00
platform-x11.cpp UI: Move taskbar overlay functions into platform.hpp 2022-05-20 20:16:56 +10:00
platform.hpp UI: Move taskbar overlay functions into platform.hpp 2022-05-20 20:16:56 +10:00
properties-view.cpp UI: Remove old ComboBoxIgnoreScroll 2022-04-02 16:04:51 -07:00
properties-view.hpp UI: Fix deferred source properties not updating 2022-03-09 13:12:17 -08:00
properties-view.moc.hpp UI: Fix missing includes 2020-04-08 17:20:52 -07:00
qt-display.cpp UI: Fix compiler warning when WIN32 is not defined 2022-04-23 16:12:45 -07:00
qt-display.hpp UI: Add OBSQTDisplay::OnMove()/OnDisplayChange() 2022-02-26 01:09:07 -08:00
qt-wrappers.cpp UI: Remove OBSSceneItem QDataStream 2022-03-05 15:59:30 -08:00
qt-wrappers.hpp UI: Remove OBSSceneItem QDataStream 2022-03-05 15:59:30 -08:00
record-button.cpp UI: Add save button next to replay buffer button 2019-12-12 17:59:20 -08:00
record-button.hpp UI: Add save button next to replay buffer button 2019-12-12 17:59:20 -08:00
remote-text.cpp UI, file-updater, rtmp-services: Enable curl ALPN support 2022-03-24 17:10:01 -07:00
remote-text.hpp UI: Add postDataSize option to GetRemoteText 2021-09-15 07:44:55 +02:00
scene-tree.cpp UI: Remove unnecessary code 2021-03-08 23:42:21 +13:00
scene-tree.hpp UI: Fix grid mode scenes overlapping 2021-03-08 23:33:54 +13:00
screenshot-obj.hpp UI: Add ability to make screenshots 2020-07-30 17:41:43 -07:00
slider-absoluteset-style.cpp UI: Use Qt::MiddleButton instead of deprecated Qt::MidButton 2020-12-01 10:54:21 -05:00
slider-absoluteset-style.hpp clang-format: Apply formatting 2019-06-23 23:49:10 -07:00
slider-ignorewheel.cpp UI: Remove unneeded include 2022-01-04 01:54:38 -08:00
slider-ignorewheel.hpp UI: Various screen reader fixes 2020-11-25 19:38:05 -08:00
source-label.cpp clang-format: Apply formatting 2019-06-23 23:49:10 -07:00
source-label.hpp UI: Fix warnings for Qt 5.15 2020-06-21 18:23:05 -07:00
source-tree.cpp libobs,UI: Issue appropriate signals on group / ungroup 2022-04-24 12:09:38 -07:00
source-tree.hpp UI: Dim hidden source items in source tree 2021-08-17 08:24:28 -07:00
sparkle-updater.mm Apply clang-format to objective c code 2019-07-09 13:39:13 -05:00
spinbox-ignorewheel.cpp UI: Rename UI files for consistency 2019-04-21 04:10:46 -07:00
spinbox-ignorewheel.hpp UI: Rename UI files for consistency 2019-04-21 04:10:46 -07:00
streaming-helpers.cpp UI: Use const ref for get_service_from_json() 2022-04-18 17:46:07 -07:00
streaming-helpers.hpp UI: Use const ref for get_service_from_json() 2022-04-18 17:46:07 -07:00
ui-config.h.in UI: Make OAuth base URL configurable 2022-05-19 09:31:38 -07:00
ui-validation.cpp UI: Add Start Streaming settings check on start 2019-12-11 01:50:41 -08:00
ui-validation.hpp UI: Add Start Streaming settings check on start 2019-12-11 01:50:41 -08:00
undo-stack-obs.cpp UI: Optimize undo/redo functions with constant references 2022-01-19 21:39:43 +01:00
undo-stack-obs.hpp UI: Optimize undo/redo functions with constant references 2022-01-19 21:39:43 +01:00
url-push-button.cpp UI: Upgrade stream link hotlink to a button 2019-10-30 12:09:07 -07:00
url-push-button.hpp UI: Upgrade stream link hotlink to a button 2019-10-30 12:09:07 -07:00
vertical-scroll-area.cpp UI: Rename 'obs' dir to 'UI' 2016-08-27 20:19:45 -07:00
vertical-scroll-area.hpp clang-format: Apply formatting 2019-06-23 23:49:10 -07:00
visibility-checkbox.cpp UI: Source Toolbar 2020-08-17 07:18:18 -07:00
visibility-checkbox.hpp UI: Source Toolbar 2020-08-17 07:18:18 -07:00
visibility-item-widget.cpp UI: Remove unused code from visibility item widget 2019-10-06 00:42:19 -05:00
visibility-item-widget.hpp UI: Remove unused code from visibility item widget 2019-10-06 00:42:19 -05:00
volume-control.cpp UI: Default mixer volume meter to two channels 2022-04-17 11:54:50 +10:00
volume-control.hpp UI: Make volume meter tweakable by stylesheet 2022-02-27 13:17:59 +11:00
window-basic-about.cpp UI: Update CMakeLists.txt for main OBS app 2022-03-16 23:11:58 +01:00
window-basic-about.hpp UI: Add Patreon contributors to About dialog 2019-05-05 20:00:26 -07:00
window-basic-adv-audio.cpp libobs: Rename obs_audio_monitoring_supported to _available 2021-12-22 02:43:14 -08:00
window-basic-adv-audio.hpp UI: Add percent checkbox to advanced audio dialog 2020-05-23 01:05:07 -05:00
window-basic-auto-config-test.cpp UI: Add "H.264" to simple hardware encoders 2022-05-06 06:11:25 -07:00
window-basic-auto-config.cpp UI: Refactor duplicated streaming page code 2022-04-18 12:27:29 -07:00
window-basic-auto-config.hpp UI: Refactor duplicated streaming page code 2022-04-18 12:27:29 -07:00
window-basic-filters.cpp UI: Fix compiler warning when WIN32 is not defined 2022-04-23 16:12:45 -07:00
window-basic-filters.hpp UI: Add OBSQTDisplay::OnMove()/OnDisplayChange() 2022-02-26 01:09:07 -08:00
window-basic-interaction.cpp UI: Fix compiler warning when WIN32 is not defined 2022-04-23 16:12:45 -07:00
window-basic-interaction.hpp UI: Add OBSQTDisplay::OnMove()/OnDisplayChange() 2022-02-26 01:09:07 -08:00
window-basic-main-browser.cpp clang-format: Apply formatting 2019-06-23 23:49:10 -07:00
window-basic-main-dropfiles.cpp UI: Support JXR image dropEvent on Windows 2022-05-08 15:25:43 -07:00
window-basic-main-icons.cpp UI: Add source icons 2019-11-24 20:50:42 -08:00
window-basic-main-outputs.cpp UI: Redo encoder names now that H.264 isn't alone 2022-05-06 20:58:09 -07:00
window-basic-main-outputs.hpp Merge pull request #5371 from norihiro/automatic-file-splitting 2022-04-10 16:49:37 -07:00
window-basic-main-profiles.cpp UI: Add events for renaming profiles/collections 2022-03-08 11:17:59 -08:00
window-basic-main-scene-collections.cpp UI: Move scene import dialog to the stack 2022-05-16 21:51:01 +02:00
window-basic-main-screenshot.cpp UI: Add save notifications to status bar 2021-04-01 07:36:20 -07:00
window-basic-main-transitions.cpp UI: Don't transition in studio mode if scenes are the same 2022-05-21 15:42:36 -07:00
window-basic-main.cpp UI: Move taskbar overlay functions into platform.hpp 2022-05-20 20:16:56 +10:00
window-basic-main.hpp UI: Move taskbar overlay functions into platform.hpp 2022-05-20 20:16:56 +10:00
window-basic-preview.cpp UI: Ignore resizing item when it is locked 2022-01-07 15:18:59 -08:00
window-basic-preview.hpp UI: Cleanup libobs C++ type use 2021-11-26 23:23:51 +13:00
window-basic-properties.cpp UI: Fix compiler warning when WIN32 is not defined 2022-04-23 16:12:45 -07:00
window-basic-properties.hpp UI: Create Properties window XML file, migrate code 2022-04-10 11:52:11 +10:00
window-basic-settings-stream.cpp UI: Refactor duplicated streaming page code 2022-04-18 12:27:29 -07:00
window-basic-settings.cpp UI: Add "H.264" to simple hardware encoders 2022-05-06 06:11:25 -07:00
window-basic-settings.hpp UI: Refactor duplicated streaming page code 2022-04-18 12:27:29 -07:00
window-basic-source-select.cpp UI: Add support for nonlinear SRGB blending 2022-04-02 16:02:41 -07:00
window-basic-source-select.hpp UI: Apply transforms/crops correctly to sources on paste 2021-11-10 14:22:45 -08:00
window-basic-stats.cpp UI: Cleanup libobs C++ type use 2021-11-26 23:23:51 +13:00
window-basic-stats.hpp UI: Fix missing includes 2020-04-08 17:20:52 -07:00
window-basic-status-bar.cpp UI: Fix crash on exit with stuck encoder 2021-03-31 01:21:51 -07:00
window-basic-status-bar.hpp UI: Add status icons for recording and streaming 2020-04-16 19:15:13 +02:00
window-basic-transform.cpp UI: Fix a stack overlow caused by using OBSScene 2021-12-16 23:38:59 -08:00
window-basic-transform.hpp UI: Update Edit Transform dialog on scene switch 2021-11-10 06:08:48 -08:00
window-dock-browser.cpp UI: Check for null pointer 2019-09-19 05:39:25 -07:00
window-dock-browser.hpp UI: Make BrowserDock native 2021-01-26 09:43:16 -08:00
window-dock.cpp clang-format: Apply formatting 2019-06-23 23:49:10 -07:00
window-dock.hpp UI: Warn when closing dock widgets for first time 2019-03-05 14:39:24 -08:00
window-extra-browsers.cpp UI: Save custom browser docks with docks data 2022-03-22 22:24:23 -07:00
window-extra-browsers.hpp UI: Remove UUID from ExtraBrowsersModel 2022-03-22 22:24:23 -07:00
window-importer.cpp UI: Fix imported scene collection names duplicating 2021-04-20 00:17:34 -07:00
window-importer.hpp UI: Add advanced scene collection importer 2020-02-16 17:56:06 +13:00
window-log-reply.cpp UI: Add button to Analyzer in the Log Reply window 2020-04-07 20:43:12 +10:00
window-log-reply.hpp UI: Add button to Analyzer in the Log Reply window 2020-04-07 20:43:12 +10:00
window-main.hpp clang-format: Apply formatting 2019-06-23 23:49:10 -07:00
window-missing-files.cpp UI: Cleanup libobs C++ type use 2021-11-26 23:23:51 +13:00
window-missing-files.hpp UI: Add missing files dialog 2021-01-17 10:31:59 +13:00
window-namedialog.cpp Revert "UI: Disable hotkeys when a user is expected to type text" 2021-10-03 07:52:44 -07:00
window-namedialog.hpp UI: Run Autoconfig Wizard on New Profile Creation 2020-10-29 14:15:57 -07:00
window-projector.cpp UI: Fix handling of remove signal with projectors 2022-03-10 12:15:30 -08:00
window-projector.hpp UI: Add mulitiview layout options without program 2022-03-08 12:30:19 -08:00
window-remux.cpp UI: Truncate displayed file paths in the middle in Remux window 2022-04-07 01:52:02 -07:00
window-remux.hpp UI: Declare missing overrides 2019-07-21 20:53:30 -07:00
window-youtube-actions.cpp Merge pull request #5216 from derrod/yt-thumbnail-upload 2021-09-15 00:26:56 -07:00
window-youtube-actions.hpp UI, libobs, obs-plugins: Fix compiler warnings 2021-11-04 06:25:52 -07:00
youtube-api-wrappers.cpp Fix indent on multiline comments 2022-04-30 16:06:23 -07:00
youtube-api-wrappers.hpp UI: Fix YT broadcast start/stop failing due to redundant transition/reset 2021-10-13 12:27:47 +02:00