OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 23:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
5411 commits 15 branches 208 tags 172 MiB
Commit graph

5411 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Anderson 22520c222c UI: Disable paste filters unless a source is selected 
Fixes the paste filters right click option to behave like copy.

See: https://obsproject.com/mantis/view.php?id=1220
and #1261
 2018-04-22 12:39:31 -07:00
jp9000 30d967eafa obs-browser: Update to browser source refactor 2018-04-14 03:45:07 -07:00
jp9000 89a5235ac0 CI: Reduce travis output verbosity 
The log output of the travis CI for macOS is unreasonably large.  This
reduces the verbosity of the output and reduces the size of the build
logs significantly.
 2018-04-13 22:25:05 -07:00
jp9000 34c14829b6 UI: Defer startup OBSBasic::Load (macOS CEF workaround) 
Adds an alternative means of isolating the CEF initialization process
from Qt's initialization process.  This is an unpleasant hack, but is
far more preferable than isolating the entire browser plugin to a
separate process and overly complexifying the browser plugin to the
point to where no one wants to touch the plugin or contribute to it.
 2018-04-12 13:42:15 -07:00
Ilya M 439b9e4d15 UI: Add frontend API to defer saving 
Allows the ability to perform multiple actions that would normally save,
and defer the save until all of those actions are complete.

Closes obsproject/obs-studio#1231
 2018-04-06 17:34:10 -07:00
Jim 0dc9151dbd
Merge pull request #1247 from jumoog/master 
rtmp-services: Update recommended parameters for Nood.tv
 2018-03-31 15:36:14 -07:00
Kilian von Pflugk 531d4cd2a4 rtmp-services: Update recommended parameters for Nood.tv 2018-03-28 20:43:32 +02:00
Colin Edwards fa90926533 CI: change travis osx artifact repo name 2018-03-21 21:16:59 -05:00
Colin Edwards dbc120275c
Merge pull request #1244 from obsproject/osxci 
CI: Check out OSX branch of obs-browser
 2018-03-19 15:16:59 -05:00
Colin Edwards 92574a778d CI: Check out OSX branch of obs-browser 2018-03-19 14:42:24 -05:00
jp9000 a81de7fb61 cmake: Include windows style DLL when copying Qt files 2018-03-18 17:01:01 -07:00
Colin Edwards 483be6e57c obs-browser: Update submodule to latest version 2018-03-18 14:40:01 -05:00
jp9000 ceadde0838 UI/updater: Delete visual studio runtimes after execution 2018-03-18 11:12:14 -07:00
jp9000 a6c65cdbf3 deps/obs-scripting: Prevent python unload more than once 2018-03-18 00:57:15 -07:00
jp9000 a0cb1f256c obs-browser: Update submodule to latest version 2018-03-17 21:16:30 -07:00
Jim 6eae0b284e
Merge pull request #1236 from subzerobo/rtmp-services-aparat-com 
rtmp-services: Update ingest list for Aparat.com
 2018-03-17 17:07:51 -07:00
Jim 25e92e5d07
Merge pull request #1237 from kkartaltepe/fix-lua 
deps/obs-scripting: Add obs_source_enum_filters
 2018-03-17 17:07:12 -07:00
jp9000 0a6d5772d9 deps/obs-scripting: Don't allow unloading more than once 2018-03-17 16:52:14 -07:00
Jim 5eaf46f1cd
Merge pull request #1239 from Xaymar/plugin-enc-amf 
enc-amf: Version 2.3.3
 2018-03-17 15:37:07 -07:00
Michael Fabian 'Xaymar' Dirks 7f0576bac6 enc-amf: Version 2.3.3 2018-03-17 19:31:00 +01:00
jp9000 cec6168fd2 libobs: Update version to 21.1.0 2018-03-17 11:23:15 -07:00
Kurt Kartaltepe 3293282dcf deps/obs-scripting: Add obs_source_enum_filters 2018-03-17 12:11:22 -05:00
Ali Kaviani 643c35aa1b rtmp-services: Update ingest list for Aparat.com 2018-03-17 11:43:52 +03:30
jp9000 215589755c mac-capture: Fix bug where audio device couldn't be changed 
If the user selected the "default" device for audio capture on mac, it
would no longer be able to be switched to another device due to the
"default_device" variable being set.
 2018-03-16 21:13:40 -07:00
Jim 55e1865a73
Merge pull request #1183 from Xaymar/plugin-enc-amf 
enc-amf: Version 2.3.2
 2018-03-16 19:13:43 -07:00
