starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-25 17:02:22 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,913 Commits 20 Branches 254 Tags
032a8d09d10a4e4d890be1e01ab4c99bdbb62f32
Commit Graph
5913 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mhabedinpour 032a8d09d1 rtmp-services: Update Lahzenegar settings 2018-09-13 14:35:25 +04:30
Jim 179239b471 Merge pull request #1450 from WizardCM/dark-theme-updates 
UI: Dark theme padding and alignment fixes
 2018-09-13 01:09:50 -07:00
jp9000 b3ef46d986 cmake: Make static VC runtime libraries consistent 
Makes Visual C runtime libraries consistent across
Debug/MinSizeRel/Release/RelWithDebInfo, rather than just changing those
flags for RelWithDebInfo.  Also adds /Zl for statically linked
libraries.

Closes obsproject/obs-studio#1421
 2018-09-12 07:49:13 -07:00
Jim 118dbf9e67 Merge pull request #1481 from Andersama/patch-26 
libobs: Export image-file to c
 2018-09-12 02:05:26 -07:00
Jim e615dffce5 Merge pull request #1323 from Andersama/effect-annotation-parsing 
libobs: Add HLSL annotation parsing
 2018-09-12 01:16:21 -07:00
Alex Anderson b30c843622 libobs: Export image-file to c 
Wraps image-file.h in extern "C" like rest of libobs api.

Prevents unresolved external errors when using in c++.
 2018-09-11 13:31:45 -07:00
jp9000 2c0f65c3ea obs-browser: Fix local macOS build issues 
(This also modifies the CI scripts accordingly)

It was difficult to build local obs-browser builds on macOS due to the
way the frameworks work and libraries are linked.  This solves that
issue so that local builds of obs-browser should always work fine.
 2018-09-11 01:29:13 -07:00
Jim 6c42d07751 Merge pull request #1461 from cg2121/preview-bgcolor 
UI: Add ability to style preview background color
 2018-09-10 03:52:13 -07:00
cg2121 0ae8a7c0ac UI: Add ability to style preview background color 2018-09-10 04:55:15 -05:00
Matt Gajownik 643b2538d7 UI: Dark theme padding and alignment fixes 2018-09-10 19:03:14 +10:00
Jim 8e53932afd Merge pull request #1406 from VodBox/hotkey-search 
UI: Add Search to Hotkeys settings menu
 2018-09-10 01:08:38 -07:00
Jim c69588f286 Merge pull request #1475 from admshao/cmake-scripting-issue 
cmake: Fix an error when SWIG isn't found
 2018-09-10 01:05:04 -07:00
Jim a8f373fa9b Merge pull request #1476 from RytoEX/fix-readme-rst 
Fix README RST
 2018-09-10 01:03:35 -07:00
VodBox 22f6d3fea5 UI: Add Filter to Hotkeys settings menu 
This commit adds a filter bar to the top of the hotkeys settings menu,
with it set to look for matches anywhere in the string label for that
hotkey.
 2018-09-10 09:31:04 +12:00
Ryan Foster 956d684c19 Fix README hyperlinks under Credits 
Change README hyperlinks from Markdown style to RST style. Make URLs
HTTPS. Correct some grammar.
 2018-09-09 02:31:36 -04:00
Shaolin 1b13e12065 cmake: Fix an error when SWIG isn't found 
obs-scripting CMakeList.txt expects SWIG, Python3 or Luajit to enable
scripting so in case of not finding just return and don't abort
the configuration
 2018-09-09 01:58:11 -03:00
Jim b5f2f4d05f Merge pull request #1474 from cg2121/about-no-resize 
UI: Set about dialog as non-resizable
 2018-09-08 13:39:11 -07:00
cg2121 79aaa32ba2 UI: Set about dialog as non-resizable 2018-09-08 13:28:56 -05:00
Alex Anderson 12f925401f docs/sphinx: Add annotation api functions 
Add documentation for:

size_t gs_param_get_num_annotations(const gs_eparam_t *param)

gs_eparam_t *gs_param_get_annotation_by_idx(const gs_eparam_t *param,
		size_t annotation);

gs_eparam_t *gs_param_get_annotation_by_name(const gs_eparam_t *param,
		const char *name);

void *gs_effect_get_val(gs_eparam_t *param);

void *gs_effect_get_default_val(gs_eparam_t *param);

size_t gs_effect_get_val_size(gs_eparam_t *param);

size_t gs_effect_get_default_val_size(gs_eparam_t *param);
 2018-09-08 05:22:12 -07:00
Alex Anderson e0cd45be9b libobs: Add additional gs_effect_get_ functions 
Adds api functions to extract gs_eparam_t values, including
gs_effect_get_val(), gs_effect_get_val_size(),
gs_effect_get_default_val() and gs_effect_get_default_val_size()
 2018-09-08 05:22:12 -07:00
Alex Anderson af67086912 libobs: Add HLSL annotation parsing 
Gives the ability to retrieve param annotations. Blocks wrapped in <>
following a parameter.

For example:
float slider < float max_value = 10.0; float min_value = 0.0; >;

These blocks are not for shading purposes but to help describe the
shader's gui as in the example above.

Adds graphics api functions for retrieving annotations:
size_t gs_param_get_num_annotations(const gs_eparam_t *param);

gs_eparam_t *gs_param_get_annotation_by_idx(const gs_eparam_t *param,
		size_t annotation);

