Merge branch 'master' into update-knockout

CesiumGS · Jan 29, 2020 · d9dc74d · d9dc74d
2 parents bd82a3f + dd843d1
commit d9dc74d
Showing 202 changed files with 3,540 additions and 3,613 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ Thumbs.db
 npm-debug.log
 npm-debug.log.*
 package-lock.json
+yarn.lock
 
 # WebStorm user-specific
 .idea/workspace.xml

diff --git a/.slackbot.yml b/.slackbot.yml
@@ -3,9 +3,9 @@ releaseSchedule:
   mramato: 10/1/2019
   hpinkos: 11/1/2019
   lilleyse: 12/1/2019
-  ggetz: 1/2/2020
-  likangning93: 2/3/2020
-  tfili: 3/2/2020
+  kring: 1/6/2020
+  lilleyse: 2/3/2020
+  mramato: 3/2/2020
 
 greetings:
   - Happy Friday everyone!

diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,9 @@
 language: node_js
 node_js:
-  - "8"
-sudo: false
+  - "10"
 addons:
   chrome: stable
   firefox: latest
-services:
-  - xvfb
-before_script:
-  - export DISPLAY=:99.0
 script:
   - npm --silent run deploy-set-version -- --buildVersion $TRAVIS_BRANCH.$TRAVIS_BUILD_NUMBER
   - npm --silent run deploy-status -- --status pending --message 'Waiting for build'

diff --git a/Apps/SampleData/models/CesiumAir/Cesium_Air.glb b/Apps/SampleData/models/CesiumAir/Cesium_Air.glb
diff --git a/Apps/SampleData/models/CesiumBalloon/CesiumBalloon.glb b/Apps/SampleData/models/CesiumBalloon/CesiumBalloon.glb
diff --git a/Apps/SampleData/models/CesiumMan/Cesium_Man.glb b/Apps/SampleData/models/CesiumMan/Cesium_Man.glb
diff --git a/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck-kmc.glb b/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck-kmc.glb
diff --git a/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.glb b/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.glb
diff --git a/Apps/SampleData/models/ShadowTester/Shadow_Tester.glb b/Apps/SampleData/models/ShadowTester/Shadow_Tester.glb
diff --git a/Apps/SampleData/models/ShadowTester/Shadow_Tester.gltf b/Apps/SampleData/models/ShadowTester/Shadow_Tester.gltf
diff --git a/Apps/SampleData/models/ShadowTester/Shadow_Tester_2.glb b/Apps/SampleData/models/ShadowTester/Shadow_Tester_2.glb
diff --git a/Apps/SampleData/models/ShadowTester/Shadow_Tester_2.gltf b/Apps/SampleData/models/ShadowTester/Shadow_Tester_2.gltf
diff --git a/Apps/SampleData/models/ShadowTester/Shadow_Tester_3.glb b/Apps/SampleData/models/ShadowTester/Shadow_Tester_3.glb
diff --git a/Apps/SampleData/models/ShadowTester/Shadow_Tester_3.gltf b/Apps/SampleData/models/ShadowTester/Shadow_Tester_3.gltf
diff --git a/Apps/SampleData/models/ShadowTester/Shadow_Tester_4.glb b/Apps/SampleData/models/ShadowTester/Shadow_Tester_4.glb
diff --git a/Apps/SampleData/models/ShadowTester/Shadow_Tester_4.gltf b/Apps/SampleData/models/ShadowTester/Shadow_Tester_4.gltf
diff --git a/Apps/SampleData/models/ShadowTester/Shadow_Tester_Point.glb b/Apps/SampleData/models/ShadowTester/Shadow_Tester_Point.glb
diff --git a/Apps/SampleData/models/ShadowTester/Shadow_Tester_Point.gltf b/Apps/SampleData/models/ShadowTester/Shadow_Tester_Point.gltf
diff --git a/Apps/SampleData/models/ShadowTester/Shadow_Transparent.glb b/Apps/SampleData/models/ShadowTester/Shadow_Transparent.glb
diff --git a/Apps/SampleData/models/ShadowTester/Shadow_Transparent.gltf b/Apps/SampleData/models/ShadowTester/Shadow_Transparent.gltf
diff --git a/Apps/SampleData/models/WoodTower/Wood_Tower.glb b/Apps/SampleData/models/WoodTower/Wood_Tower.glb