starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-27 17:55:42 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,439 Commits 20 Branches 255 Tags
904ad9be1de6b0b912a4bae2f2d89e4a64f7c2d0
Commit Graph
5439 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jp9000 904ad9be1d libobs: Add function to get last main output texture 
Allows the ability to get the last rendered texture of the main output
view.
 2018-04-20 05:57:47 -07:00
Jim b4d6f1c996 Merge pull request #1238 from Chiitoo/qt-5.11 
[Qt 5.11] Include 'QAction' in 'scripts.cpp' to fix a build failure.
 2018-04-20 03:36:11 -07:00
sorayuki fc26e3cfcf libobs: Fix potential filter rendering race condition 
The filters array should not be accessed without locking the filter
mutex.  This locks the filter mutex, grabs a reference to the first
filter, unlocks the mutex, renders the filter, and then releases the
reference.

Closes obsproject/obs-studio#1215
 2018-04-20 01:55:52 -07:00
Jim 14b7b4790c Merge pull request #1213 from TheMuso/vth264-fixes 
Vth264 fixes
 2018-04-19 22:24:35 -07:00
Shaolin 234ed9512d UI: Clean up delete Source/Scene shortcut 
The "Delete" shortcut is already set in the UI/forms so the old code
would only change shortcuts in macOS.

Closes obsproject/obs-studio#1212
 2018-04-19 21:54:01 -07:00
Murnux 273f5e2bfe UI: Don't close windows for "Always on Top" (win32) 
On windows, the "Always on top" state can safely be used without closing
dialogs.

Closes obsproject/obs-studio#1207
 2018-04-19 20:47:30 -07:00
jp9000 0d4677f3bc UI: Hold the clip flash for at least one second 
Holds the clipping flash for one second to better indicate that clipping
is occurring.

Closes obsproject/obs-studio#1201
 2018-04-18 23:49:40 -07:00
Alex Anderson e92b2560b6 UI: Add Selected and Hidden Array Values 
Add Selected and Hidden Array Values

Let developers get and set whether items in an editable list are hidden
or selected. May be useful in when editable lists are modified and
handled in a callback. Especially when edit button callbacks are used.

Closes obsproject/obs-studio#1200
 2018-04-18 21:06:16 -07:00
jp9000 4fcc2cccfe UI: Move OpenSavedProjecters call to OBSBasic::Load() 
Due to the commit 34c14829b6, source loading is now deferred
to after OBSInit(), which would cause saved scene/source projectors to
no longer load on startup.  This fixes that issue by moving the
OpenSavedProjectors call to OBSBasic::Load().
 2018-04-18 19:34:18 -07:00
Jim 7481f5b389 Merge pull request #1195 from admshao/fix-save-projectors-on-exit 
Save Windowed Projectors on exit
 2018-04-18 19:33:49 -07:00
Shaolin 7fc6ea6ccc UI: Do not generate "already active" logs 
When an user launches a multiple instance of obs and don't use the -m
flag, wait until the confirmation to launch to create a new log file.
This avoids a short log with no information when using the Help ->
Update Last Log.

Closes obsproject/obs-studio#1164
 2018-04-16 21:31:32 -07:00
jp9000 30d967eafa obs-browser: Update to browser source refactor 2018-04-14 03:45:07 -07:00
jp9000 89a5235ac0 CI: Reduce travis output verbosity 
The log output of the travis CI for macOS is unreasonably large.  This
reduces the verbosity of the output and reduces the size of the build
logs significantly.
 2018-04-13 22:25:05 -07:00
jp9000 34c14829b6 UI: Defer startup OBSBasic::Load (macOS CEF workaround) 
Adds an alternative means of isolating the CEF initialization process
from Qt's initialization process.  This is an unpleasant hack, but is
far more preferable than isolating the entire browser plugin to a
separate process and overly complexifying the browser plugin to the
point to where no one wants to touch the plugin or contribute to it.
 2018-04-12 13:42:15 -07:00
Ilya M 439b9e4d15 UI: Add frontend API to defer saving 
Allows the ability to perform multiple actions that would normally save,
and defer the save until all of those actions are complete.

Closes obsproject/obs-studio#1231
 2018-04-06 17:34:10 -07:00
Jim 0dc9151dbd Merge pull request #1247 from jumoog/master 
rtmp-services: Update recommended parameters for Nood.tv
 2018-03-31 15:36:14 -07:00
Kilian von Pflugk 531d4cd2a4 rtmp-services: Update recommended parameters for Nood.tv 2018-03-28 20:43:32 +02:00
Colin Edwards fa90926533 CI: change travis osx artifact repo name 21.1.1 2018-03-21 21:16:59 -05:00
Colin Edwards dbc120275c Merge pull request #1244 from obsproject/osxci 
CI: Check out OSX branch of obs-browser
 2018-03-19 15:16:59 -05:00
