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

6650 Commits (4b6a1bf9712ed75eb06261d6b44914e5155ccb3d)

Author SHA1 Message Date
Jim e16bd94965
Merge pull request #1837 from akapar2016/UI_VolumeWheelEvents 
UI: Volume scrollEvents
 2019-04-19 07:26:06 -07:00
akapar dbd30a8131 UI: Do not allow mouse wheel for volume slider 
This commit fixes the issue of being able to scroll through the mixer
with the mouse wheel without modifying the volume slider.  This
functionality can be temporarily restored by holding a click on the
volume meter.
 2019-04-19 06:56:55 -07:00
James Park e01fcae133 libobs: UI: Fix rotated line scale 
The line drawing functions previously assumed the upper-left 3x3 for
box_transform only held scale. The matrix can also hold rotation, so
pass in scale separately.

Fixes https://obsproject.com/mantis/view.php?id=1442
 2019-04-19 06:35:42 -07:00
Richard Stanway ca5a19cf66 obs-ffmpeg: Add logging of last error for passing to UI 2019-04-19 05:45:38 -07:00
Richard Stanway f52d8bddcc libobs: Allow Win32 pipes to pass STDERR for logging of errors 2019-04-19 05:45:38 -07:00
Richard Stanway 90df9ea290 UI: Update error message severity levels and show additional info 2019-04-19 05:45:19 -07:00
Richard Stanway 4be88c7f2a UI: Add warning / critical QMessageBox wrappers 2019-04-19 05:45:19 -07:00
Jim 42e76f6c34
Merge pull request #1577 from DDRBoxman/previewout 
Decklink: preview out support
 2019-04-19 04:03:34 -07:00
Gol-D-Ace 3a01fefe1e Use proper capitalization for string 
Windows is a product name in this case.
 2019-04-19 05:38:21 +02:00
Jim c27a8e7ae9
Merge pull request #1664 from Xaymar/feature-property-groups 
libobs/UI: Add Property Grouping
 2019-04-18 07:22:15 -07:00
Michael Fabian 'Xaymar' Dirks 5c0c512fc2 UI: Add support for property groups 
Property groups are implemented in the UI using QGroupBox, which support
both the normal and checkable version of them.
 2019-04-18 06:37:54 -07:00
Michael Fabian 'Xaymar' Dirks 6b6ea575ff libobs: Add property groups 
Property groups allow multiple properties to be combined into a single
visual group and thus can be used to reduce visual clutter and improve
user experience by giving additional context to a property. The name of
a child of a group is not affected by the group and thus all property
names must still be unique.

A new parent field has been added to obs_properties_t to ease the
tracking of existing properties. That way properties inside a group will
also be able to verify that they have a unique name.
 2019-04-18 06:37:36 -07:00
Colin Edwards 6d07885b08 Decklink: inital preview out work 2019-04-17 21:21:39 -05:00
Jim 75d62a8d86
Merge pull request #1623 from SuslikV/patch-11 
UI: Correct custom property implementation
 2019-04-17 08:28:48 -07:00
SuslikV 8a22889e3d UI: Use theme colors setting for Projectors too 
Don't override the theme color settings for the Projector.
If required, the background color of the projector can be changed via

OBSProjector {qproperty-...}

record placed after "OBSQTDisplay {qproperty-...}" section in the theme
file (qss).
 2019-04-17 07:10:12 -07:00
SuslikV e2be33956b UI: Correct custom property implementation 
- Fixes Q_PROPERTY macro syntax
- Removes excessive notification declaration and slot
- Removes unneeded dynamic property
- Improves Themes versatility
 2019-04-17 07:10:12 -07:00
Jim 4dc1c2a7f9
Merge pull request #1833 from dwot/master 
vlc-video: Enable subtitle track selection
 2019-04-17 06:46:12 -07:00
dwot 8c7dbf69f2 vlc-video: Enable subtitle track selection 2019-04-17 06:45:33 -07:00
SuslikV 975431a7c7 UI: Add default color for the preview background 
If custom theme for obs UI has no record about background custom
property in the qss file, then application can set random color per
display initialization. This fixes this issue.
 2019-04-17 06:32:27 -07:00
Jimi Huotari 2b1641ee5e
UI: Fix Linux build without PulseAudio 
Commit 31d36691 missed updating a couple of lines while moving
settings around.

- https://github.com/obsproject/obs-studio/commit/31d36691
 2019-04-15 18:31:59 +03:00
Jim ebb8d6bc28
Merge pull request #1767 from ratwithashotgun/caption-pr1 
deps/obs-scripting: Expose obs_output_output_caption_text1 to scripts
 2019-04-15 03:30:30 -07:00
Clayton Groeneveld 171f811669 UI: Estimate recording time left until disk is full 2019-04-14 22:45:31 -05:00
Jim 49d178d593
Merge pull request #1830 from jpark37/bilinear-lowres-gl-fix 
libobs: Fix shader for GLSL
 2019-04-14 19:16:34 -07:00
