mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code
5,611 Commits 16 Branches 211 Tags 169 MiB
a8517f3698
Commit Graph

5611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Edwards
3040ff6347 CI: Don't install python for OSX 2018-01-30 23:25:35 -06:00
Ben Krueger
f374810403 cmake: Fix LuaJIT search 2018-01-30 21:13:10 -08:00
Colin Edwards
285d9bd6f1 CI: Add rpath info to _obspython 2018-01-30 18:15:44 -06:00
Colin Edwards
4e6bbb984f CI: Move obspython.so so it can be found in a .app 2018-01-29 18:59:36 -06:00
Colin Edwards
3ea5e99d0f CI: Update python rpath on osx 2018-01-29 18:12:32 -06:00
Colin Edwards
d2c85a44f3 CI: Make sure that lua can find obslua 2018-01-29 17:43:19 -06:00
Jim
ac6b01897f
Merge pull request #1175 from DDRBoxman/osxscriptfix 
CI: Fetch RVM gpg key on osx
 2018-01-28 17:55:49 -08:00
Colin Edwards
1b9e49dfe3 CI: Fetch RVM gpg key on osx 2018-01-28 19:52:35 -06:00
Jim
4a71f3ad5c
Merge pull request #1174 from DDRBoxman/osxscriptfix 
CI: Fix a ruby issue on travis OSX
 2018-01-28 17:48:33 -08:00
Colin Edwards
060edff177 CI: Fix a ruby issue on travis OSX 2018-01-28 19:47:01 -06:00
Jim
94b3c7c12a
Merge pull request #1173 from DDRBoxman/osxscriptfix 
CI: Update OSX deps build scripts
 2018-01-28 17:32:10 -08:00
Colin Edwards
e2005044dd CI: Update OSX deps build scripts 2018-01-28 19:04:46 -06:00
Robin Hielscher
a7bb82acdb UI: Allow nested docks 
This change enables the ability to use nested docks, with the dependency of Qt5.10 or later being used to build OBS. 

Similar to the Lock UI option we could add a toggle to the menu. Not sure if this is necessary, maybe you guys have some ideas.

Example screenshots of nesting OBS:
http://img.jack0r.com/Share/obs64_2018-01-29_01-03-34.png
http://img.jack0r.com/Share/obs64_2018-01-29_00-10-24.png
 2018-01-29 01:12:59 +01:00
Jim
6ed5599504
Merge pull request #1170 from DDRBoxman/osxscriptfix 
CI: Point to newer brew python
 2018-01-25 10:32:53 -08:00
jp9000
8733228126 libobs: Update version to 21.0.2 (mac tag) 2018-01-25 10:29:54 -08:00
Colin Edwards
65e8bb04e8 CI: Point to newer brew python 2018-01-24 10:28:37 -06:00
jp9000
dce311cf1a deps/obs-scripting: Make ENABLE_SCRIPTING a user variable 
Makes it so that the scripting cmake variable ENABLE_SCRIPTING is a user
variable rather than a global internal cmake variable, and defers the
internal global cmake variable to SCRIPTING_ENABLED instead.
 2018-01-23 20:57:48 -08:00
jp9000
4eb5be4903 obs-filters: Fix hard cross-lock when using ducking 2018-01-22 16:44:22 -08:00
jp9000
bd30a0874d win-dshow: Fix decoding issues from encoded devices 2018-01-22 14:41:00 -08:00
Warchamp7
0029bce7ae UI: Acri theme adjustments 
Fixing a reference to Rachni theme folder, some minor tweaks and
reverting volume meter foreground colors to original brightness.

Closes jp9000/obs-studio#1169
 2018-01-22 14:21:15 -08:00
jp9000
682c89bb33 libobs: Update version to 21.0.1 2018-01-22 13:55:54 -08:00
jp9000
84557629d8 docs/sphinx: Clarify Python windows installation 2018-01-22 09:32:29 -08:00
Jim
e0c8decb2b
Merge pull request #1168 from DDRBoxman/osxscriptfix 
CI: Install swig and luajit for osx travis
 2018-01-22 08:48:29 -08:00
Colin Edwards
d810e3dbfb CI: Install swig and luajit for osx travis 2018-01-22 10:34:43 -06:00
jp9000
c5b58211da deps/obs-scripting: Prevent potential python startup issues 
Prevents Python from automatically trying to load from PATH on startup
on windows.  The user should set their Python 3 path themselves.
 2018-01-22 07:33:17 -08:00
jp9000
cee790a5c6 enc-amf: Prevent detect-amf from showing fail dialogs 
Prevents the user when detect-amf piped program crashes due to driver
crash.
 2018-01-22 07:29:55 -08:00