Colin Edwards 92574a778d CI: Check out OSX branch of obs-browser 2018-03-19 14:42:24 -05:00
jp9000 a81de7fb61 cmake: Include windows style DLL when copying Qt files 21.1.0 2018-03-18 17:01:01 -07:00
Colin Edwards 483be6e57c obs-browser: Update submodule to latest version 2018-03-18 14:40:01 -05:00
jp9000 ceadde0838 UI/updater: Delete visual studio runtimes after execution 2018-03-18 11:12:14 -07:00
Shaolin 9211dba267 UI: Save windowed projectors on exit 2018-03-18 05:11:44 -03:00
Shaolin 3390be50ce UI: Remove a second call to OpenSavedProjectors 
OpenSavedProjectors is already called from RefreshSceneCollections
earlier by OBSInit.
 2018-03-18 05:11:44 -03:00
Shaolin 8b6641d1a8 UI: Clean up OBSProjector creation 2018-03-18 05:11:44 -03:00
Shaolin 372640ff35 UI: Update Projectors title on source name change 2018-03-18 05:11:44 -03:00
Shaolin 76af4ff36d UI: Clean up save and load projector code 2018-03-18 05:11:44 -03:00
Shaolin 8ec1f97d30 UI: Add helper functions to Projector 2018-03-18 05:11:44 -03:00
Shaolin e6c00afeac UI: Add Scene to ProjectorType 2018-03-18 05:11:44 -03:00
Shaolin 3952fe2693 UI: Simplify Projector Init 2018-03-18 05:11:44 -03:00
Shaolin 7da90fa25f UI: Refactor Projector OBSRender source usage 2018-03-18 05:11:44 -03:00
Shaolin abbcb6ae88 UI: Move ProjectorType enum to projector header 2018-03-18 05:11:44 -03:00
Shaolin c605f74d3f UI: Make OpenSavedProjectors indentation clear 2018-03-18 05:11:44 -03:00
Shaolin 2d864590fe UI: Fix the Multiview window not using translation 2018-03-18 05:11:44 -03:00
Shaolin cfc2c1373d UI: Check if source is valid earlier 2018-03-18 05:11:44 -03:00
Shaolin d13b4d35a0 UI: Simplify the OpenProjector logic 2018-03-18 05:11:44 -03:00
Shaolin dd5e3ef3fe UI: Only load projectors if SaveProjectors is true 2018-03-18 05:11:44 -03:00
jp9000 a6c65cdbf3 deps/obs-scripting: Prevent python unload more than once 2018-03-18 00:57:15 -07:00
jp9000 a0cb1f256c obs-browser: Update submodule to latest version 2018-03-17 21:16:30 -07:00
Jim 6eae0b284e Merge pull request #1236 from subzerobo/rtmp-services-aparat-com 
rtmp-services: Update ingest list for Aparat.com
 2018-03-17 17:07:51 -07:00
Jim 25e92e5d07 Merge pull request #1237 from kkartaltepe/fix-lua 
deps/obs-scripting: Add obs_source_enum_filters
 2018-03-17 17:07:12 -07:00
jp9000 0a6d5772d9 deps/obs-scripting: Don't allow unloading more than once 2018-03-17 16:52:14 -07:00
Jim 5eaf46f1cd Merge pull request #1239 from Xaymar/plugin-enc-amf 
enc-amf: Version 2.3.3
 2018-03-17 15:37:07 -07:00
Michael Fabian 'Xaymar' Dirks 7f0576bac6 enc-amf: Version 2.3.3 2018-03-17 19:31:00 +01:00
jp9000 cec6168fd2 libobs: Update version to 21.1.0 2018-03-17 11:23:15 -07:00
Kurt Kartaltepe 3293282dcf deps/obs-scripting: Add obs_source_enum_filters 2018-03-17 12:11:22 -05:00
Jimi Huotari 4fd06b9825 frontend-tools: Include 'QAction' to fix build against Qt 5.11 
Some headers are no longer unconditionally included, leading to
build failures.

http://code.qt.io/cgit/qt/qtbase.git/commit/?id=748836dae80a7d11901f3f0630168829076d11a8
http://code.qt.io/cgit/qt/qtbase.git/commit/?id=000c76ada5cc21479fc479be16a7507fed6490f8
http://code.qt.io/cgit/qt/qtbase.git/commit/?id=058474884c2505a8a00d4c59b4922bfcd3597c2f
 2018-03-17 18:38:27 +02:00
Ali Kaviani 643c35aa1b rtmp-services: Update ingest list for Aparat.com 2018-03-17 11:43:52 +03:30
jp9000 215589755c mac-capture: Fix bug where audio device couldn't be changed 
If the user selected the "default" device for audio capture on mac, it
would no longer be able to be switched to another device due to the
"default_device" variable being set.
 2018-03-16 21:13:40 -07:00