Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
PhaserEditor2D committed Feb 22, 2024
2 parents 49eee2d + c2279a8 commit f688621
Show file tree
Hide file tree
Showing 172 changed files with 129,499 additions and 54,109 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"workbench.colorTheme": "Nord",
"workbench.colorTheme": "Night Owl (No Italics)",
"cSpell.words": [
"openfile"
]
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Change Log

## v3.67.0, Feb 22

* Updates to latest TypeScript 5.3.3.
* Updates to latest CodeMirror 5.66.16.
* Adds support to Phaser 3.80.
* Save all editors when the user executes the Play commands.
* Depth order commands now works with Mac keyboard with a numeric pad, in its default config.
* Fixes bug with opening multiple context menus.
* Color Picker shows realtime preview of the color.
* Allows changing numeric values with the mouse wheel.
* Allows changing numeric values with the Up/Down keys. If Shift is pressed, it increments it by 10.
* Allows changing numeric values by dragging the label.
* Adds support to Shader Effects objects, Glow and Shadow.
* Uses the Text's internal canvas to render the Text object in the Outline view.
* Use the __MISSING texture by default in NineSlice and ThreeSlice.

## v3.66.0 - Jan 11, 2024

* Allows to set a display name to game objects.
Expand Down
26 changes: 17 additions & 9 deletions design/texture-packer/phasereditor2d.resources/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<data version="1.0">
<struct type="Settings">
<key>fileFormatVersion</key>
<int>5</int>
<int>6</int>
<key>texturePackerVersion</key>
<string>6.0.2</string>
<string>7.1.0</string>
<key>autoSDSettings</key>
<array>
<struct type="AutoSDSettings">
Expand Down Expand Up @@ -127,8 +127,8 @@
<filename>../../../source/editor/plugins/phasereditor2d.resources/icons/[email protected]</filename>
</struct>
</map>
<key>multiPack</key>
<false/>
<key>multiPackMode</key>
<enum type="SettingsBase::MultiPackMode">MultiPackOff</enum>
<key>forceIdenticalLayout</key>
<false/>
<key>outputFormat</key>
Expand Down Expand Up @@ -204,6 +204,7 @@
<key type="filename">x1/dark/file-script.png</key>
<key type="filename">x1/dark/file-sound.png</key>
<key type="filename">x1/dark/file-text.png</key>
<key type="filename">x1/dark/fx.png</key>
<key type="filename">x1/dark/grid.png</key>
<key type="filename">x1/dark/group.png</key>
<key type="filename">x1/dark/image-type.png</key>
Expand Down Expand Up @@ -269,6 +270,7 @@
<key type="filename">x1/light/file-script.png</key>
<key type="filename">x1/light/file-sound.png</key>
<key type="filename">x1/light/file-text.png</key>
<key type="filename">x1/light/fx.png</key>
<key type="filename">x1/light/grid.png</key>
<key type="filename">x1/light/group.png</key>
<key type="filename">x1/light/image-type.png</key>
Expand Down Expand Up @@ -317,11 +319,17 @@
<false/>
</struct>
</map>
<key>fileList</key>
<array>
<filename>x1/dark</filename>
<filename>x1/light</filename>
</array>
<key>fileLists</key>
<map type="SpriteSheetMap">
<key>default</key>
<struct type="SpriteSheet">
<key>files</key>
<array>
<filename>x1/dark</filename>
<filename>x1/light</filename>
</array>
</struct>
</map>
<key>ignoreFileList</key>
<array/>
<key>replaceList</key>
Expand Down
26 changes: 17 additions & 9 deletions design/texture-packer/phasereditor2d.resources/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<data version="1.0">
<struct type="Settings">
<key>fileFormatVersion</key>
<int>5</int>
<int>6</int>
<key>texturePackerVersion</key>
<string>6.0.2</string>
<string>7.1.0</string>
<key>autoSDSettings</key>
<array>
<struct type="AutoSDSettings">
Expand Down Expand Up @@ -127,8 +127,8 @@
<filename>../../../source/editor/plugins/phasereditor2d.resources/icons/[email protected]</filename>
</struct>
</map>
<key>multiPack</key>
<false/>
<key>multiPackMode</key>
<enum type="SettingsBase::MultiPackMode">MultiPackOff</enum>
<key>forceIdenticalLayout</key>
<false/>
<key>outputFormat</key>
Expand Down Expand Up @@ -204,6 +204,7 @@
<key type="filename">x2/dark/[email protected]</key>
<key type="filename">x2/dark/[email protected]</key>
<key type="filename">x2/dark/[email protected]</key>
<key type="filename">x2/dark/[email protected]</key>
<key type="filename">x2/dark/[email protected]</key>
<key type="filename">x2/dark/[email protected]</key>
<key type="filename">x2/dark/[email protected]</key>
Expand Down Expand Up @@ -269,6 +270,7 @@
<key type="filename">x2/light/[email protected]</key>
<key type="filename">x2/light/[email protected]</key>
<key type="filename">x2/light/[email protected]</key>
<key type="filename">x2/light/[email protected]</key>
<key type="filename">x2/light/[email protected]</key>
<key type="filename">x2/light/[email protected]</key>
<key type="filename">x2/light/[email protected]</key>
Expand Down Expand Up @@ -317,11 +319,17 @@
<false/>
</struct>
</map>
<key>fileList</key>
<array>
<filename>x2/dark</filename>
<filename>x2/light</filename>
</array>
<key>fileLists</key>
<map type="SpriteSheetMap">
<key>default</key>
<struct type="SpriteSheet">
<key>files</key>
<array>
<filename>x2/dark</filename>
<filename>x2/light</filename>
</array>
</struct>
</map>
<key>ignoreFileList</key>
<array/>
<key>replaceList</key>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added design/texture-packer/temp/dark/fx.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added design/texture-packer/temp/light/fx.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added design/texture-packer/temp/x1/dark/fx.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added design/texture-packer/temp/x1/light/fx.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 0 additions & 26 deletions package-lock.json

