jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,644 Commits 1 Branch 0 Tags
Commit Graph

6644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clayton Groeneveld
659b58c8f3 UI: Fix file browser showing up when dir selected 
Fixes: https://obsproject.com/mantis/view.php?id=1418
 2019-03-31 06:36:13 -05:00
Clayton Groeneveld
e321005b02 UI: Fix issue where space/esc hotkeys would be blank 
This also modifies libobs.

This only happened on Linux.

Fixes https://obsproject.com/mantis/view.php?id=1018
 2019-03-31 05:10:02 -05:00
Clayton Groeneveld
9930b294b9 libobs: Add support for F25-F35 hotkeys on Linux 
Fixes https://obsproject.com/mantis/view.php?id=1257
 2019-03-31 03:41:16 -05:00
Matt Gajownik
ef9af0ee08 UI: Hide border for Output Settings container 2019-03-31 17:37:44 +11:00
Matt Gajownik
21aa9d1020 UI: Hide border for General Settings container 
This makes the screen consistent with Advanced and Audio
 2019-03-31 17:37:43 +11:00
Matt Gajownik
31d3669154 UI: Refactor Audio Settings tab structure 
- Now uses a QVBoxLayout with a QScrollArea for the container
- Uses QGroupBox for each section
- Moved Monitoring and ducking settings out of the Advanced tab
- Push-to hotkeys are no longer in a child scroll area
- Renamed device labels for consistency
 2019-03-31 17:37:36 +11:00
Clayton Groeneveld
cc1f239420 UI: Fix crash when using ctrl-c in Linux terminal 
This fixes a seg fault that would happen when launching OBS from the
terminal and then hitting ctrl-c.
 2019-03-31 00:59:51 -05:00
Matt Gajownik
69bbbe342a UI: Allow smaller Restream docks 2019-03-30 20:28:22 +11:00
Shaolin
54f4e2589a plugins: Clear all compiler warnings 2019-03-29 06:29:09 -03:00
Shaolin
721302bf00 libobs: Clear all compiler warnings 2019-03-29 06:29:04 -03:00
Shaolin
5d3c6428f7 UI: Fix Q_PROPERTY compiling warnings 2019-03-29 06:22:14 -03:00
Shaolin
64d0da1533 libobs-opengl: Clear some conversion and uncaught switch cases warnings 2019-03-29 06:22:14 -03:00
jp9000
d18c62b2b5 libobs, image-source: Fix ABI break in image_file_t structure 
In commit a776a6cf071, the image_file_t structure (which is a public
structure) had a member variable added to it, which broke ABI.
 2019-03-28 22:30:20 -07:00
jp9000
eb672d7725 UI: Fix act. feed version hide check to <= 23.0.2 2019-03-28 16:45:24 -07:00
jp9000
b1f04a47cf libobs: Change internal version to 23.0.3 (temporarily) 
While performing a release candidate, it is important to use an actual
version before the actual release candidate version so that the
auto-updater will know to update to 23.1.0
 2019-03-28 16:44:07 -07:00
jp9000
5d83e1aec4 obs-ffmpeg: Show encoder name when logging jim-nvenc 2019-03-28 16:38:14 -07:00
jp9000
81354a9903 UI: Hide act. feed by default if prev ver below 23.1 2019-03-28 16:38:14 -07:00
Jim
a4f602b15a
Merge pull request #1784 from cg2121/remove-help-icon 
UI: Remove help icon from source select dialog
 2019-03-28 02:28:46 -07:00
Clayton Groeneveld
c1eefdca68 UI: Remove help icon from source select dialog 
Fixes https://obsproject.com/mantis/view.php?id=1394
 2019-03-28 03:55:25 -05:00
Clayton Groeneveld
46c5780a77 image-source: Set default size of color source to canvas size 2019-03-27 22:00:33 -05:00
jp9000
29a1a97392 UI: Don't open settings or close in event subloop 
Fixes a crash that can happen if you try to use the settings window
while in an even subloop, or if you try to close OBS while in an event
subloop.  Continually retries (defers) the actions every one second
until the subloop has finished.
 2019-03-26 22:05:52 -07:00
jp9000
11c0d6e976 libobs: Update version to 23.1.0 2019-03-26 22:05:52 -07:00
Gol-D-Ace
2283e6742a CI: Add Restream secrets for AppVeyor 2019-03-27 02:23:23 +01:00
Jim
7066055cf3
Merge pull request #1761 from jpark37/gl-fixes 
libobs: Fix invalid max_anisotropy value
 2019-03-26 14:14:06 -07:00
Jim
faa2ba3617
Merge pull request #1776 from jpark37/unused-function 
obs-filters: Remove unused function in shader
 2019-03-26 14:08:02 -07:00
