Commit Graph

173 Commits

Author SHA1 Message Date
Matthew Amato cb32ac859a Merge remote-tracking branch 'origin/master' into webGL-globe-json 2014-07-28 16:18:54 -04:00
Dan Bagnell 3bf2c5d345 Remove sensors. 2014-07-28 15:12:32 -04:00
Matthew Amato 45f9e536cd More changes after review. 2014-07-28 14:13:58 -04:00
Matthew Amato 45e1dc9800 Changes after review. 2014-07-28 14:09:19 -04:00
Matthew Amato 9b7c70e938 Rename file for clarity. 2014-07-28 13:38:44 -04:00
Matthew Amato 4642a2f60b Merge remote-tracking branch 'origin/master' into webGL-globe-json
Conflicts:
	Apps/SampleData/ne_110m_lakes.geojson
	Apps/SampleData/ne_110m_land_topo.geojson
	Apps/Sandcastle/gallery/GeoJSON and TopoJSON.html
2014-07-25 13:42:27 -04:00
Ed Mackey 71de2145b4 Merge pull request #1952 from AnalyticalGraphicsInc/geojson
GeoJSON cleanup
2014-07-25 09:24:36 -04:00
Matthew Amato 3c954d69b5 Ongoing GeoJson cleanup. 2014-07-24 00:02:38 -04:00
Matthew Amato 300b0913e8 Start streamlining the GeoJSON api. 2014-07-23 15:41:44 -04:00
Patrick Cozzi 03934ad86e Update models to final glTF 0.8 2014-07-23 11:28:19 -04:00
Patrick Cozzi baf74e7ed9 Merge remote-tracking branch 'origin/master' into gltf-8 2014-07-23 11:23:09 -04:00
Matthew Amato a9e06e27c8 WebGL Globe JSON DataSource
1. Add a simple DataSource for WebGL Globe JSON.
2. Make geojson files use `.geojson` extension.
3. Add Sandcastle example.
2014-07-22 23:57:34 -04:00
Matthew Amato 58266ca81a Start refactoring CZML to mandate versioning
This change breaks most CZML processing for now.  Also clean up some misc doc issues.
2014-07-21 20:03:28 -04:00
Matthew Amato 0bb39c1e9c Fix specs and sample data after remove BC CZML code. 2014-07-21 15:41:11 -04:00
Patrick Cozzi 6769a69911 Merge remote-tracking branch 'origin/master' into gltf-8 2014-07-18 16:16:35 -04:00
Matthew Amato 0fdb2570d5 Clean up sensor API
This are changes needed ahead of #1887 to ensure API/CZML compatibility with 1.0
2014-07-17 13:14:17 -04:00
Patrick Cozzi f058749266 Switch enable state from array to property for glTF 0.8 2014-07-16 17:42:22 -04:00
Patrick Cozzi 784f0e0391 Merge remote-tracking branch 'origin/master' into gltf-8 2014-07-14 16:26:19 -04:00
Patrick Cozzi 631e18d0fa Merge remote-tracking branch 'origin/master' into gltf-8 2014-07-14 16:08:03 -04:00
hpinkos dbe1b9fe50 Merge branch 'master' into polylineArc 2014-07-14 16:03:38 -04:00
hpinkos 008707beb5 move models 2014-07-14 10:27:25 -04:00
hpinkos 23a2a92ef8 Merge branch 'master' into scrubSandcastle 2014-07-11 17:13:33 -04:00
hpinkos 3cae7fe67e Create SampleData folder 2014-07-11 11:07:32 -04:00