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

4132 Commits (d19342442ffd72977b4c76cc8ee85fe1f5dca294)

Author SHA1 Message Date
Colin Edwards 522c43f827 CI: Use python2 to run package script 2016-10-13 19:32:19 -05:00
Jim 925c229312 Merge pull request #660 from DDRBoxman/buildapp 
CI: Package OSX build into an actual app
 2016-10-11 21:12:24 -07:00
Colin Edwards a0b4439893 CI: Package OSX build into an actual app 2016-10-11 22:43:17 -05:00
Jim 3db1f62133 Merge pull request #659 from DDRBoxman/travisirc 
CI: Reduce travis irc notice to one line
 2016-10-11 15:56:06 -07:00
Colin Edwards 30b813564e CI: Reduce travis irc notice to one line 2016-10-11 17:54:28 -05:00
Jim 7d4fa4a650 Merge pull request #657 from DDRBoxman/travisirc 
CI: Add irc notifications to travis config
 2016-10-11 13:43:44 -07:00
Colin Edwards 5f65739606 CI: Add irc notifications to travis config 2016-10-11 15:43:00 -05:00
Jim b84fd6bc2e Merge pull request #658 from DDRBoxman/archivepushes 
CI: Upload artifacts on all pushes
 2016-10-11 13:19:11 -07:00
Colin Edwards 720f8cd6a2 CI: Upload artifacts on all pushes 2016-10-11 15:15:21 -05:00
Jim 9e2e183c04 Merge pull request #655 from DDRBoxman/osxnightly 
OSX Travis build
 2016-10-09 22:42:33 -07:00
Colin Edwards 47c8365cdd OSX Travis build 2016-10-10 00:39:55 -05:00
Jim ad2550e060 Merge pull request #628 from RytoEX/master 
libobs/util: Fix get_dll_ver not reporting DLL name
 2016-10-09 19:46:21 -07:00
CoDEmanX 2680321860 CMake: Warn if empty QTDIR/DepsPath vars on Windows 
Closes jp9000/obs-studio#608
 2016-10-09 19:32:58 -07:00
Jim 43c1dce777 Merge pull request #634 from CoDEmanX/master 
rtmp-services: Add Asian Livecoding.tv server and increase video bitrate
 2016-10-09 18:49:34 -07:00
Michael Fabian Dirks bd606785fe UI: Split Properties window with a QSplitter 
Closes jp9000/obs-studio#645
 2016-10-09 18:47:32 -07:00
Michael Fabian Dirks d324713364 UI: Add raw text and text file to drag&drop support 
Closes jp9000/obs-studio#644
 2016-10-09 18:39:53 -07:00
Ryan Foster b75292dbf4 UI: Add Portable Mode indicator to title bar and log 
Closes jp9000/obs-studio#654
 2016-10-09 18:10:18 -07:00
Jim 9cb8ae74e4 Merge pull request #635 from cortexmedia/msi-license 
Display license in MSI installer
 2016-10-09 17:09:25 -07:00
Jim 7d243509bb Merge pull request #653 from DDRBoxman/HiDPI 
Add 256x256 icon to windows ico for HiDPI displays
 2016-10-08 18:05:36 -07:00
Colin Edwards f1a9c139b8 Add 256x256 icon to windows ico for HiDPI displays 2016-10-08 19:41:31 -05:00
Jim 7bdca3e28a Merge pull request #651 from Xaymar/plugin_enc-amf 
enc-amf: Update to 1.3.3.1
 2016-10-07 12:37:50 -07:00
Ryan Foster 487ef58ee7 libobs-d3d11: Log GetDeviceRemovedReason 
When DirectX throws error 0x887A0005 (DXGI_ERROR_DEVICE_REMOVED),
Microsoft recommends calling ID3D11Device::GetDeviceRemovedReason to
retrieve a more precise error code.

Closes jp9000/obs-studio#652
 2016-10-07 01:07:00 -07:00
Michael Fabian Dirks ccbb542eb0 enc-amf: Update to 1.3.3.1 2016-10-07 00:47:06 +02:00
Jim 986edc84c4 Merge pull request #650 from DDRBoxman/HiDPI 
UI: Only scale HiDPI on QT 5.6+
 2016-10-04 21:54:36 -07:00
Colin Edwards 404258f41a UI: Only scale HiDPI on QT 5.6+ 2016-10-04 22:46:52 -05:00
Jim a80d334cf6 Merge pull request #640 from DDRBoxman/HiDPI 
UI: Enable HiDPI scaling.
 2016-10-04 11:30:34 -07:00