This file was deleted.

84 changes: 84 additions & 0 deletions scripts/make-all-help-files.js
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,79 @@ utils.makeHelpFile([
"Phaser.Physics.Arcade.Collider(processCallback)",
"Phaser.Physics.Arcade.Collider(callbackContext)",

"Phaser.FX.Glow.color",
"Phaser.FX.Glow.outerStrength",
"Phaser.FX.Glow.innerStrength",
"Phaser.FX.Glow.knockout",

"Phaser.FX.Shadow.x",
"Phaser.FX.Shadow.y",
"Phaser.FX.Shadow.decay",
"Phaser.FX.Shadow.power",
"Phaser.FX.Shadow.color",
"Phaser.FX.Shadow.samples",
"Phaser.FX.Shadow.intensity",

"Phaser.FX.Barrel.amount",

"Phaser.FX.Bloom.color",
"Phaser.FX.Bloom.offsetX",
"Phaser.FX.Bloom.offsetY",
"Phaser.FX.Bloom.blurStrength",
"Phaser.FX.Bloom.strength",
"Phaser.FX.Bloom.steps",

"Phaser.FX.Bokeh.radius",
"Phaser.FX.Bokeh.amount",
"Phaser.FX.Bokeh.contrast",
"Phaser.FX.Bokeh.isTiltShift",
"Phaser.FX.Bokeh.blurX",
"Phaser.FX.Bokeh.blurY",
"Phaser.FX.Bokeh.strength",

"Phaser.FX.Circle.thickness",
"Phaser.FX.Circle.color",
"Phaser.FX.Circle.backgroundColor",
"Phaser.FX.Circle.scale",
"Phaser.FX.Circle.feather",

"Phaser.FX.ColorMatrix.alpha",
"Phaser.FX.ColorMatrix.brightness(value)",
"Phaser.FX.ColorMatrix.hue(rotation)",
"Phaser.FX.ColorMatrix.grayscale(value)",
"Phaser.FX.ColorMatrix.contrast(value)",
"Phaser.FX.ColorMatrix.night(intensity)",

"Phaser.FX.Displacement.x",
"Phaser.FX.Displacement.y",

"Phaser.FX.Gradient.color1",
"Phaser.FX.Gradient.color2",
"Phaser.FX.Gradient.alpha",
"Phaser.FX.Gradient.fromX",
"Phaser.FX.Gradient.fromY",
"Phaser.FX.Gradient.toX",
"Phaser.FX.Gradient.toY",
"Phaser.FX.Gradient.size",

"Phaser.FX.Pixelate.amount",

"Phaser.FX.Shine.speed",
"Phaser.FX.Shine.lineWidth",
"Phaser.FX.Shine.gradient",
"Phaser.FX.Shine.reveal",

"Phaser.FX.Vignette.x",
"Phaser.FX.Vignette.y",
"Phaser.FX.Vignette.radius",
"Phaser.FX.Vignette.strength",

"Phaser.FX.Wipe.wipeWidth",
"Phaser.FX.Wipe.direction",
"Phaser.FX.Wipe.axis",
"Phaser.FX.Wipe.progress",
"Phaser.FX.Wipe.reveal",

"Phaser.Input.Keyboard.Key",

"spine.SpineGameObject",
Expand All @@ -302,6 +375,17 @@ utils.makeHelpFile([
"Phaser.Types.Animations.PlayAnimationConfig.startFrame",
"Phaser.Types.Animations.PlayAnimationConfig.timeScale",

"Phaser.FX.Glow.color",
"Phaser.FX.Glow.outerStrength",
"Phaser.FX.Glow.innerStrength",
"Phaser.FX.Glow.knockout",
"Phaser.FX.Shadow.x",
"Phaser.FX.Shadow.y",
"Phaser.FX.Shadow.decay",
"Phaser.FX.Shadow.power",
"Phaser.FX.Shadow.color",
"Phaser.FX.Shadow.samples",
"Phaser.FX.Shadow.intensity",

], "../source/editor/plugins/phasereditor2d.resources/_res/phasereditor2d.scene/docs/phaser.json");

Expand Down
4 changes: 3 additions & 1 deletion source/editor/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
*.tsbuildinfo
node_modules/
plugins/*/_out/**
#plugins/*/_out/**
plugins/*/_out/**/*.d.ts
plugins/*/_out/**/*.d.ts.map
.vscode
.DS_Store
16 changes: 8 additions & 8 deletions source/editor/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion source/editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"devDependencies": {
"colibri-packer": "^1.0.1",
"tslint": "^6.1.3",
"typescript": "^4.3.2"
"typescript": "^5.3.3"
},
"author": "Arian Fornaris <[email protected]> (https://phasereditor2d.com)",
"license": "MIT"
Expand Down
Loading

0 comments on commit f688621

Please sign in to comment.