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

95 Commits (35e218e05bb49903c4cc87f439d78bab96b6ad4e)

Author SHA1 Message Date
Colin Edwards 55e2985026
Merge pull request #1944 from WizardCM/windows-rc-definition 
CMake: Build Windows modules with file descriptors
 2020-04-18 18:27:22 -05:00
Gol-D-Ace d74fc65047 Update translations from Crowdin 2020-03-16 20:14:50 +01:00
jp9000 b2302902a3 libobs: Fix source type versioning system 
(This also modifies image-source, obs-text, text-freetype2, and UI)

This improves source definition versioning.  To do this, it now stores
two identifier names.  One "unversioned" which is the original name, and
one "versioned" with the version number appended.

This fixes both backward compatibility with older OBS versions, and
fixes the inability to use "add existing" in OBS itself on sources
created from older version definitions.
 2020-03-09 06:12:22 -07:00
Clayton Groeneveld fa9dccb7be frontend-plugins: Refactor Decklink out UI 2020-02-26 23:06:20 -06:00
Clayton Groeneveld 44bb7e690b obs-scripting: Update text source IDs 2020-02-21 22:54:34 -06:00
jpark37 263bf48baa UI: Fix Qt 5.14 deprecation warnings 
These functions should be available on current Qt.
 2020-01-20 22:13:16 -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
Devin Neal 7e25b0dc1e UI: Fallback to XGetWMName if XFetchName fails 2019-10-27 14:39:58 -07:00
Matt Gajownik 51be039cf8 CMake: Build Windows modules with file descriptors 2019-10-15 21:34:12 +11:00
Exeldro a833d6bb9a frontend-tools: output timer tab stop order 2019-09-25 22:25:30 +02:00
Gol-D-Ace 03b5be75e4 Update translations from Crowdin 2019-09-17 23:21:00 +02:00
Clayton Groeneveld 5f7f2c1c97 UI: Fix compiler/Acri warnings 2019-08-15 03:00:06 -05:00
Clayton Groeneveld bbaad30be6 obs-scripting: Add pause scene script 2019-08-04 06:21:22 -05:00
Clayton Groeneveld 42c6984771 frontend-tools: Make start/stop buttons checkable 2019-07-18 07:07:34 -05:00
Clayton Groeneveld 64598732a6 frontend-tools: Add option to pause output timer when rec is paused 2019-07-17 00:02:15 -05:00
jp9000 f53df7da64 clang-format: Apply formatting 
Code submissions have continually suffered from formatting
inconsistencies that constantly have to be addressed.  Using
clang-format simplifies this by making code formatting more consistent,
and allows automation of the code formatting so that maintainers can
focus more on the code itself instead of code formatting.
 2019-06-23 23:49:10 -07:00
Gol-D-Ace 973bc481ce Update translations from Crowdin 2019-06-11 01:42:42 +02:00
jp9000 72ccefff5f UI: Rename UI files for consistency 
Changes comboBox-* and spinBox-* files to lowercase to be more
consistent with the rest of the files in the UI directory.
 2019-04-21 04:10:46 -07:00
jp9000 d2b107bc9d decklink-output-ui: Fix memory leak 2019-04-20 01:43:01 -07:00
Colin Edwards 6d07885b08 Decklink: inital preview out work 2019-04-17 21:21:39 -05:00
Jim 88391b818d
Merge pull request #1811 from akapar2016/UI_scrollWheelEvents 
Ui scroll wheel events
 2019-04-14 13:58:54 -07: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 a0ead6f974
Merge pull request #1800 from cg2121/add-pragma-once 
UI, libobs, text-freetype2: Add missing pragma once in header files
 2019-04-06 23:40:43 -07:00
Gol-D-Ace e78ac5ebef Update translations from Crowdin 2019-04-04 16:19:51 +02:00
Clayton Groeneveld d1be93ae69 UI, libobs, text-freetype2: Add missing pragma once in header files 2019-04-01 02:48:28 -05:00
VodBox 9968772028 frontend-tools: Fix memory leak when reloading scripts 2019-03-03 21:45:37 +13:00
Gol-D-Ace 98f78fe3a7 Update translations from Crowdin 2019-02-25 15:11:33 +01:00
Gol-D-Ace c3711bdd5e Update translations from Crowdin 2019-02-20 22:26:07 +01:00
Richard Stanway 0d8fa3fbb1 frontend-tools: Remove unused help icon 2019-02-14 22:19:07 +01:00
Colin Edwards 22f856bb7d decklink-output-ui: Add note about keyer output 2019-02-13 00:23:05 -06:00
Richard Stanway 3d27e7c2c9 decklink-ouput-ui: Remove unused help icon 2019-02-12 12:58:28 +01:00
Richard Stanway 917318d8e8 frontend-tools: Remove unused help icons 2019-02-12 12:57:18 +01:00
Colin Edwards c8b58d8749 decklink-output-ui: Fix memory leak in save settings 2019-02-11 19:33:41 -06:00
Colin Edwards 1af8789ce0 decklink-output-ui: Fix memory leak 
Closes obsproject/obs-studio#1656
 2019-02-10 18:16:10 -08:00
Jim e60023daf5
Merge pull request #1502 from DDRBoxman/decklinkoutui 
Decklink: Add UI to control output
 2019-02-07 22:12:54 -08:00
VodBox 86ce0e9652 frontend-tools: Call modified prop callbacks on script load/reload 
This change means that the modified callback for a scripts properties is
always called when first loaded or on a reload. This behavior matches
the properties view for sources, where all modified callbacks are called
when the window opens. This change therefore treats reloading as
equivalent to reopening.
 2019-02-04 19:49:34 +13:00
Colin Edwards 22fdda311d Decklink: add UI to control output 2018-10-23 18:57:17 -05:00
Dmitry-Me 5b92cee48f UI: Fix array length computation 2018-09-18 16:27:23 +03:00
jp9000 7bbdace1a9 frontend-tools: Increase instant replay playback retry interval 2018-09-15 12:05:45 -07:00
Exeldro 79ff554f90 frontend-tools: Add VLC support to instant replay script 
Add support for using the VLC source to play instant replays.

Closes obsproject/obs-studio#1334
 2018-09-15 12:04:25 -07:00
Gol-D-Ace a79aaa28ab Update translations from Crowdin 2018-08-18 04:16:35 +02:00
Ryan Foster 2129d12143 frontend-tools: Add QAction explicitly for Qt 5.11 compatibility 2018-07-25 11:59:58 -04:00
Shaolin c7c328dc83 UI: Add Vertical Mixer option 2018-05-19 00:17:58 -03: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
Gol-D-Ace 88282c168c Update translations from Crowdin 2018-03-15 09:00:28 +01:00
jp9000 a2ae16e98c deps/obs-scripting: Allow NULL script with script_log 
(This commit also modifies the frontend-tools module)

Prevents a potential crash when script_log is called by a thread spawned
by a python library.
 2018-01-31 16:20:45 -08: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
Gol-D-Ace ae22886f67 Update translations from Crowdin 2018-01-22 04:55:52 +01: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