gs_eparam_t *gs_param_get_annotation_by_name(const gs_eparam_t *param,
		const char *name);
 2018-09-08 05:22:12 -07:00
Jim 78d940e0f4 Merge pull request #1346 from dtcooper/master 
libobs/UI: Allow Access To argc/argv
 2018-09-08 01:29:43 -07:00
Jim 413e8e6a7b Merge pull request #1442 from cg2121/stereo-audio-balancing 
UI: Implement stereo balancing
 2018-09-07 21:28:56 -07:00
Jim ef6a83666a Merge pull request #1392 from Andersama/decklink-deactivate-when-not-shown 
decklink: Add deactivate when not showing option to decklink
 2018-09-07 18:22:50 -07:00
Jim 461acd631c Merge pull request #1435 from cg2121/about-dialog 
UI: Add about dialog
 2018-09-07 18:18:54 -07:00
jp9000 e8eec22d15 libobs/util: Fix undefined behavior and optimize util_mul64_64 
Shifting an integer larger than its bit width can have undefined
behavior.  This not only fixes that issue, but also optimizes the
shift functions.
 2018-09-07 17:28:15 -07:00
cg2121 11f1442a3c UI: Add ability to reset sliders when double clicked 2018-09-07 09:27:20 -05:00
cg2121 a4a7deeed6 UI: Implement stereo balancing 2018-09-07 09:27:14 -05:00
cg2121 8882cfc484 UI: Remove license agreement dialog 2018-09-07 06:08:31 -05:00
cg2121 36b0ef5b7e UI: Add about dialog 2018-09-07 06:08:31 -05:00
jp9000 85d259e05c cmake: Make directory before copying file 
Fixes the install_obs_data_file cmake helper function to be more
consistent across operating systems.
 2018-09-07 03:41:36 -07:00
Alex Anderson a65b369716 decklink: Add deactivate when not showing option to decklink 
Adds a deactivate when not showing checkbox to decklink sources.
 2018-09-07 03:03:49 -07:00
Jim 06488a55ce Merge pull request #1416 from admshao/cleanup-macro-declaration 
Cleanup Compilation warnings
 2018-09-07 00:51:58 -07:00
jp9000 1ea4da3f98 cmake: Add install_obs_data_file function 
Allows copying an individual file (which may not be in the data dir) to
an specified install location.
 2018-09-07 00:20:14 -07:00
jp9000 10df54057e Update AUTHORS file 2018-09-07 00:04:02 -07:00
Shaolin b5ee8a9a5d UI: Prevent format-truncation compiler warning 
Variables path and dir with the same declared size triggers a compiler
warning about possible truncation. Although, depending on the path
where profiles are stored, its still possible to go beyong the declared
size and the path will be invalid. This will not trigger any
compilation warning and all invalid paths will be cought by the already
check in the os_glob function.
 2018-09-06 22:10:29 -03:00
Shaolin bf72435db8 obs-outputs: Fix unused variable compiler warning 
Some security layer libraries code path used by the rtmp output had a
not used variable and not used param on HMAC_finish macro that was
triggering warnings during compilation.
 2018-09-06 22:10:29 -03:00
Shaolin d500ef3bb5 obs-outputs: Make rtmp packet alloc code path clearer 
On 64bit systems, this check will always evaluate to false due to
SIZE_MAX type and triggers a compiler warning.

This both makes it clearer that its only needed on 32bit system and
clear the compiler warning.
 2018-09-06 22:10:24 -03:00
Jim 4e90b61210 Merge pull request #1364 from kkartaltepe/patch-5 
[win-capture] Modify log for sharedmem
 2018-09-05 23:59:03 -07:00
Jim 15577f8b5f Merge pull request #1363 from pkviet/img 
image-source: Add psd and *.* to file filter.
 2018-09-05 23:57:57 -07:00
Jim 3be5e414bc Merge pull request #1362 from Chiitoo/automagic 
cmake: Use less automagic during configure
 2018-09-05 23:57:07 -07:00
Jim f1b3fcee0d Merge pull request #1429 from SuslikV/patch-8 
UI: Use themeID for red message in settings view
 2018-09-05 21:59:26 -07:00
Jim e299946b41 Merge pull request #1454 from Andersama/dockable-stats 
UI: Make stats dockable
 2018-09-05 21:04:19 -07:00
Jim 22c8dba718 Merge pull request #1465 from admshao/vla-removal 
Add compiler checks to avoid VLA
 2018-09-05 15:54:34 -07:00
Jim 61c95101d3 Merge pull request #1470 from Dmitry-Me/removeAndProhibitCopy01 
win-ivcam: Remove and prohibit useless member functions
 2018-09-05 15:18:17 -07:00
Jim d5a144e7aa Merge pull request #1471 from admshao/always-on-top-projectors 
UI: Fix not all projectors using ProjectorAlwaysOnTop
 2018-09-05 15:17:24 -07:00
Shaolin f8dfa4cb70 UI: Fix not all projectors using ProjectorAlwaysOnTop 2018-09-04 23:29:37 -03:00
Dmitry-Me ecf508269d win-ivcam: Remove and prohibit useless member functions 2018-09-04 17:40:54 +03:00
Richard Stanway c5e1541cbe Merge pull request #1468 from Dmitry-Me/fixPrintfSpcifier01 
linux-jack: Fix snprintf format specifier
 2018-09-04 13:23:55 +02:00
Dmitry-Me 6455b39cde linux-jack: Fix snprintf format specifier 2018-09-04 11:10:46 +03:00