jp9000 3b64610717 UI: Add Help -> Crash Reports submenu 
Adds the ability to upload crash reports, making it easier for users to
give us crash data.  This should be considered a temporarily solution,
as automated crash reporting should be the ideal solution as soon as
time permits.
 2018-03-16 16:27:49 -07:00
jp9000 341bd9bcec UI: Add subdir param to OBSBasic::UploadLog 
Allows the ability to get log files from other configuration
subdirectories (i.e. "%appdata%/obs-studio/crashes")
 2018-03-16 16:22:37 -07:00
jp9000 d55589ef09 UI: Specify whether crash/profiler/logs have prefix 
Adds a "has_prefix" parameter to delete_oldest_file and get_last_log in
order to determine whether the file has a prefix when parsing its
timestamp.  For example, crash logs are prefixed with "Crash", and thus
it was unable to get the timestamp because it couldn't parse the
filename correctly due to that fact.
 2018-03-16 16:17:56 -07:00
jp9000 27e3ea5b5f UI: Specify subdir/variable to save to for get_last_log 2018-03-16 16:15:44 -07:00
Kilian von Pflugk 66f3fa2f74 rtmp-services: Update ingest list for Nood.tv 
Closes obsproject/obs-studio#1211
 2018-03-15 19:02:41 -07:00
Jim 68a51b87e9
Merge pull request #1208 from Dead133/master 
rtmp-services: Update ingest list for Restream.io
 2018-03-15 18:05:30 -07:00
Jim 89c81933d4
Merge pull request #1219 from cg2121/linux-delete-checkforupdates 
UI: Remove check for updates on Linux
 2018-03-15 17:43:13 -07:00
Jim a960994ced
Merge pull request #1225 from admshao/refresh-projector-monitor-list 
Refresh projector display list
 2018-03-15 17:41:25 -07:00
Jim e75bb83318
Merge pull request #1224 from kkartaltepe/patch-3 
cmake: Remove extraneous checks
 2018-03-15 16:43:14 -07:00
Jim 47043b2566
Merge pull request #1220 from admshao/opengl-color-info 
Opengl color info
 2018-03-15 16:36:31 -07:00
Jim ff011db3e2
Merge pull request #1209 from VodBox/log-swap 
UI: Replace gist for log uploads
 2018-03-15 15:35:55 -07:00
VodBox 840f9b7d3c UI: Replace gist with hastebin for log uploads 2018-03-16 11:19:03 +13:00
jp9000 b7e2247de2 UI/updater: Return false on integrity check failure 2018-03-15 12:11:46 -07:00
jp9000 052f395ebf UI/updater: Don't update modules of opposite arch 
Saves a bit of bandwidth when the update module just updates binaries
for the specific architecture being updated.  Especially true when
libcef needs to be updated.
 2018-03-15 12:06:06 -07:00
jp9000 aab6b3f55f UI/updater: Add automatic check/install for VS2017 redist 
Allows users to seamlessly upgrade the version of OBS Studio to the
newer version which is built with VS2017 rather than VS2013.
 2018-03-15 12:04:02 -07:00
jp9000 06d1f2768e UI/updater: Fix a few type size mismatch warnings 2018-03-15 12:04:02 -07:00
jp9000 efe67ad3fd UI/updater: Fix resource compiling bug 
The afxres.h header file typically requires MFC to be installed, but
winres.h should be sufficient instead.
 2018-03-15 12:04:02 -07:00
jp9000 5063644831 UI/updater: Fix bug with restrict keyword on VS2017 2018-03-15 12:04:02 -07:00
jp9000 588d74dee1 UI/updater: Set license of windows update module to ISC 
This is just for the update module -- allows us the ability to
seamlessly update the program to VC2017 and seamlessly install Visual
C++ 2017 redistributables without potential issues that could be caused
by GPL usage for the update module.
 2018-03-15 12:04:02 -07:00
jp9000 77da6158a4 UI/updater: Rewrite function 2018-03-15 12:04:02 -07:00
Gol-D-Ace 88282c168c Update translations from Crowdin 2018-03-15 09:00:28 +01:00
Shaolin 229feefbb9 UI: Refresh multiview projector menu per click 2018-03-15 04:24:20 -03:00
Kurt Kartaltepe 59c3d195e6
cmake: Remove extraneous checks 
These don't appear to be necessary and prevent qt binaries from
being found on some systems.
 2018-03-14 20:52:14 -05:00
Shaolin 39a40764e6 UI: Refresh system tray projector menu per click 2018-03-14 21:41:15 -03:00
Shaolin 179cbd48f0 UI: Remove unnecessary casts 2018-03-14 21:41:15 -03:00