Jim
754c4d66c8
Merge pull request #1772 from jpark37/area-filter-glsl-fix 
libobs: Fix Area scale filter for GLSL
 2019-03-26 14:07:39 -07:00
Jim
02dad0b858
Merge pull request #1779 from jpark37/sharpness-cleanup 
libobs: Remove dead code in sharpness effect
 2019-03-26 14:06:41 -07:00
jp9000
c18aab29ee obs-ffmpeg: Fix blacklisted adapter check 
The quadro P5000 would incorrectly be considered blacklisted because it
used a string search for the P500, which is an earlier quadro variant
that does not have NVENC support.

To fix this, instead of just doing a string search, additionally check
to make sure that there preceding or trailing numbers on the adapter
name.
 2019-03-26 03:00:00 -07:00
SoftArch
de66aeab68 UI: Add Restream integration 
Closes obsproject/obs-studio#1768
 2019-03-25 19:13:27 -07:00
Richard Stanway
0bf09160e5 win-dshow: Update libdshowcapture for crash fix 2019-03-25 17:16:21 +01:00
James Park
36201d9b67 libobs: Remove dead code in sharpness effect 
Not sure why, but there's a dead uniform and interpolant in the
sharpness effect. This change removes them.
 2019-03-25 08:38:45 -07:00
James Park
f046177c4f obs-filters: Remove unused function in shader 
SampleYUVToRGB() is no longer used after the previous DrawMatrix purge.
 2019-03-23 18:31:38 -07:00
James Park
746820e35a libobs: Fix Area scale filter for GLSL 
Remove const qualifiers because they are syntax errors for GLSL when
used like in C.
 2019-03-23 13:16:50 -07:00
Gol-D-Ace
a81b7a3e58 CI: Don't build service integration in PRs&Forks 
Without this, Fork and PR builds will fail.
 2019-03-23 19:24:04 +01:00
Gol-D-Ace
3e78e05c6e CI: Build service integration on Azure Pipelines 2019-03-23 14:35:29 +01:00
jp9000
3a288e95f4 obs-browser: Make DispatchJSEvent asynchronous 2019-03-22 05:29:08 -07:00
jp9000
70b8f0aa65 libobs: Fix ABI break 
OBS_EFFECT_AREA from 7d811499e was inserted in the middle of the enum,
which breaks ABI for any binaries that use
OBS_EFFECT_PREMULTIPLIED_ALPHA or OBS_EFFECT_BILINEAR_LOWRES.
 2019-03-22 03:46:42 -07:00
Rat
cb3054ae6e CI: Build caption output support on OSX by default 
Enable caption building by default on OSX to make captions usable
on OSX via scripting API.
 2019-03-21 07:46:12 +01:00
Rat
eebb8f6597 deps/obs-scripting: Expose obs_output_output_caption_text1 to scripts 
Make obs_output_output_caption_text1 usable via scripting if captions
are enabled to make adding additional caption sources easier.
 2019-03-21 07:44:44 +01:00
Jim
233c4a85d2
Merge pull request #1751 from cg2121/fix-repeating-images 
image-source: Re-add fix of repeating images
 2019-03-20 19:13:22 -07:00
Vainock
d38f45ba2d Improve locales 2019-03-20 21:50:35 +01:00
Colin Edwards
609c7dfa2a obs-filters: Add luma key filter 2019-03-20 11:37:38 -05:00
Jim
5b4a965fd7
Merge pull request #1762 from Dmitry-Me/fixOutputSpecifiers 
libobs: Fix output type specifiers
 2019-03-20 02:43:36 -07:00
Jim
a0ea389789
Merge pull request #1764 from Gol-D-Ace/remove_and_ignore_obs.rc 
UI: Remove and ignore obs.rc
 2019-03-19 19:23:17 -07:00
Gol-D-Ace
6dfb0caab3 UI: Remove and ignore obs.rc 
This file gets automatically generated from obs.rc.in by CMake and
could get accidentally committed.
 2019-03-20 02:41:38 +01:00
Colin Edwards
2faa015c92
Merge pull request #1753 from Xaymar/patch-obs_property_float_set_limits 
libobs: Fix obs_property_float_set_limits
 2019-03-19 19:43:58 -05:00
Colin Edwards
55c1b5bd7b
Merge pull request #1736 from cg2121/icons-from-theme 
UI: Use icons from theme on Linux
 2019-03-19 19:25:42 -05:00
James Park
5fe128a047 libobs-opengl: Fix bad log string 2019-03-19 09:17:15 -07:00
Dmitry-Me
eea71e5e7f libobs: Fix output type specifiers 2019-03-19 18:29:09 +03:00
James Park
cb67192077 libobs: Fix invalid max_anisotropy value 
max_anisotropy is initialized to zero, but the minimum value is 1.
 2019-03-19 01:26:28 -07:00