From 4865e5f9a59195c210f8f5fb4f47e4a0c0be60a7 Mon Sep 17 00:00:00 2001 From: Moxie <124418090+moxie-coder@users.noreply.github.com> Date: Wed, 18 Dec 2024 11:01:56 -0500 Subject: [PATCH 1/4] did not help --- .github/workflows/label-issue.yml | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/.github/workflows/label-issue.yml b/.github/workflows/label-issue.yml index eeb83350c66..7430f161c0b 100644 --- a/.github/workflows/label-issue.yml +++ b/.github/workflows/label-issue.yml @@ -7,36 +7,6 @@ on: - edited jobs: - # When an issue is opened, perform a similarity check for potential duplicates. - # If some are found, add a label and comment listing the potential duplicate issues. - potential-duplicate: - name: Detect potential duplicate issues - runs-on: ubuntu-latest - steps: - - uses: wow-actions/potential-duplicates@v1 - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # Issue title filter work with anymatch https://www.npmjs.com/package/anymatch. - # Any matched issue will stop detection immediately. - # You can specify multi filters in each line. - filter: '' - # Exclude keywords in title before detecting. - exclude: '' - # Label to set, when potential duplicates are detected. - label: 'potential duplicate' - # Get issues with state to compare. Supported state: 'all', 'closed', 'open'. - state: all - # If similarity is higher than this threshold([0,1]), issue will be marked as duplicate. - # Turn this up if the detection is too sensitive - threshold: 0.6 - # Reactions to be add to comment when potential duplicates are detected. - # Available reactions: "-1", "+1", "confused", "laugh", "heart", "hooray", "rocket", "eyes" - # reactions: '-1' - # Comment to post when potential duplicates are detected. - comment: > - Potential duplicates: {{#issues}} - - [#{{ number }}] {{ title }} ({{ accuracy }}%) - {{/issues}} # When an issue is opened, detect if it has an empty body or incomplete issue form. # If it does, close the issue immediately. empty-issues: From e668907384904f213edab35ed87971c9b9d52a12 Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Thu, 19 Dec 2024 18:01:41 -0500 Subject: [PATCH 2/4] yeah keep flixel 5.6.2 please fixes camera pointer not showing, closes #812 --- setup/unix.sh | 6 +++--- setup/windows.bat | 6 +++--- source/editors/CharacterEditorState.hx | 29 +++++++++++++------------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/setup/unix.sh b/setup/unix.sh index 4d431fb3afc..be3f70a9a72 100644 --- a/setup/unix.sh +++ b/setup/unix.sh @@ -6,9 +6,9 @@ echo Installing dependencies... echo This might take a few moments depending on your internet speed. haxelib install lime haxelib install openfl -haxelib install flixel -haxelib install flixel-addons -haxelib install flixel-tools +haxelib install flixel 5.6.2 +haxelib install flixel-addons 3.2.2 +haxelib install flixel-tools 1.5.1 haxelib install flixel-ui haxelib install hscript haxelib install hxcpp-debug-server diff --git a/setup/windows.bat b/setup/windows.bat index 640fc1985a3..31aa616701d 100644 --- a/setup/windows.bat +++ b/setup/windows.bat @@ -6,9 +6,9 @@ echo This might take a few moments depending on your internet speed. @echo on haxelib install lime haxelib install openfl -haxelib install flixel -haxelib install flixel-addons -haxelib install flixel-tools +haxelib install flixel 5.6.2 +haxelib install flixel-addons 3.2.2 +haxelib install flixel-tools 1.5.1 haxelib install flixel-ui haxelib install hxCodec 2.5.1 haxelib install hscript diff --git a/source/editors/CharacterEditorState.hx b/source/editors/CharacterEditorState.hx index 4998260753f..f285c8c1291 100644 --- a/source/editors/CharacterEditorState.hx +++ b/source/editors/CharacterEditorState.hx @@ -115,11 +115,9 @@ class CharacterEditorState extends MusicBeatState ghostLayer = new FlxTypedGroup(); add(ghostLayer); - var pointer:FlxGraphic = FlxGraphic.fromClass(GraphicCursorCross); - cameraFollowPointer = new FlxSprite().loadGraphic(pointer); + cameraFollowPointer = new FlxSprite().loadGraphic(FlxGraphic.fromClass(GraphicCursorCross)); cameraFollowPointer.setGraphicSize(40, 40); cameraFollowPointer.updateHitbox(); - cameraFollowPointer.color = FlxColor.WHITE; add(cameraFollowPointer); changeBGbutton = new FlxButton(FlxG.width - 360, 25, "", function() @@ -1182,18 +1180,21 @@ class CharacterEditorState extends MusicBeatState } function updatePointerPos() { - var x:Float = char.getMidpoint().x; - var y:Float = char.getMidpoint().y; - if(!char.isPlayer) { - x += 150 + char.cameraPosition[0]; - } else { - x -= 100 + char.cameraPosition[0]; - } - y -= 100 - char.cameraPosition[1]; + if(char == null || cameraFollowPointer == null) return; - x -= cameraFollowPointer.width / 2; - y -= cameraFollowPointer.height / 2; - cameraFollowPointer.setPosition(x, y); + var offX:Float = 0; + var offY:Float = 0; + if(!char.isPlayer) + { + offX = char.getMidpoint().x + 150 + char.cameraPosition[0]; + offY = char.getMidpoint().y - 100 + char.cameraPosition[1]; + } + else + { + offX = char.getMidpoint().x - 100 - char.cameraPosition[0]; + offY = char.getMidpoint().y - 100 + char.cameraPosition[1]; + } + cameraFollowPointer.setPosition(offX, offY); } function findAnimationByName(name:String):AnimArray { From 27147ec62958ea2fdde6801144f86b1a1f683f16 Mon Sep 17 00:00:00 2001 From: JordanSantiagoYT Date: Thu, 19 Dec 2024 18:26:33 -0500 Subject: [PATCH 3/4] ok nvm --- setup/unix.sh | 4 ++-- setup/windows.bat | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/setup/unix.sh b/setup/unix.sh index be3f70a9a72..1ceb5be8e5c 100644 --- a/setup/unix.sh +++ b/setup/unix.sh @@ -7,9 +7,9 @@ echo This might take a few moments depending on your internet speed. haxelib install lime haxelib install openfl haxelib install flixel 5.6.2 -haxelib install flixel-addons 3.2.2 +haxelib install flixel-addons 3.2.3 haxelib install flixel-tools 1.5.1 -haxelib install flixel-ui +haxelib install flixel-ui 2.6.1 haxelib install hscript haxelib install hxcpp-debug-server haxelib git away3d https://github.com/moxie-coder/away3d diff --git a/setup/windows.bat b/setup/windows.bat index 31aa616701d..5cb2cdb0dc5 100644 --- a/setup/windows.bat +++ b/setup/windows.bat @@ -7,9 +7,9 @@ echo This might take a few moments depending on your internet speed. haxelib install lime haxelib install openfl haxelib install flixel 5.6.2 -haxelib install flixel-addons 3.2.2 +haxelib install flixel-addons 3.2.3 haxelib install flixel-tools 1.5.1 -haxelib install flixel-ui +haxelib install flixel-ui 2.6.1 haxelib install hxCodec 2.5.1 haxelib install hscript haxelib install hxcpp-debug-server From a9c95bcb0085ac6c7d6c3bc9f425171b0e8e5719 Mon Sep 17 00:00:00 2001 From: Jordan Santiago <61796448+JordanSantiagoYT@users.noreply.github.com> Date: Fri, 20 Dec 2024 23:07:09 -0500 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 534e899a690..7076e2dbf92 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@
JS Engine
- (JordanSantiago engine) + (Jordan Santiago Engine)