Jim 987cd85edd Merge pull request #649 from Xaymar/plugin_enc-amf 
enc-amf: Update to 1.3.2.3
 2016-10-04 11:28:05 -07:00
Michael Fabian Dirks 70fc27d34a enc-amf: Update to 1.3.2.3 2016-10-04 20:21:17 +02:00
Jim f81637718b Merge pull request #647 from wt/remove_GetMonitors 
Remove get monitors
 2016-10-03 23:54:36 -07:00
Warren Turkal f3eb8aacfe UI: Use Qt lib for screen info instead of x11 libs 
All of the monitor discovery logic can be implemented with Qt. This
change removes all the x11 implementations in favor of Qt and removes a
fair amount of platform specific code.
 2016-10-03 23:50:13 -07:00
Jim 5642b7bc66 Merge pull request #642 from RytoEX/scenesw-regex 
Prevent crash when adding an invalid regex to Automatic Scene Switcher
 2016-10-02 21:13:36 -07:00
Ryan Foster 91b64657c6 frontend-tools: Fix crash when adding invalid regex 
When adding a new regex rule to the Automatic Scene Switcher, OBS would
crash if the regex was invalid. This was because the regex was added to
the Regex object without a test or try-catch. This commit fixes that
behavior, and adds a warning message when attempting to add an invalid
regex.
 2016-10-02 23:28:38 -04:00
Colin Edwards c4eebbba54 UI: Enable HiDPI scaling. 
This makes the app much more usable on hidpi screen devices like the
surface.
 2016-09-30 01:05:14 -05:00
jp9000 580cfc1a95 libobs: Update to 0.16.2 2016-09-29 12:21:12 -07:00
Jim dbfb1f9796 Merge pull request #638 from Xaymar/plugin_enc-amf 
enc-amf: Fix warnings caused by warnings( push/pop )
 2016-09-29 12:20:49 -07:00
Michael Fabian Dirks 846db36d6e enc-amf: Fix warnings caused by warnings( push/pop ) 2016-09-29 21:20:01 +02:00
Michael Fabian Dirks 4bafe668ee obs-text: Add gradient feature 
Closes jp9000/obs-studio#636
 2016-09-29 12:15:17 -07:00
Jim 444f7e39b5 Merge pull request #637 from Xaymar/plugin_enc-amf 
enc-amf: Update submodule to 1.3.1.0
 2016-09-29 11:05:57 -07:00
Michael Fabian Dirks 832c62e026 enc-amf: Update submodule to 1.3.1.0 2016-09-29 19:59:45 +02:00
jp9000 48f0c73f82 UI: Use rect intersection test for validating position 
Instead of checking to see if the window's position is valid, check to
see if the rectangles of the window and the monitor intersect via a
rectangle intersection test.
 2016-09-28 22:26:28 -07:00
Richard Stanway a8020b37be obs-ffmpeg: Fix possible NVENC crash 
If the codec hasn't even been fully initialized, calling these functions
in the shutdown code could cause a crash.
 2016-09-28 15:24:04 -07:00
CoDEmanX 78d09e6ac2 rtmp-services: Add Asian Livecoding.tv server and increase video bitrate 2016-09-28 21:29:03 +02:00
Serge Paquet a97a9a966c Display license in MSI installer 2016-09-28 12:06:35 -04:00
jp9000 6d16c51cd1 libobs: Update to 0.16.1 2016-09-28 02:05:20 -07:00
jp9000 32378124af obs-text: Change file update interval to 1 sec (from 2) 2016-09-28 02:01:30 -07:00
jp9000 8b877f7c36 libobs/util: Fix fread_utf8 not working with files < 3 bytes 
When it was checking for the BOM at the beginning of the file, it would
just return out of the function if it didn't read at least 3 bytes.
This would particularly affect text sources.
 2016-09-28 02:01:30 -07:00
jp9000 071ed465cb UI: Fix window size/pos not saving on exit 2016-09-28 02:01:25 -07:00
jp9000 cdd788c4be UI: Just use 'OK' button for license agreement dialog 
An "I Agree" or "I Disagree" button isn't necessary for GPL.
 2016-09-27 18:06:09 -07:00
Gol-D-Ace aadc7263c0 Update translations from Crowdin 2016-09-28 01:17:24 +02:00
jp9000 a8f3351173 enc-amf: Remove unused locale files 2016-09-27 16:13:40 -07:00