mirror/obs-studio
1
0 Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-10-06 21:01:43 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,276 Commits 20 Branches 257 Tags
def6fcb0eefe02feedc8a2050fef4fb59ad7fefe
Commit Graph
1196 Commits
Author SHA1 Message Date
Jim def6fcb0ee Merge pull request #2125 from DDRBoxman/appbundle 
Fixes to make OBS work on Catalina
 2019-11-13 12:21:13 -08:00
Jim d357e1eb6e Merge pull request #2042 from WizardCM/custom-twitch-docks 
UI: Add support for Custom (Legacy) Twitch Dashboard Docks
 2019-11-12 16:45:37 -08:00
Jim 14d8f86745 Merge pull request #2081 from jpark37/cpp17 
CMake 3.10, C++17, SWIG warnings
 2019-11-11 11:49:40 -08:00
Jim fc54a3b708 Merge pull request #1974 from DDRBoxman/state 
decklink-ui: Show the state of outputs in the decklink dialog
 2019-11-11 07:13:52 -08:00
Colin Edwards a469d14264 decklink-ui: Show the state of outputs in the decklink dialog 2019-11-09 14:48:24 -06:00
Clayton Groeneveld bab3391ce4 UI: Use radio buttons for FLV track selection 2019-11-09 08:19:41 -08:00
Clayton Groeneveld 0676c385ba UI: Fix main transition being set to the quick one 
This fixes an issue where using a quick transition, it would change
the main transition as well.
 2019-11-05 23:47:28 -06:00
Jim cbfb779876 Merge pull request #2148 from eulertour/master 
UI: Fall back to XGetWMName if XFetchName fails
 2019-11-05 12:54:50 -08:00
Jim 57669ffcb7 Merge pull request #2146 from Fenrirthviti/recording-bitrate-fix 
UI: Fix audio bitrate not being set in simple mode
 2019-11-05 12:52:15 -08:00
Jim 17ddb8d62d Merge pull request #2142 from cg2121/fade-to-black 
UI: Add fade to black in studio mode
 2019-11-05 12:50:29 -08:00
Colin Edwards 32690926b9 CI: Use custom macdylibbundler for OSX deps 2019-11-03 00:00:38 -05:00
JohannMG 3f6cf0e871 UI: Upgrade stream link hotlink to a button 
Most of the top streaming services now have a link in the stream key
label. Upgrading this button to a button clarifies the assistance
for the important step of setting up a stream.

Creates a new type of button for URL opening simply which also
automatically updates the tootip to the current URL.

Includes addition of Twitter/Periscope URL to make this feature more
complete.
 2019-10-30 12:09:07 -07:00
Devin Neal 7e25b0dc1e UI: Fallback to XGetWMName if XFetchName fails 2019-10-27 14:39:58 -07:00
Joel Bethke 63d66c87e4 UI: Fix audio bitrate not being set in simple mode 2019-10-25 10:56:26 -05:00
Clayton Groeneveld 1c005fcb51 UI: Add fade to black in studio mode 2019-10-24 19:00:33 -05:00
Jim de7ab74370 Merge pull request #2137 from AlexWayfer/revert_desktop_file_renaming 
Fix desktop entry for GNOME shell without file renaming
 2019-10-22 21:28:28 -07:00
Exeldro 478bf7c6af libobs: Add video info to filename formatting 2019-10-22 02:50:13 -07:00
Alexander Popov b83c657cf1 UI: Fix desktop entry for GNOME Shell 
Discussion:
https://github.com/obsproject/obs-studio/pull/2130#issuecomment-544461351
 2019-10-21 23:43:10 -07:00
Alexander Popov d30ab737a9 Revert "Rename com.obsproject.Studio.desktop to obs.desktop" 
This reverts commit 322b8afddb.
 2019-10-21 23:43:06 -07:00
Jim 6410bc646f Merge pull request #2136 from cg2121/simplify-fullscreen 
UI: Simplify fullscreen toggle code
 2019-10-21 23:40:46 -07:00
Clayton Groeneveld 52a3a61a6e UI: Simplify fullscreen toggle code 2019-10-21 15:17:26 -05:00
Matt Gajownik acf2eae1e5 UI: Display Sample Rate with proper formatting 2019-10-19 19:10:39 +11:00
Jim 156e2f3aec Merge pull request #2128 from Xaymar/return-to-break 
UI: Fix checkable property groups
 2019-10-16 03:57:36 -07:00
Jim f8a0bd6440 Merge pull request #2127 from cg2121/stats-hotkey 
UI: Add stats reset hotkey
 2019-10-15 23:06:21 -07:00
Michael Fabian 'Xaymar' Dirks fefcf5468a UI: Fix checkable property groups 2019-10-16 07:26:21 +02:00
Jim 7ed8f05f21 Merge pull request #2106 from cg2121/fix-preview-bug 
UI: Fix issue with preview projector
 2019-10-15 22:16:11 -07:00
