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

KHR_common_materials compatibility (merge to gltf-materials) #3410

Merged
merged 19 commits into from
Jan 12, 2016
Merged

KHR_common_materials compatibility (merge to gltf-materials) #3410

merged 19 commits into from
Jan 12, 2016

Commits on Dec 4, 2015

  1. Some adaptions to match KHR_materials_common spec

    Max Limper committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    fdaec2c View commit details
    Browse the repository at this point in the history

  2. gitignore update for Webstorm

    Max Limper committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    ee5362e View commit details
    Browse the repository at this point in the history

  3. Alignment of binary body changed according to binary glTF spec

    Max Limper committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    45dfb73 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2015

  1. Removed special handling of non-4-byte-aligned binary bodies (should … 

    …be done on writer side)
    Max Limper committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    776b2ab View commit details
    Browse the repository at this point in the history

  2. Changed binary buffer name to binary_glTF (like in the spec)

    Max Limper committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    948b1ed View commit details
    Browse the repository at this point in the history

  3. Adapted interpretation of shininess value according to KHR_materials_… 

    …common
    Max Limper committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    c566172 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2015

  1. Backwards compatibility with Cesium 1.15

    Max Limper committed Dec 9, 2015
    Configuration menu
    Copy the full SHA
    503f087 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2015

  1. Update CONTRIBUTORS.md

    Max Limper committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    09a7fae View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2015

  1. Rollback of dynamic shininess handling (will be changed in spec)

    Max Limper committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    164bca9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'KHR_common_materials-compatibility' of https://github.c… 

    …om/mlimper/cesium into KHR_common_materials-compatibility
    Max Limper committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    b25fea7 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2015

  1. Fixed merge conflict, added reference to dragon glb (only for testing)

    Max Limper committed Dec 28, 2015
    Configuration menu
    Copy the full SHA
    15cbbef View commit details
    Browse the repository at this point in the history

  2. Removed references to temporary test models, added compatibility with… 

    … old glb content
    Max Limper committed Dec 28, 2015
    Configuration menu
    Copy the full SHA
    61677e6 View commit details
    Browse the repository at this point in the history

  3. reset content of .gitignore to master

    Max Limper committed Dec 28, 2015
    Configuration menu
    Copy the full SHA
    3f962e0 View commit details
    Browse the repository at this point in the history

  4. Reset content of .idea directory to master

    Max Limper committed Dec 28, 2015
    Configuration menu
    Copy the full SHA
    3dfe370 View commit details
    Browse the repository at this point in the history

  5. Reset gallery 3D models example to master

    Max Limper committed Dec 28, 2015
    Configuration menu
    Copy the full SHA
    93c7b64 View commit details
    Browse the repository at this point in the history

  6. Added comment on boolean parameters

    Max Limper committed Dec 28, 2015
    Configuration menu
    Copy the full SHA
    6709e57 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2016

  1. Used cesium defined function, adapted comment about KHR_binary_glTF

    Max Limper committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    b79010f View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2016

  1. Fixed merge conflict in CONTRIBUTORS.md

    Max Limper committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    9d34c12 View commit details
    Browse the repository at this point in the history

  2. Updated change log

    Max Limper committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    1d22e74 View commit details
    Browse the repository at this point in the history