1. 03 5月, 2014 3 次提交
    • J
      Also fix project files for 64bit · 81957868
      jp9000 提交于
      81957868
    • J
      Make workaround for VS2012/2013 debugging issue · 2da938c6
      jp9000 提交于
      Starting with VS2012, microsoft made a terribly stupid change to the way
      working directory is handled.  It basically will not work properly if
      you need to run your executable from a specific location, it would only
      run properly from debug if you also had your target directory set to an
      environment variable, which was incredibly stupid.  The visual studio
      development team is run by chimpanzees with tiny brains, headed by
      a broken AI core designed by gilbert gottfried.
      
      I made a workaround for it so that it's much easier to set up debugging
      in VS2013, so that all you need to do is enter in the the working
      directory for it to work properly.  Still somewhat of a pain but the Qt
      addin kept overwriting the god forsaken environment path, and made
      setting it up much more difficult than it was supposed to be.
      2da938c6
    • J
      d3d11: Fix float3 constant alignment (128bit) · 4a370acf
      jp9000 提交于
      4a370acf
  2. 02 5月, 2014 3 次提交
  3. 01 5月, 2014 1 次提交
  4. 29 4月, 2014 11 次提交
  5. 28 4月, 2014 1 次提交
  6. 27 4月, 2014 7 次提交
    • J
      Add preliminary saving/loading of scene/sources · 65455c27
      jp9000 提交于
      This saves scenes/sources from json on exit, and properly loads it back
      up when starting up the program again, as well as the currently active
      scene.
      
      I had to add a 'load' and 'save' callback to the source interface
      structure because I realizes that certain sources (such as scenes)
      operate different with their saved data; scenes for example would have
      to keep track of their settings information constantly, and that was
      somewhat unacceptable to make it functional.
      
      The optional 'load' callback will be called only after having loaded
      setttings specifically from file/imported data, and the 'save' function
      will be called only specifically when data actually needs to be saved.
      
      I also had to adjust the obs_scene code so that it's a regular input
      source type now, and I also modified it so that it doesn't have some
      strange custom creation code anymore.  The obs_scene_create function is
      now simply just a wrapper for obs_source_create.  You could even create
      a scene with obs_source_create manually as well.
      65455c27
    • J
      Add helper functions to obs_data and fix bug · 21b67d00
      jp9000 提交于
      Add math helpers to the obs_data functions for vec2/3/4 and quat, and
      fix a bug where it wouldn't load arrays from json
      21b67d00
    • J
      Fix bug with matrix rotation function · bfeb16e8
      jp9000 提交于
      bfeb16e8
    • J
      Improve output packet interleaving · 6a59aef3
      jp9000 提交于
      The 'wait' constant was a terrible means of trying to ensure that the
      packets were interleaved.  Instead, calculate the current highest
      timestamps of each encoder that's present in the interleaved buffer, and
      use that as a means of detecting whether the current packet should be
      sent off.  This will guarantee sorting without relying on some arbirary
      constant that 'assumes' that it'll be interleaved.  It also reduces
      buffering any more than what is needed to interleave.
      6a59aef3
    • J
      Merge pull request #71 from fryshorts/master · 160b44e4
      Jim 提交于
      Some minor fixes
      160b44e4
    • J
      obs-x264: Woops, forgot to remove .rc · 63474164
      jp9000 提交于
      63474164
    • J
      obs-x264: Use regular CBR if x264 version < 139 · 1a0bfe32
      jp9000 提交于
      Some linux packages on linux are way too old.  Very annoying.
      1a0bfe32
  7. 26 4月, 2014 4 次提交
  8. 25 4月, 2014 10 次提交