jp9000
ee563f874f UI: Reduce size of "refresh" icons 2018-01-22 07:29:50 -08:00
Jim
2f10a4cbd2
Merge pull request #1167 from Palakis/multiview-font-fix 
UI: fix Multiview labels readability
 2018-01-22 05:46:15 -08:00
jp9000
cb47c61e42 Revert "obs-outputs: Fix FMS auth with query string" 
This reverts commit 5cf11d6726.
 2018-01-22 05:40:26 -08:00
Palakis
632596bb6b UI: fix Multiview labels readability 2018-01-22 14:00:41 +01:00
Gol-D-Ace
ae22886f67 Update translations from Crowdin 2018-01-22 04:55:52 +01:00
Shaolin
679a731964 UI: Don't draw bounding boxes for sources without video flag 
Audio Input or Output, for instance, don't have the OBS_SOURCE_VIDEO
output flag so there is no need to draw the compositing helper bounding
boxes.
 2018-01-22 00:41:09 -02:00
Jim
60e9e56253
Merge pull request #1160 from DDRBoxman/cefosx 
CI: Update CEF version on travis for osx
 2018-01-21 05:54:25 -08:00
Jim
4fed7115fa
Merge pull request #1161 from juvester/trusty-cmake-fix 
cmake: Search for Python 3.4
 2018-01-21 05:52:04 -08:00
juvester
7b6af4cc93 CI: Enable scripting in Linux builds 2018-01-21 14:41:06 +02:00
juvester
206c853d00 cmake: Search for Python 3.4 
Fixes an issue where Python libraries aren't found on Ubuntu 14.04
because CMake 2.8 only searches up to Python 3.3.
 2018-01-21 14:27:55 +02:00
Colin Edwards
d5877f7a03 CI: Update CEF version on travis for osx 2018-01-21 00:12:44 -06:00
jp9000
7abbd4d247 libobs: Update version to 21.0.0 2018-01-20 16:46:33 -08:00
jp9000
bd0983a89e UI: Add simple output mode encoder fallback 
Prevents simple output mode from getting stuck on an encoder that may
not be available suddenly for whatever reason (system device changes,
driver issues, etc).  If the encoder is no longer available, falls back
to x264 to ensure that the user can continue to use the program.
 2018-01-20 13:58:02 -08:00
jp9000
f09f94b8a8 frontend-plugins: Only show script file names in script dialog 
Showing the full directory path is sort of unnecessary and makes the
list look pretty unsightly.
 2018-01-20 13:58:02 -08:00
Jim
f1d5d60435
Merge pull request #1151 from VodBox/command-line-args 
UI: Add Command Line Arguments to log
 2018-01-20 11:32:15 -08:00
jp9000
d976bc94db enc-amf: Test for AMF support in separate process first 
Adjusts the enc-amf submodule remote to the jp9000 fork, which tests AMF
support in a separate process before attempting to initialize AMF
in-process.  Reduces the possibility of driver crashes caused by AMF
initialization.
 2018-01-20 11:20:24 -08:00
Jim
b183b49b5e
Merge pull request #1077 from Xaymar/plugins-enc-amf 
enc-amf: Version 2.3.1
 2018-01-20 10:50:25 -08:00
jp9000
6774bbdb83 obs-ffmpeg: Remove NVENC detection code for now 
The reason this code is being reverted/removed is because this code is a
risk to startup stability.  This check will be added again in the
future, however this code needs to be executed from a secondary piped
process instead of directly in the process to reduce risk of
driver/hardware issues impacting program startup.  The same needs to be
accomplished for the AMF plugin as well.
 2018-01-20 05:31:58 -08:00
VodBox
f6544dd802 UI: Add command line arguments to log 2018-01-20 15:12:57 +13:00
jp9000
f5c3af1bda obs-ffmpeg: Fix signed mismatch warning 2018-01-19 16:19:10 -08:00
Jim
77643cce1e
Merge pull request #1139 from takev/pulseaudio-surround-selection 
linux-pulseaudio: Surround speaker map
 2018-01-19 16:14:04 -08:00
jp9000
f956203764 frontend-tools: Fix a few issues with the clock source script 
Fix the image files not being freed, and remove the unused source
definition function 'update', which was additionally calling
image_source_load with the wrong number of parameters.
 2018-01-19 11:28:44 -08:00
jp9000
a95a8723fb frontend-tools: Add script to update text source from URL 
Adds a python example script which updates a text source to the text
retrieved from a specific URL that refreshes every specified interval.
 2018-01-19 11:17:38 -08:00
jp9000
3259269c99 deps/obs-scripting: Fix script_log in python to append newline 2018-01-19 11:10:45 -08:00