James Park f66625bf1e libobs: Fix shader for GLSL 
vec4 to vec3 truncation fix.
 2019-04-14 14:15:48 -07:00
Jim 88391b818d
Merge pull request #1811 from akapar2016/UI_scrollWheelEvents 
Ui scroll wheel events
 2019-04-14 13:58:54 -07:00
Colin Edwards 7dacd58aab
Merge pull request #1795 from cg2121/f-keys-linux 
libobs: Add support for F25-F35 hotkeys on Linux
 2019-04-14 10:48:46 -07:00
Jim 88d439b587
Merge pull request #1754 from Xaymar/feature-remove-properties 
libobs: Add function to remove properties
 2019-04-14 05:15:10 -07:00
Jim 10e72fcc2a
Merge pull request #1752 from pkviet/vlc 
vlc-video: Enable audio track selection
 2019-04-14 05:13:47 -07:00
Jim f121aa5a2d
Merge pull request #1743 from eszlari/xdg-data 
UI: Add Linux AppStream metadata
 2019-04-14 05:11:50 -07:00
Peter Eszlari 6b9da9b912 UI: Add Linux AppStream metadata 2019-04-14 05:10:10 -07:00
Jim 3a05466baf
Merge pull request #1760 from Vainock/master 
Improve locales
 2019-04-14 05:00:31 -07:00
Jim f6a24d9b83
Merge pull request #1716 from cg2121/toggle-preview-hotkey 
UI: Add hotkey to toggle preview
 2019-04-14 04:56:02 -07:00
Clayton Groeneveld e89283d172 UI: Add hotkey to toggle preview 2019-04-14 04:51:34 -07:00
Jim 397f3733cf
Merge pull request #1685 from DDRBoxman/luma 
obs-filters: Add luma key filter
 2019-04-14 04:24:16 -07:00
Jim 9480cc4fd2
Merge pull request #1675 from admshao/clear-linux-compiling-warnings 
Clear linux compiling warnings
 2019-04-14 04:21:21 -07:00
Jim 827f45acfd
Merge pull request #1672 from derrod/captions-no-throttling 
libobs: Add minimum display duration to caption data
 2019-04-14 04:19:07 -07:00
Jim e7b25a9870
Merge pull request #1667 from grimmy/xshm-xrandr-support 
linux-capture: Add randr support
 2019-04-14 04:15:29 -07:00
Jim d14fa715e8
Merge pull request #1641 from WizardCM/move-settings 
UI: Refactor Audio Settings UI and move Monitoring Device from Advanced
 2019-04-14 04:10:15 -07:00
Jim e5aa51afe4
Merge pull request #1599 from geemion/master 
win-capture/graphics-hook: Fix try_lock_shmem_tex mutex  deadlock bug
 2019-04-14 03:48:57 -07:00
geemion f6581952bc win-capture/graphics-hook: Check if mutex abandoned 
It's possible that the mutexes used with shared memory capture to return
WAIT_ABANDONED if OBS is shut down abnormally while the mutex is locked.
 2019-04-14 03:44:48 -07:00
Jim b2bc1e159b
Merge pull request #1589 from caffeinetv/minor-improvements 
Minor improvements
 2019-04-14 03:43:05 -07:00
Jim 30e90c3030
Merge pull request #1573 from DragoonAethis/master 
obs-ffmpeg: Bind network buffer size in the UI
 2019-04-14 02:51:14 -07:00
Jim f1399b6d18
Merge pull request #1765 from jpark37/blend-alpha 
libobs: libobs-d3d11: Fix blend alpha overflow
 2019-04-14 00:22:20 -07:00
Colin Edwards efb09d4f24 UI: Remove SourceListWidget 2019-04-13 14:07:17 -05:00
akapar 9249403c96 UI: Ignore wheelEvent for properties 
Ignore wheelEvent using subclass
slider,spinbox,combobox with eventhandlers:
wheelEvent - ignore if widget is not focused,
leaveEvent - clear focus when mouse leaves event.

Use these new subclass widgets in properties
to ignore wheelEvent when scrolling.
 2019-04-13 12:09:11 -04:00
Jim 975aed836c
Merge pull request #1755 from Xaymar/patch-generate-obs-rc 
obs-studio: Create obs.rc out-of-tree using the build path
 2019-04-13 04:14:05 -07:00
Jim c68f847562
Merge pull request #1821 from cg2121/multiview-cursor 
UI: Don't hide cursor over multiview
 2019-04-13 03:46:27 -07:00
Jim 6457301294
Merge pull request #1820 from lorskun/onlyfans 
rtmp-services: added OnlyFans.com streaming service
 2019-04-13 03:44:47 -07:00
lorskun f6f780acd2 rtmp-services: Add OnlyFans streaming service 2019-04-13 03:43:11 -07:00
Jim 23ed5ea7b4
Merge pull request #1816 from SCG82/patch-1 
UI: Fix size of output icon
 2019-04-13 03:40:12 -07:00