Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into patch-1
Browse files Browse the repository at this point in the history
# Conflicts:
#	Source/Widgets/CesiumWidget/CesiumWidget.js
  • Loading branch information
mramato committed Apr 28, 2020
2 parents f229a72 + 44acf66 commit 1fe709b
Show file tree
Hide file tree
Showing 2,261 changed files with 651,098 additions and 483,360 deletions.
8 changes: 4 additions & 4 deletions .concierge/templates/pullRequestOpened.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{#if askAboutContributors}}
Thank you so much for the pull request @{{ userName }}! I noticed this is your first pull request and I wanted to say welcome to the Cesium community!

The [Pull Request Guidelines](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#pull-request-guidelines) is a handy reference for making sure your PR gets accepted quickly, so make sure to skim that.
The [Pull Request Guidelines](https://github.com/CesiumGS/cesium/blob/master/CONTRIBUTING.md#pull-request-guidelines) is a handy reference for making sure your PR gets accepted quickly, so make sure to skim that.

* :x: Missing `CONTRIBUTORS.md` entry.
* Please add yourself to the [contributors]({{ contributorsUrl }}) file!
Expand All @@ -10,15 +10,15 @@ Thanks for the pull request @{{ userName }}!
{{/if}}
{{#if claEnabled}}
{{#if errorCla}}
* :grey_exclamation: There was an error checking the CLA! If this is your first contribution, please send in a [Contributor License Agreement](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla).
* :grey_exclamation: There was an error checking the CLA! If this is your first contribution, please send in a [Contributor License Agreement](https://github.com/CesiumGS/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla).
* Maintainers, this was the error I ran into while attempting to process the CLA check. Please resolve it to continue CLA checking.
```
{{ errorCla }}
```
{{else}}
{{#if askForCla}}
* :x: Missing CLA.
* Please send in a [Contributor License Agreement](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla) (CLA) and comment back here to let us know to check this!
* Please send in a [Contributor License Agreement](https://github.com/CesiumGS/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla) (CLA) and comment back here to let us know to check this!
{{else}}
* :heavy_check_mark: Signed CLA found.
{{/if}}
Expand All @@ -34,7 +34,7 @@ Thanks for the pull request @{{ userName }}!
{{/if}}
{{#if askAboutTests}}
* :grey_question: Unit tests were not updated.
* Make sure you've [updated tests](https://github.com/AnalyticalGraphicsInc/cesium/tree/master/Documentation/Contributors/TestingGuide) to reflect your changes, added tests for any new code, and ran the code coverage tool.
* Make sure you've [updated tests](https://github.com/CesiumGS/cesium/tree/master/Documentation/Contributors/TestingGuide) to reflect your changes, added tests for any new code, and ran the code coverage tool.
{{/if}}

Reviewers, don't forget to make sure that:
Expand Down
5 changes: 1 addition & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ root = true

[*]
indent_style = space
indent_size = 4
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false

[package.json]
indent_size = 2
6 changes: 3 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "./Tools/eslint-config-cesium/browser.js",
"extends": ["./Tools/eslint-config-cesium/browser.js", "prettier"],
"plugins": [
"html"
],
Expand All @@ -9,8 +9,8 @@
"overrides": [
{
"files": [
"index.js",
"server.js",
"index.cjs",
"server.cjs",
"gulpfile.js",
"Source/Workers/transferTypedArrayTest.js"
],
Expand Down
16 changes: 8 additions & 8 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ about: Let us know so we can fix it!
---

<!--
Thanks for helping us improve Cesium! Please describe what the expected behavior is vs what actually happens.
Thanks for helping us improve Cesium! Please describe what the expected behavior is vs what actually happens.
Creating a Sandcastle example (https://cesiumjs.org/Cesium/Build/Apps/Sandcastle/) that reproduces the issue helps us a lot in tracking down bugs. Paste the link you get from the "Share" button in Sandcastle below.
-->
-->

Sandcastle example:
Sandcastle example:

Browser:

Operating System:

<!--
<!--
If you can also contribute a fix, we'd absolutely appreciate it! Fixing a bug in Cesium often means fixing a bug for thousands of applications and millions of end users.
If you can also contribute a fix, we'd absolutely appreciate it! Fixing a bug in Cesium often means fixing a bug for thousands of applications and millions of end users.
Check out the contributor guide to get started:
Check out the contributor guide to get started:
https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md
https://github.com/CesiumGS/cesium/blob/master/CONTRIBUTING.md
Just let us know you're working on it and we'd be happy to provide advice and feedback.
-->
-->
12 changes: 6 additions & 6 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Request a feature
about: New ideas & improvements to Cesium are always welcome.
---

<!--
Thanks for helping make Cesium better!
<!--
Thanks for helping make Cesium better!
When suggesting an idea, give examples of the intended use case. Features that benefit the wider community are more likely to be prioritized.
When suggesting an idea, give examples of the intended use case. Features that benefit the wider community are more likely to be prioritized.
The best way to get your ideas into Cesium is to help us! We love contributions and are always happy to be provide feedback and advice. Check out the contributor guide to get started:
The best way to get your ideas into Cesium is to help us! We love contributions and are always happy to be provide feedback and advice. Check out the contributor guide to get started:
https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md
-->
https://github.com/CesiumGS/cesium/blob/master/CONTRIBUTING.md
-->
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Ask a question
about: Please use the forum (https://groups.google.com/forum/#!forum/cesium-dev) for general questions about using Cesium.
about: Please use the community forum (https://community.cesium.com/) for general questions about using Cesium.
---

:exclamation: Please use the [forum](https://groups.google.com/forum/#!forum/cesium-dev) for asking questions about how to use Cesium and best practices. The core Cesium team actively monitors the forum and we love seeing what people are working on! :exclamation:
:exclamation: Please use the [community forum](https://community.cesium.com/) for asking questions about how to use Cesium and best practices. The core Cesium team actively monitors the forum and we love seeing what people are working on! :exclamation:
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/Build
/Cesium-*.zip
/cesium-*.tgz
.directory
.DS_Store
Thumbs.db
.eslintcache
Expand Down
5 changes: 5 additions & 0 deletions .gulp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"flags": {
"gulpfile": "gulpfile.cjs"
}
}
2 changes: 1 addition & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/index.html
/index.release.html
/launches
/server.js
/server.cjs
/Source/copyrightHeader.js
/Specs
/ThirdParty
Expand Down
29 changes: 29 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

# Ignore everything
*

# Unignore directories (to all depths) and unignore code and style files in these directories
!.concierge/**/
!.github/**/
!.vscode/**/
!Apps/**/
!Documentation/**/
!Source/**/
!Specs/**/
!Tools/**/

!**/*.js
!**/*.css
!**/*.html
!**/*.md

# Re-ignore a few things caught above
**/*.min.js
Source/Cesium.js
Source/Shaders/**/*.js
Source/ThirdParty/**
Source/Workers/**/*
Apps/Sandcastle/ThirdParty

!Source/Workers/cesiumWorkerBootstrapper.js
!Source/Workers/transferTypedArrayTest.js
25 changes: 11 additions & 14 deletions .slackbot.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
# List of Slack usernames (not GitHub) for the Cesium Concierge Slackbot to send release reminders for.
releaseSchedule:
OmarShehata: 9/2/2019
mramato: 10/1/2019
hpinkos: 11/1/2019
lilleyse: 12/1/2019
kring: 1/6/2020
lilleyse: 2/3/2020
mramato: 3/2/2020

greetings:
- Happy Friday everyone!
- Can you believe Friday is already here?
- I hope you all had awesome week!
- I skipped breakfast, so I hope Gary baked something good today...
- Good morning everyone!
mamato: 3/2/2020
oshehata: 4/1/2020
lilleyse: 5/1/2020
ian: 6/1/2020
sam.suhag: 7/1/2020
sam.vargas: 8/3/2020
kevin: 9/1/2020
mamato: 10/1/2020
oshehata: 11/2/2020
lilleyse: 12/1/2020
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ script:
- npm --silent run deploy-status -- --status pending --message 'Waiting for build'

- npm --silent run eslint
- npm --silent run prettier-check

- npm --silent run build
- npm --silent run coverage -- --browsers FirefoxHeadless --webgl-stub --failTaskOnError --suppressPassed
Expand All @@ -24,9 +25,9 @@ script:
- npm --silent run build-specs
- npm --silent run test -- --browsers ChromeCI --failTaskOnError --webgl-stub --release --suppressPassed

# Various Node.js smoke-screen tests
# Various Node.js smoke-screen tests
- node -e "const Cesium = require('./');"
- NODE_ENV=development node index.js
- NODE_ENV=production node index.js
- NODE_ENV=development node index.cjs
- NODE_ENV=production node index.cjs

- npm --silent run cloc
1 change: 1 addition & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"recommendations": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"slevesque.shader",
"cesium.gltf-vscode"
]
Expand Down
16 changes: 6 additions & 10 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
// Use IntelliSense to learn about possible Node.js debug attributes.
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
Expand All @@ -8,14 +8,10 @@
"type": "node",
"request": "launch",
"name": "Launch Program",
"program": "${workspaceRoot}\\server.js",
"cwd": "${workspaceRoot}"
},
{
"type": "node",
"request": "attach",
"name": "Attach to Process",
"port": 5858
"cwd": "${workspaceFolder}",
"runtimeExecutable": "npm",
"runtimeArgs": ["run-script", "start"],
"noDebug": true
}
]
}
}
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"files.trimTrailingWhitespace": true,
"files.insertFinalNewline": true,
"editor.insertSpaces": true,
"editor.tabSize": 4,
"editor.tabSize": 2,
"editor.detectIndentation": false,
"eslint.enable": true,
"javascript.format.insertSpaceAfterCommaDelimiter": true,
Expand Down
1 change: 0 additions & 1 deletion Apps/.jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"boss": false,
"debug": false,
"eqnull": false,
"esnext": false,
"moz": false,
"evil": false,
"expr": false,
Expand Down
54 changes: 27 additions & 27 deletions Apps/CesiumViewer/CesiumViewer.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,40 @@
@import url(../../Source/Widgets/lighter.css);

html {
height: 100%;
height: 100%;
}

body {
height: 100%;
width: 100%;
margin: 0;
overflow: hidden;
padding: 0;
background: #000;
height: 100%;
width: 100%;
margin: 0;
overflow: hidden;
padding: 0;
background: #000;
}

.fullWindow {
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
margin: 0;
overflow: hidden;
padding: 0;
font-family: sans-serif;
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
margin: 0;
overflow: hidden;
padding: 0;
font-family: sans-serif;
}

.loadingIndicator {
display: block;
position: absolute;
top: 50%;
left: 50%;
margin-top: -33px;
margin-left: -33px;
width: 66px;
height: 66px;
background-position: center;
background-repeat: no-repeat;
background-image: url(Images/ajax-loader.gif);
display: block;
position: absolute;
top: 50%;
left: 50%;
margin-top: -33px;
margin-left: -33px;
width: 66px;
height: 66px;
background-position: center;
background-repeat: no-repeat;
background-image: url(Images/ajax-loader.gif);
}
Loading

0 comments on commit 1fe709b

Please sign in to comment.