mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-06-30 21:42:20 +02:00
Trimmed trailing whitespace... again...
This commit is contained in:
parent
442c8c745d
commit
e8a83636ca
@ -218,7 +218,7 @@ module.exports = {
|
|||||||
module systems it knows of. It's the default because it's the safe option
|
module systems it knows of. It's the default because it's the safe option
|
||||||
It might come at a performance penalty, though.
|
It might come at a performance penalty, though.
|
||||||
moduleSystems: ['amd', 'cjs', 'es6', 'tsd']
|
moduleSystems: ['amd', 'cjs', 'es6', 'tsd']
|
||||||
|
|
||||||
As in practice only commonjs ('cjs') and ecmascript modules ('es6')
|
As in practice only commonjs ('cjs') and ecmascript modules ('es6')
|
||||||
are widely used, you can limit the moduleSystems to those.
|
are widely used, you can limit the moduleSystems to those.
|
||||||
*/
|
*/
|
||||||
@ -226,7 +226,7 @@ module.exports = {
|
|||||||
// moduleSystems: ['cjs', 'es6'],
|
// moduleSystems: ['cjs', 'es6'],
|
||||||
|
|
||||||
/* prefix for links in html and svg output (e.g. 'https://github.com/you/yourrepo/blob/main/'
|
/* prefix for links in html and svg output (e.g. 'https://github.com/you/yourrepo/blob/main/'
|
||||||
to open it on your online repo or `vscode://file/${process.cwd()}/` to
|
to open it on your online repo or `vscode://file/${process.cwd()}/` to
|
||||||
open it in visual studio code),
|
open it in visual studio code),
|
||||||
*/
|
*/
|
||||||
// prefix: `vscode://file/${process.cwd()}/`,
|
// prefix: `vscode://file/${process.cwd()}/`,
|
||||||
@ -271,7 +271,7 @@ module.exports = {
|
|||||||
to './webpack.conf.js'.
|
to './webpack.conf.js'.
|
||||||
|
|
||||||
The (optional) `env` and `arguments` attributes contain the parameters
|
The (optional) `env` and `arguments` attributes contain the parameters
|
||||||
to be passed if your webpack config is a function and takes them (see
|
to be passed if your webpack config is a function and takes them (see
|
||||||
webpack documentation for details)
|
webpack documentation for details)
|
||||||
*/
|
*/
|
||||||
// webpackConfig: {
|
// webpackConfig: {
|
||||||
@ -322,8 +322,8 @@ module.exports = {
|
|||||||
A list of alias fields in package.jsons
|
A list of alias fields in package.jsons
|
||||||
See [this specification](https://github.com/defunctzombie/package-browser-field-spec) and
|
See [this specification](https://github.com/defunctzombie/package-browser-field-spec) and
|
||||||
the webpack [resolve.alias](https://webpack.js.org/configuration/resolve/#resolvealiasfields)
|
the webpack [resolve.alias](https://webpack.js.org/configuration/resolve/#resolvealiasfields)
|
||||||
documentation
|
documentation
|
||||||
|
|
||||||
Defaults to an empty array (= don't use alias fields).
|
Defaults to an empty array (= don't use alias fields).
|
||||||
*/
|
*/
|
||||||
// aliasFields: ["browser"],
|
// aliasFields: ["browser"],
|
||||||
|
2
.github/CODEOWNERS
vendored
2
.github/CODEOWNERS
vendored
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
# Art Team
|
# Art Team
|
||||||
/public/**/*.png @pagefaultgames/art-team
|
/public/**/*.png @pagefaultgames/art-team
|
||||||
/public/**/*.json @pagefaultgames/art-team
|
/public/**/*.json @pagefaultgames/art-team
|
||||||
/public/images @pagefaultgames/art-team
|
/public/images @pagefaultgames/art-team
|
||||||
/public/battle-anims @pagefaultgames/art-team
|
/public/battle-anims @pagefaultgames/art-team
|
||||||
|
|
||||||
|
2
.github/pull_request_template.md
vendored
2
.github/pull_request_template.md
vendored
@ -72,5 +72,5 @@ Do the reviewers need to do something special in order to test your changes?
|
|||||||
|
|
||||||
Are there any localization additions or changes? If so:
|
Are there any localization additions or changes? If so:
|
||||||
- [ ] Has a locales PR been created on the [locales](https://github.com/pagefaultgames/pokerogue-locales) repo?
|
- [ ] Has a locales PR been created on the [locales](https://github.com/pagefaultgames/pokerogue-locales) repo?
|
||||||
- [ ] If so, please leave a link to it here:
|
- [ ] If so, please leave a link to it here:
|
||||||
- [ ] Has the translation team been contacted for proofreading/translation?
|
- [ ] Has the translation team been contacted for proofreading/translation?
|
2
.github/workflows/deploy.yml
vendored
2
.github/workflows/deploy.yml
vendored
@ -35,7 +35,7 @@ jobs:
|
|||||||
ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
|
ssh-keyscan -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
|
||||||
- name: Deploy build on server
|
- name: Deploy build on server
|
||||||
if: github.event_name == 'push' && github.ref_name == 'main'
|
if: github.event_name == 'push' && github.ref_name == 'main'
|
||||||
run: |
|
run: |
|
||||||
rsync --del --no-times --checksum -vrm dist/* ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DESTINATION_DIR }}
|
rsync --del --no-times --checksum -vrm dist/* ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DESTINATION_DIR }}
|
||||||
ssh -t ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "~/prmanifest --inpath ${{ secrets.DESTINATION_DIR }} --outpath ${{ secrets.DESTINATION_DIR }}/manifest.json"
|
ssh -t ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} "~/prmanifest --inpath ${{ secrets.DESTINATION_DIR }} --outpath ${{ secrets.DESTINATION_DIR }}/manifest.json"
|
||||||
- name: Purge Cloudflare Cache
|
- name: Purge Cloudflare Cache
|
||||||
|
2
.github/workflows/quality.yml
vendored
2
.github/workflows/quality.yml
vendored
@ -33,7 +33,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Install Node.js dependencies # Step to install Node.js dependencies
|
- name: Install Node.js dependencies # Step to install Node.js dependencies
|
||||||
run: npm ci # Use 'npm ci' to install dependencies
|
run: npm ci # Use 'npm ci' to install dependencies
|
||||||
|
|
||||||
- name: eslint # Step to run linters
|
- name: eslint # Step to run linters
|
||||||
run: npm run eslint-ci
|
run: npm run eslint-ci
|
||||||
|
|
||||||
|
2
global.d.ts
vendored
2
global.d.ts
vendored
@ -7,7 +7,7 @@ declare global {
|
|||||||
* Only used in testing.
|
* Only used in testing.
|
||||||
* Can technically be undefined/null but for ease of use we are going to assume it is always defined.
|
* Can technically be undefined/null but for ease of use we are going to assume it is always defined.
|
||||||
* Used to load i18n files exclusively.
|
* Used to load i18n files exclusively.
|
||||||
*
|
*
|
||||||
* To set up your own server in a test see `game_data.test.ts`
|
* To set up your own server in a test see `game_data.test.ts`
|
||||||
*/
|
*/
|
||||||
var server: SetupServerApi;
|
var server: SetupServerApi;
|
||||||
|
@ -272,7 +272,7 @@ class DefaultOverrides {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Set all non-scripted waves to use the selected battle type.
|
* Set all non-scripted waves to use the selected battle type.
|
||||||
*
|
*
|
||||||
* Ignored if set to {@linkcode BattleType.TRAINER} and `DISABLE_STANDARD_TRAINERS_OVERRIDE` is `true`.
|
* Ignored if set to {@linkcode BattleType.TRAINER} and `DISABLE_STANDARD_TRAINERS_OVERRIDE` is `true`.
|
||||||
*/
|
*/
|
||||||
readonly BATTLE_TYPE_OVERRIDE: Exclude<BattleType, BattleType.CLEAR> | null = null;
|
readonly BATTLE_TYPE_OVERRIDE: Exclude<BattleType, BattleType.CLEAR> | null = null;
|
||||||
@ -298,4 +298,4 @@ export type RandomTrainerOverride = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** The type of the {@linkcode DefaultOverrides} class */
|
/** The type of the {@linkcode DefaultOverrides} class */
|
||||||
export type OverridesType = typeof DefaultOverrides;
|
export type OverridesType = typeof DefaultOverrides;
|
||||||
|
@ -51,7 +51,7 @@ float hue2rgb(float f1, float f2, float hue) {
|
|||||||
|
|
||||||
vec3 rgb2hsl(vec3 color) {
|
vec3 rgb2hsl(vec3 color) {
|
||||||
vec3 hsl;
|
vec3 hsl;
|
||||||
|
|
||||||
float fmin = min(min(color.r, color.g), color.b);
|
float fmin = min(min(color.r, color.g), color.b);
|
||||||
float fmax = max(max(color.r, color.g), color.b);
|
float fmax = max(max(color.r, color.g), color.b);
|
||||||
float delta = fmax - fmin;
|
float delta = fmax - fmin;
|
||||||
@ -66,7 +66,7 @@ vec3 rgb2hsl(vec3 color) {
|
|||||||
hsl.y = delta / (fmax + fmin);
|
hsl.y = delta / (fmax + fmin);
|
||||||
else
|
else
|
||||||
hsl.y = delta / (2.0 - fmax - fmin);
|
hsl.y = delta / (2.0 - fmax - fmin);
|
||||||
|
|
||||||
float deltaR = (((fmax - color.r) / 6.0) + (delta / 2.0)) / delta;
|
float deltaR = (((fmax - color.r) / 6.0) + (delta / 2.0)) / delta;
|
||||||
float deltaG = (((fmax - color.g) / 6.0) + (delta / 2.0)) / delta;
|
float deltaG = (((fmax - color.g) / 6.0) + (delta / 2.0)) / delta;
|
||||||
float deltaB = (((fmax - color.b) / 6.0) + (delta / 2.0)) / delta;
|
float deltaB = (((fmax - color.b) / 6.0) + (delta / 2.0)) / delta;
|
||||||
@ -89,24 +89,24 @@ vec3 rgb2hsl(vec3 color) {
|
|||||||
|
|
||||||
vec3 hsl2rgb(vec3 hsl) {
|
vec3 hsl2rgb(vec3 hsl) {
|
||||||
vec3 rgb;
|
vec3 rgb;
|
||||||
|
|
||||||
if (hsl.y == 0.0)
|
if (hsl.y == 0.0)
|
||||||
rgb = vec3(hsl.z);
|
rgb = vec3(hsl.z);
|
||||||
else {
|
else {
|
||||||
float f2;
|
float f2;
|
||||||
|
|
||||||
if (hsl.z < 0.5)
|
if (hsl.z < 0.5)
|
||||||
f2 = hsl.z * (1.0 + hsl.y);
|
f2 = hsl.z * (1.0 + hsl.y);
|
||||||
else
|
else
|
||||||
f2 = (hsl.z + hsl.y) - (hsl.y * hsl.z);
|
f2 = (hsl.z + hsl.y) - (hsl.y * hsl.z);
|
||||||
|
|
||||||
float f1 = 2.0 * hsl.z - f2;
|
float f1 = 2.0 * hsl.z - f2;
|
||||||
|
|
||||||
rgb.r = hue2rgb(f1, f2, hsl.x + (1.0/3.0));
|
rgb.r = hue2rgb(f1, f2, hsl.x + (1.0/3.0));
|
||||||
rgb.g = hue2rgb(f1, f2, hsl.x);
|
rgb.g = hue2rgb(f1, f2, hsl.x);
|
||||||
rgb.b = hue2rgb(f1, f2, hsl.x - (1.0/3.0));
|
rgb.b = hue2rgb(f1, f2, hsl.x - (1.0/3.0));
|
||||||
}
|
}
|
||||||
|
|
||||||
return rgb;
|
return rgb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -83,7 +83,7 @@ vec3 rgb2hsl(vec3 color) {
|
|||||||
hsl.y = delta / (fmax + fmin);
|
hsl.y = delta / (fmax + fmin);
|
||||||
else
|
else
|
||||||
hsl.y = delta / (2.0 - fmax - fmin);
|
hsl.y = delta / (2.0 - fmax - fmin);
|
||||||
|
|
||||||
float deltaR = (((fmax - color.r) / 6.0) + (delta / 2.0)) / delta;
|
float deltaR = (((fmax - color.r) / 6.0) + (delta / 2.0)) / delta;
|
||||||
float deltaG = (((fmax - color.g) / 6.0) + (delta / 2.0)) / delta;
|
float deltaG = (((fmax - color.g) / 6.0) + (delta / 2.0)) / delta;
|
||||||
float deltaB = (((fmax - color.b) / 6.0) + (delta / 2.0)) / delta;
|
float deltaB = (((fmax - color.b) / 6.0) + (delta / 2.0)) / delta;
|
||||||
@ -106,24 +106,24 @@ vec3 rgb2hsl(vec3 color) {
|
|||||||
|
|
||||||
vec3 hsl2rgb(vec3 hsl) {
|
vec3 hsl2rgb(vec3 hsl) {
|
||||||
vec3 rgb;
|
vec3 rgb;
|
||||||
|
|
||||||
if (hsl.y == 0.0)
|
if (hsl.y == 0.0)
|
||||||
rgb = vec3(hsl.z);
|
rgb = vec3(hsl.z);
|
||||||
else {
|
else {
|
||||||
float f2;
|
float f2;
|
||||||
|
|
||||||
if (hsl.z < 0.5)
|
if (hsl.z < 0.5)
|
||||||
f2 = hsl.z * (1.0 + hsl.y);
|
f2 = hsl.z * (1.0 + hsl.y);
|
||||||
else
|
else
|
||||||
f2 = (hsl.z + hsl.y) - (hsl.y * hsl.z);
|
f2 = (hsl.z + hsl.y) - (hsl.y * hsl.z);
|
||||||
|
|
||||||
float f1 = 2.0 * hsl.z - f2;
|
float f1 = 2.0 * hsl.z - f2;
|
||||||
|
|
||||||
rgb.r = hue2rgb(f1, f2, hsl.x + (1.0/3.0));
|
rgb.r = hue2rgb(f1, f2, hsl.x + (1.0/3.0));
|
||||||
rgb.g = hue2rgb(f1, f2, hsl.x);
|
rgb.g = hue2rgb(f1, f2, hsl.x);
|
||||||
rgb.b= hue2rgb(f1, f2, hsl.x - (1.0/3.0));
|
rgb.b= hue2rgb(f1, f2, hsl.x - (1.0/3.0));
|
||||||
}
|
}
|
||||||
|
|
||||||
return rgb;
|
return rgb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -98,7 +98,7 @@ export default class MoveTouchControlsHandler {
|
|||||||
<div id="cancelButton" class="button">${i18next.t("settings:touchCancel")}</div>
|
<div id="cancelButton" class="button">${i18next.t("settings:touchCancel")}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="info-row">
|
<div class="info-row">
|
||||||
<div class="orientation-label">
|
<div class="orientation-label">
|
||||||
${i18next.t("settings:orientation")}
|
${i18next.t("settings:orientation")}
|
||||||
<span id="orientation">
|
<span id="orientation">
|
||||||
${this.isLandscapeMode ? i18next.t("settings:landscape") : i18next.t("settings:portrait")}
|
${this.isLandscapeMode ? i18next.t("settings:landscape") : i18next.t("settings:portrait")}
|
||||||
|
Loading…
Reference in New Issue
Block a user