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

CZML and Entity articulations API #7907

Merged
merged 6 commits into from
Jun 11, 2019
Merged

CZML and Entity articulations API #7907

merged 6 commits into from
Jun 11, 2019

Commits on May 31, 2019

  1. Started work on CZML articulations demo.

    @emackey
    emackey committed May 31, 2019
    Configuration menu
    Copy the full SHA
    3c5227a View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2019

  1. Add tests for Entity-level articulations

    @emackey
    emackey committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    c6b9e52 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into entity-articulations 

    # Conflicts:
#	Source/DataSources/ModelGraphics.js
    @emackey
    emackey committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    bac851b View commit details
    Browse the repository at this point in the history

  3. CHANGES.md

    @emackey
    emackey committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    05874e7 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2019

  1. Merge remote-tracking branch 'origin/master' into entity-articulations 

    # Conflicts:
#	CHANGES.md
    @emackey
    emackey committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    d01da70 View commit details
    Browse the repository at this point in the history

  2. Add articulation tests to CzmlDataSourceSpec.js

    @emackey
    emackey committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    6e8789b View commit details
    Browse the repository at this point in the history