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

5476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
pkviet
ce339ce613 obs-outputs/flv: Fix ECMA array size 
Fixes the size of the ECMA array storing onMetadata in flv.
(from 14 to 20).
Fixes ticket 1204.
 2018-03-23 19:43:48 +01: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
Shaolin
9211dba267 UI: Save windowed projectors on exit 2018-03-18 05:11:44 -03:00
Shaolin
3390be50ce UI: Remove a second call to OpenSavedProjectors 
OpenSavedProjectors is already called from RefreshSceneCollections
earlier by OBSInit.
 2018-03-18 05:11:44 -03:00
Shaolin
8b6641d1a8 UI: Clean up OBSProjector creation 2018-03-18 05:11:44 -03:00
Shaolin
372640ff35 UI: Update Projectors title on source name change 2018-03-18 05:11:44 -03:00
Shaolin
76af4ff36d UI: Clean up save and load projector code 2018-03-18 05:11:44 -03:00
Shaolin
8ec1f97d30 UI: Add helper functions to Projector 2018-03-18 05:11:44 -03:00
Shaolin
e6c00afeac UI: Add Scene to ProjectorType 2018-03-18 05:11:44 -03:00
Shaolin
3952fe2693 UI: Simplify Projector Init 2018-03-18 05:11:44 -03:00
Shaolin
7da90fa25f UI: Refactor Projector OBSRender source usage 2018-03-18 05:11:44 -03:00
Shaolin
abbcb6ae88 UI: Move ProjectorType enum to projector header 2018-03-18 05:11:44 -03:00
Shaolin
c605f74d3f UI: Make OpenSavedProjectors indentation clear 2018-03-18 05:11:44 -03:00
Shaolin
2d864590fe UI: Fix the Multiview window not using translation 2018-03-18 05:11:44 -03:00
Shaolin
cfc2c1373d UI: Check if source is valid earlier 2018-03-18 05:11:44 -03:00
Shaolin
d13b4d35a0 UI: Simplify the OpenProjector logic 2018-03-18 05:11:44 -03:00
Shaolin
dd5e3ef3fe UI: Only load projectors if SaveProjectors is true 2018-03-18 05:11:44 -03: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
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
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