1. 24 2月, 2015 4 次提交
  2. 21 2月, 2015 3 次提交
  3. 18 2月, 2015 4 次提交
  4. 17 2月, 2015 4 次提交
    • P
      libobs: Allow duplicate sources per scene · d085d6e4
      Palana 提交于
      Previously having a source multiple times in a single scene would cause
      the recursion check to trigger. Example scenes.json:
      
      {
          "current_scene": "Scene",
          "sources": [
              {
                  "flags": 0,
                  "id": "scene",
                  "mixers": 0,
                  "name": "Scene",
                  "settings": {
                      "items": [
                          {
                              "align": 5,
                              "bounds": {
                                  "x": 0.0,
                                  "y": 0.0
                              },
                              "bounds_align": 0,
                              "bounds_type": 0,
                              "name": "Text (FreeType 2)",
                              "pos": {
                                  "x": 0.0,
                                  "y": 0.0
                              },
                              "rot": 0.0,
                              "scale": {
                                  "x": 1.0,
                                  "y": 1.0
                              },
                              "visible": true
                          },
                          {
                              "align": 5,
                              "bounds": {
                                  "x": 0.0,
                                  "y": 0.0
                              },
                              "bounds_align": 0,
                              "bounds_type": 0,
                              "name": "Text (FreeType 2)",
                              "pos": {
                                  "x": 0.0,
                                  "y": 98.0
                              },
                              "rot": 0.0,
                              "scale": {
                                  "x": 1.0,
                                  "y": 1.0
                              },
                              "visible": true
                          }
                      ]
                  },
                  "sync": 0,
                  "volume": 1.0
              },
              {
                  "flags": 0,
                  "id": "text_ft2_source",
                  "mixers": 0,
                  "name": "Text (FreeType 2)",
                  "settings": {},
                  "sync": 0,
                  "volume": 1.0
              }
          ]
      }
      d085d6e4
    • P
      libobs: Handle obs_scene_add failure · 9dca07db
      Palana 提交于
      Previously a NULL item would cause a crash when reading transform info.
      The crash can be reproduced by e.g. editing scenes.json so that two
      scenes contain each other. Example scenes.json:
      
      {
          "current_scene": "Scene",
          "sources": [
              {
                  "flags": 0,
                  "id": "scene",
                  "mixers": 0,
                  "name": "Scene",
                  "settings": {
                      "items": [
                          {
                              "align": 5,
                              "bounds": {
                                  "x": 1440.0,
                                  "y": 900.0
                              },
                              "bounds_align": 0,
                              "bounds_type": 2,
                              "name": "Scene 2",
                              "pos": {
                                  "x": 0.0,
                                  "y": 0.0
                              },
                              "rot": 0.0,
                              "scale": {
                                  "x": 1.0,
                                  "y": 1.0
                              },
                              "visible": true
                          }
                      ]
                  },
                  "sync": 0,
                  "volume": 1.0
              },
              {
                  "flags": 0,
                  "id": "scene",
                  "mixers": 0,
                  "name": "Scene 2",
                  "settings": {
                      "items": [
                          {
                              "align": 5,
                              "bounds": {
                                  "x": 1.0,
                                  "y": 1.0
                              },
                              "bounds_align": 0,
                              "bounds_type": 0,
                              "name": "Scene",
                              "pos": {
                                  "x": 854.0,
                                  "y": -520.0
                              },
                              "rot": 0.0,
                              "scale": {
                                  "x": 1.75,
                                  "y": 1.7562724351882935
                              },
                              "visible": true
                          }
                      ]
                  },
                  "sync": 0,
                  "volume": 1.0
              }
          ]
      }
      9dca07db
    • H
      UI: Display message if no properties available · 641f6265
      HomeWorld 提交于
      Display "No properties available" text in the property view if there are
      no properties available.
      
      Closes Pull Request #377
      641f6265
    • K
      Generate proper DL_OPENGL value for linux · c293c176
      Kevin Tardif 提交于
      Since we rely on the dynamic linker to find the library for us via
      dlopen(), we need to have DL_OPENGL be .so.N, not the full library
      filename, as ldconfig doesn't cache the full filename
      
      Use of TARGET_SONAME_FILE requires the library to be marked as SHARED,
      not MODULE
      
      This closes pull request #370
      c293c176
  5. 16 2月, 2015 2 次提交
  6. 15 2月, 2015 9 次提交
  7. 14 2月, 2015 5 次提交
  8. 13 2月, 2015 2 次提交
  9. 12 2月, 2015 7 次提交