Clayton Groeneveld c4169ba15a UI: Add stats reset hotkey 2019-10-15 23:20:35 -05:00
jpark37 9ac6609241 UI: Don't influence headers with using namespace 
Preparation for C++17 compilation.
 2019-10-15 21:08:40 -07:00
Jim 8a1ff1c475 Merge pull request #2103 from cg2121/rename-filters-shortcut 
UI: Add ability to rename filters with F2 (Return on Mac)
 2019-10-15 10:31:35 -07:00
Jim b524774254 Merge pull request #2100 from AlexWayfer/patch-2 
Rename com.obsproject.Studio.desktop to obs.desktop
 2019-10-15 10:24:38 -07:00
Jim 53661d90ce Merge pull request #2096 from cg2121/unused-code 
UI: Remove unused code from visibility item widget
 2019-10-15 10:19:46 -07:00
Jim ce29224d4c Merge pull request #2083 from exeldro/output_timer_tabstops 
frontend-tools: output timer tab stop order
 2019-10-15 09:22:31 -07:00
Matt Gajownik 59e274f623 UI: Add support for Custom Twitch Dashboard Docks 2019-10-15 21:38:18 +11:00
luz.paz d124e6402c docs/sphinx: Fix various typos 
(This modifies UI, libobs, deps/obs-scripting, various cmake files)

Found using:
`codespell -q 3 -S *.ini,./UI/data/locale,./deps/w32-pthreads -L aci,dur,iff,mut,numer,uint`
 2019-10-14 17:19:38 -07:00
Colin Edwards 747ce9b77c libobs: Use proper resource paths when running from an OSX bundle 2019-10-13 21:53:43 -05:00
Jim 09c7ec487b Merge pull request #2064 from jpark37/bgra-swap-chain 
D3D swap chain enhancements
 2019-10-12 20:54:33 -07:00
Jim b327bf5deb Merge pull request #2053 from Palakis/feature/frontend-api-transition-duration-changed 
Frontend API: provide a "transition duration changed" event
 2019-10-12 17:34:09 -07:00
Jim b910edd872 Merge pull request #2058 from Palakis/duplicate-scene-names 
UI: set names on scenes duplicated for Studio Mode
 2019-10-12 16:42:04 -07:00
Stéphane Lepin 881e49ce62 UI: frontend api "trans. duration changed" event 2019-10-12 16:29:44 -07:00
Jim 76fe77831d Merge pull request #2037 from cg2121/compiler-warnings 
UI, libobs: Fix compiler warnings
 2019-10-11 16:38:48 -07:00
Jim 9fa1ec3ae9 Merge pull request #2114 from cg2121/fix-multiview 
UI: Fix issue where multiview doesn't update
 2019-10-10 19:15:07 -07:00
Clayton Groeneveld 016d4ee87f UI: Fix issue where multiview doesn't update 2019-10-10 20:12:20 -05:00
jp9000 ec769ef008 libobs-d3d11: Set maximum GPU priority 
(This commit also modifies the UI)

This solves the issue where OBS would be deprioritized by Windows over
fullscreen games, causing OBS to lag out whereas the games would still
run fine.
 2019-10-10 00:51:47 -07:00
Clayton Groeneveld a55f83a38f UI, libobs: Fix compiler warnings 2019-10-10 00:25:54 -05:00
Clayton Groeneveld 15129b5751 UI: Fix issue with preview projector 2019-10-09 02:43:48 -05:00
Clayton Groeneveld 30d2830c15 UI: Add ability to rename filters with F2 (Return on Mac) 2019-10-08 02:48:50 -05:00
jp9000 cda7f3e3fd Revert "UI: Remove FFZ from twitch integration" 
This reverts commit c22d539a7b.
 2019-10-07 18:24:38 -07:00
Alexander Popov 322b8afddb Rename com.obsproject.Studio.desktop to obs.desktop 
Now it's impossible to add OBS to favorites applications in GNOME:

https://imgur.com/B3bvnw4

I think it's because of inconsistency of `.desktop` file name and executable file name.

Just after renaming OBS can be manages as regular application:

https://imgur.com/acmzrNy
 2019-10-08 00:09:12 +03:00
jp9000 c22d539a7b UI: Remove FFZ from twitch integration 
Unfortunately, due to some conflicts between FFZ and BTTV (particularly
the fact that having FFZ enabled removes the BTTV settings menu items),
one of them needs to be removed.  For the time being, we'll remove FFZ,
because BTTV shows FFZ emojis anyway.
 2019-10-07 13:36:56 -07:00
Clayton Groeneveld 0df2cd0cfe UI: Remove unused code from visibility item widget 2019-10-06 00:42:19 -05:00