Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
PhaserEditor2D committed Jun 29, 2023
2 parents dc132d7 + b137b7c commit 2080704
Show file tree
Hide file tree
Showing 15 changed files with 54 additions and 36 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## v3.62.0 - jun 29, 2023

* Get latest editor and templates.

## v3.61.0 - May 18, 2023

* Get latest editor.
Expand Down
4 changes: 2 additions & 2 deletions 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 package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "PhaserEditor2D-allInOne",
"version": "3.61.0",
"version": "3.62.0",
"description": "Phaser Editor 2D, an IDE for HTML5 game creation",
"main": "src/js/main.js",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Events from Phaser Editor 2D

scene-awake An event emitted at the end of the `editorCreate()` method generated by the Scene Editor compiler.

# Add your events like this:
#
# my-event My event documentation.
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,15 @@
{
"type": "ScriptNode",
"id": "584759c2-8656-4641-90e0-7779b698b559",
"label": "scriptnode_1",
"components": [],
"list": []
"label": "scriptnode_1"
}
],
"plainObjects": [],
"meta": {
"app": "Phaser Editor 2D - Scene Editor",
"url": "https://phasereditor2d.com",
"contentType": "phasereditor2d.core.scene.SceneContentType",
"version": 3
"version": 4
},
"prefabProperties": [
{
Expand All @@ -32,7 +30,7 @@
"defValue": "",
"customDefinition": false,
"type": {
"id": "string"
"id": "event"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,15 @@
{
"type": "ScriptNode",
"id": "5a32fb17-c6cb-4a82-8bf5-f4f82a415260",
"label": "scriptnode_1",
"components": [],
"list": []
"label": "scriptnode_1"
}
],
"plainObjects": [],
"meta": {
"app": "Phaser Editor 2D - Scene Editor",
"url": "https://phasereditor2d.com",
"contentType": "phasereditor2d.core.scene.SceneContentType",
"version": 3
"version": 4
},
"prefabProperties": [
{
Expand All @@ -32,7 +30,7 @@
"defValue": "",
"customDefinition": false,
"type": {
"id": "string"
"id": "event"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules/
node_modules/
.DS_Store
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Events from Phaser Editor 2D

scene-awake An event emitted at the end of the `editorCreate()` method generated by the Scene Editor compiler.

# Add your events like this:
#
# my-event My event documentation.
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,15 @@
{
"type": "ScriptNode",
"id": "584759c2-8656-4641-90e0-7779b698b559",
"label": "scriptnode_1",
"components": [],
"list": []
"label": "scriptnode_1"
}
],
"plainObjects": [],
"meta": {
"app": "Phaser Editor 2D - Scene Editor",
"url": "https://phasereditor2d.com",
"contentType": "phasereditor2d.core.scene.SceneContentType",
"version": 3
"version": 4
},
"prefabProperties": [
{
Expand All @@ -33,7 +31,7 @@
"defValue": "",
"customDefinition": false,
"type": {
"id": "string"
"id": "event"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,15 @@
{
"type": "ScriptNode",
"id": "5a32fb17-c6cb-4a82-8bf5-f4f82a415260",
"label": "scriptnode_1",
"components": [],
"list": []
"label": "scriptnode_1"
}
],
"plainObjects": [],
"meta": {
"app": "Phaser Editor 2D - Scene Editor",
"url": "https://phasereditor2d.com",
"contentType": "phasereditor2d.core.scene.SceneContentType",
"version": 3
"version": 4
},
"prefabProperties": [
{
Expand All @@ -33,7 +31,7 @@
"defValue": "",
"customDefinition": false,
"type": {
"id": "string"
"id": "event"
}
},
{
Expand Down
7 changes: 7 additions & 0 deletions starter-templates/starter-template-webpack/events.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Events from Phaser Editor 2D

scene-awake An event emitted at the end of the `editorCreate()` method generated by the Scene Editor compiler.

# Add your events like this:
#
# my-event My event documentation.
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
## v1.0.3 - Apr 24, 2023
## v1.0.4 - Jun 25, 2023

* Migrates the **Event Name** properties of the **EmitEventActionScript** and **OnEventScript** script nodes to the new **Event** property type.

## v1.0.3 - Apr 27, 2023

* Fixes `update()` and `awake()` events management.
* Improves `OnEventScript`, it now can registers into different emitters: `scene.events`, `scene.input`, `scene.keyboard`, `gameObject`, etc...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,15 @@
{
"type": "ScriptNode",
"id": "584759c2-8656-4641-90e0-7779b698b559",
"label": "scriptnode_1",
"components": [],
"list": []
"label": "scriptnode_1"
}
],
"plainObjects": [],
"meta": {
"app": "Phaser Editor 2D - Scene Editor",
"url": "https://phasereditor2d.com",
"contentType": "phasereditor2d.core.scene.SceneContentType",
"version": 3
"version": 4
},
"prefabProperties": [
{
Expand All @@ -35,7 +33,7 @@
"defValue": "",
"customDefinition": false,
"type": {
"id": "string"
"id": "event"
}
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default class EmitEventActionScript extends ScriptNode {
/* START-USER-CODE */

execute(...args: any[]): void {

let emitter: Phaser.Events.EventEmitter | null | undefined;

switch (this.eventEmitter) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,15 @@
{
"type": "ScriptNode",
"id": "5a32fb17-c6cb-4a82-8bf5-f4f82a415260",
"label": "scriptnode_1",
"components": [],
"list": []
"label": "scriptnode_1"
}
],
"plainObjects": [],
"meta": {
"app": "Phaser Editor 2D - Scene Editor",
"url": "https://phasereditor2d.com",
"contentType": "phasereditor2d.core.scene.SceneContentType",
"version": 3
"version": 4
},
"prefabProperties": [
{
Expand All @@ -35,7 +33,7 @@
"defValue": "",
"customDefinition": false,
"type": {
"id": "string"
"id": "event"
}
},
{
Expand Down

0 comments on commit 2080704

Please sign in to comment.