1. 21 7月, 2017 5 次提交
    • M
      libobs: Ensure scene items don't have pre-multiplied alpha · f8b14bdb
      Michael Fabian Dirks 提交于
      Scene items would incorrectly have pre-multiplied alpha when they were
      scaled with different scale filtering, when they were cropped, or when
      the item itself was a scene.  This happens because the scene renders the
      items to a texture in those cases, and when they are rendered to a
      texture the blend function would be the default srcalpha/invsrcalpha
      blend function, which would cause alpha to become pre-multiplied in the
      texture's result rather than straight alpha.
      
      This changes the behavior to directly copy the color/alpha to the
      texture using the one/zero blend function instead, which makes the
      resulting texture straight alpha.  (Note that you do not want to turn
      off the blend mode for the same result because certain sources can have
      custom drawing that may rely on blending being available)
      
      Related Issue: https://obsproject.com/mantis/view.php?id=954
      
      Closes jp9000/obs-studio#966
      f8b14bdb
    • S
      libobs: Add post-load module callback · 4fd66d4d
      SammyJames 提交于
      This allows the ability for certain types of modules (particularly
      scripting-related modules) to initialize extra data when all other
      modules have loaded.  Because front-ends may wish to have custom
      handling for loading modules, the front-end must manually call
      obs_post_load_modules after it has completed loading all plug-in
      modules.
      
      Closes jp9000/obs-studio#965
      4fd66d4d
    • D
      UI: Add --multi flag to suppress multi-instance warning · c3545514
      derrod 提交于
      Addresses Mantis issue 927 by adding the --multi/-m flag to suppress the
      warning dialog.
      
      Closes jp9000/obs-studio#964
      c3545514
    • M
      UI: Fix problem with exporting scene collections/profiles · 609334e4
      Michel 提交于
      When exporting scene collections/profiles existing files are
      not overwritten.
      
      Closes jp9000/obs-studio#963
      609334e4
    • J
      Merge pull request #967 from derrod/update-ingests · ab5a2ef6
      Jim 提交于
      rtmp-services: Update Twitch ingests
      ab5a2ef6
  2. 20 7月, 2017 6 次提交
  3. 18 7月, 2017 2 次提交
  4. 15 7月, 2017 8 次提交
    • J
      rmtp-services: Don't display warning for invalid file ver. · 6b666301
      jp9000 提交于
      The invalid format version warning for service files is an unnecessary
      warning which isn't necessary to display because it'll automatically
      fall back to the distributed version over the cached remote version.
      6b666301
    • J
      obs-outputs: Fix a few issues with CMakeLists.txt · 1cff1e40
      jp9000 提交于
      It's erroneously including an entire directory, including a file that no
      longer exists, and the obs-outputs_HEADERS variable had a typo when used
      in the add_library call.
      1cff1e40
    • J
      UI: Allow outputs to use different audio codecs · 753bf20e
      jp9000 提交于
      Allows an output to automatically specify which audio codec it requires
      and use it instead of AAC.  This change is intended to be
      behind-the-scenes and seamless to the user.
      753bf20e
    • J
      UI: Allow services to use different outputs · 3491487c
      jp9000 提交于
      Allows a service to specify the output it needs in order to function as
      configured.
      
      NOTE: This functionality should be considered temporary as a seamless
      means of implementing support for different output types within the same
      service.  Ideally, different services should be used for this
      functionality.
      3491487c
    • J
      rtmp-services: Allow services to override bframe count · 4d167271
      jp9000 提交于
      4d167271
    • J
      rtmp-services: Add ability to specify different outputs · 339a0686
      jp9000 提交于
      Allows the ability for services to specify a different output if needed.
      
      NOTE: This should probably be considered temporary, and services within
      this file that use this functionality should probably be moved out of
      the file and in to a separate service.
      339a0686
    • J
      obs-qsv11, obs-x264: Allow bframe count overriding · e230f773
      jp9000 提交于
      Allows the ability to override bframes (useful for specific protocols)
      e230f773
    • J
      libobs: Add ability for service to specify its output type · 24571599
      jp9000 提交于
      Allows the ability to change the output type in case one service
      requires a different output type.
      
      NOTE: This should be considered a temporarily yet simple solution to a
      specific problem: support for RTMP-like outputs.  This will allows
      seamless integration of supporting different RTMP-like output types
      within the same service.  This should probably be replaced with a more
      ideal solution later, such as implementing a completely different
      service type instead, when time permits.
      24571599
  5. 14 7月, 2017 1 次提交
  6. 13 7月, 2017 1 次提交
  7. 08 7月, 2017 1 次提交
  8. 05 7月, 2017 1 次提交
  9. 03 7月, 2017 4 次提交
  10. 02 7月, 2017 9 次提交
  11. 01 7月, 2017 1 次提交
    • J
      UI: Allow zoom with the scroll wheel · 8942c186
      Joseph El-Khouri 提交于
      Adds the ability to zoom into the preview when fixed scaling mode is
      enabled.
      
      (Edit by Jim: Also now saves zoom and scroll position)
      
      Closes jp9000/obs-studio#917
      8942c186
  12. 30 6月, 2017 1 次提交
    • M
      UI: Add ability to drop html files · d70c97db
      mntone 提交于
      (Edit by Jim: Added a check to make sure that the browser source exists
      due to the fact that it's technically optional)
      
      Closes jp9000/obs-studio#905
      d70c97db