Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

67 emissivity #86

Merged
merged 11 commits into from
Sep 24, 2024
Merged

67 emissivity #86

merged 11 commits into from
Sep 24, 2024

Commits on Sep 12, 2024

  1. Update material_schema.json for emissivity 

    Added the material property of emissivity to the material_schema.json as an optional property (not required)

Signed-off-by: [email protected] <[email protected]>
    @DavidJRitter904
    DavidJRitter904 authored and [email protected] committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    6c8b26b View commit details
    Browse the repository at this point in the history

  2. Update example_material.xomp 

    Added the material property of emissivity to the example_material.xomp

Signed-off-by: [email protected] <[email protected]>
    @DavidJRitter904
    DavidJRitter904 authored and [email protected] committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    3d6e8e1 View commit details
    Browse the repository at this point in the history

  3. Update material_schema.json for emissivity 

    include "emissivity_data" with separated emissivity value

Signed-off-by: [email protected] <[email protected]>
    @DavidJRitter904
    DavidJRitter904 authored and [email protected] committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    b8ec59f View commit details
    Browse the repository at this point in the history

  4. Update example_material.xomp for emissivity 

    add emissivity data

Signed-off-by: [email protected] <[email protected]>
    @DavidJRitter904
    DavidJRitter904 authored and [email protected] committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    d33e85d View commit details
    Browse the repository at this point in the history

  5. Update emissivity description, add source fields 

    Signed-off-by: ritter <[email protected]>
Signed-off-by: [email protected] <[email protected]>
    ritter committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    fa900f0 View commit details
    Browse the repository at this point in the history

  6. Resolve merge conflict 

    Signed-off-by: DavidJRitter904 <[email protected]>
    @DavidJRitter904
    DavidJRitter904 committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    45eb969 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Update emissivity data after resolving merge conflict 

    Signed-off-by: David Ritter <[email protected]>
    @DavidJRitter904
    DavidJRitter904 committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    02b593d View commit details
    Browse the repository at this point in the history

  2. Update branch, resolve merge conflicts 

    Signed-off-by: DavidJRitter904 <[email protected]>
    @DavidJRitter904
    DavidJRitter904 committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    87092f9 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Update emissivity naming + camelCase as in PR #110 

    Signed-off-by: David Ritter <[email protected]>
    @DavidJRitter904
    DavidJRitter904 committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    d3c018a View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Merge branch 'main' into 67-emissivity 

    Signed-off-by: ClemensLinnhoff <[email protected]>
    @ClemensLinnhoff
    ClemensLinnhoff committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    5eaec0c View commit details
    Browse the repository at this point in the history

  2. Fix remaining merge conflict 

    Signed-off-by: ClemensLinnhoff <[email protected]>
    @ClemensLinnhoff
    ClemensLinnhoff committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    395d969 View commit details
    Browse the repository at this point in the history