Skip to content

Commit

Permalink
some wip stuff
Browse files Browse the repository at this point in the history 
i might have to scrap a few things
  • Loading branch information
@Joalor64GH
Joalor64GH authored Jun 29, 2024
1 parent d2d7017 commit d9d0efe
Show file tree
Hide file tree
Showing 20 changed files with 233 additions and 133 deletions.
2 changes: 1 addition & 1 deletion TODO
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
- Nothing yet

[HIGH PRIORITY]
- Custom Noteskins/Notesplashes
- Move character with mouse in Character Editor
- Extra Notes (for real this time)
- Add data for languages
- Add sound input to Credits Editor

[LOW PRIORITY]
- Fix Modchart Editor
- Custom Noteskins/Notesplashes
- Week 8 (or Weekend 1, whatever)
- New stage code from Psych 0.7
- Psych UI (from v1.0b)
Expand Down
104 changes: 52 additions & 52 deletions assets/images/NOTE_assets.xml
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="NOTE_assets.png">
<!-- Created with Adobe Animate version 18.0.2.126 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="arrowLEFT0000" x="10" y="10" width="155" height="158"/>
<SubTexture name="arrowDOWN0000" x="175" y="10" width="157" height="155"/>
<SubTexture name="arrowRIGHT0000" x="342" y="10" width="155" height="157"/>
<SubTexture name="arrowUP0000" x="507" y="10" width="157" height="154"/>
<SubTexture name="blue hold end0000" x="169" y="425" width="51" height="64"/>
<SubTexture name="blue hold piece0000" x="554" y="668" width="51" height="44"/>
<SubTexture name="blue0000" x="674" y="10" width="157" height="154"/>
<SubTexture name="down confirm0000" x="10" y="178" width="239" height="237"/>
<SubTexture name="down confirm0001" x="259" y="178" width="239" height="237"/>
<SubTexture name="down confirm0002" x="508" y="178" width="221" height="219" frameX="-6" frameY="-12" frameWidth="239" frameHeight="237"/>
<SubTexture name="down confirm0003" x="508" y="178" width="221" height="219" frameX="-6" frameY="-12" frameWidth="239" frameHeight="237"/>
<SubTexture name="down press0000" x="739" y="178" width="142" height="140" frameX="-4" frameY="-3" frameWidth="149" frameHeight="147"/>
<SubTexture name="down press0001" x="739" y="178" width="142" height="140" frameX="-4" frameY="-3" frameWidth="149" frameHeight="147"/>
<SubTexture name="down press0002" x="10" y="425" width="149" height="147"/>
<SubTexture name="down press0003" x="10" y="425" width="149" height="147"/>
<SubTexture name="green hold end0000" x="169" y="425" width="51" height="64"/>
<SubTexture name="green hold piece0000" x="554" y="668" width="51" height="44"/>
<SubTexture name="green0000" x="230" y="425" width="158" height="154"/>
<SubTexture name="left confirm0000" x="398" y="425" width="229" height="233"/>
<SubTexture name="left confirm0001" x="637" y="425" width="219" height="223" frameX="-5" frameY="-5" frameWidth="229" frameHeight="233"/>
<SubTexture name="left confirm0002" x="10" y="668" width="227" height="230" frameX="-2" frameY="-1" frameWidth="229" frameHeight="233"/>
<SubTexture name="left confirm0003" x="10" y="668" width="227" height="230" frameX="-2" frameY="-1" frameWidth="229" frameHeight="233"/>
<SubTexture name="left press0000" x="247" y="668" width="140" height="143" frameX="-4" frameY="-3" frameWidth="147" frameHeight="150"/>
<SubTexture name="left press0001" x="247" y="668" width="140" height="143" frameX="-4" frameY="-3" frameWidth="147" frameHeight="150"/>
<SubTexture name="left press0002" x="397" y="668" width="147" height="150"/>
<SubTexture name="left press0003" x="397" y="668" width="147" height="150"/>
<SubTexture name="pruple end hold0000" x="169" y="425" width="51" height="64"/>
<SubTexture name="purple hold piece0000" x="554" y="668" width="51" height="44"/>
<SubTexture name="purple0000" x="615" y="668" width="155" height="157"/>
<SubTexture name="red hold end0000" x="169" y="425" width="51" height="64"/>
<SubTexture name="red hold piece0000" x="554" y="668" width="51" height="44"/>
<SubTexture name="red0000" x="780" y="668" width="155" height="157"/>
<SubTexture name="right confirm0000" x="10" y="908" width="225" height="228" frameX="-1" frameY="-2" frameWidth="228" frameHeight="232"/>
<SubTexture name="right confirm0001" x="245" y="908" width="225" height="228" frameX="-1" frameY="-2" frameWidth="228" frameHeight="232"/>
<SubTexture name="right confirm0002" x="480" y="908" width="228" height="232"/>
<SubTexture name="right confirm0003" x="480" y="908" width="228" height="232"/>
<SubTexture name="right press0000" x="718" y="908" width="139" height="141" frameX="-3" frameY="-7" frameWidth="149" frameHeight="151"/>
<SubTexture name="right press0001" x="718" y="908" width="139" height="141" frameX="-3" frameY="-7" frameWidth="149" frameHeight="151"/>
<SubTexture name="right press0002" x="10" y="1150" width="149" height="151"/>
<SubTexture name="right press0003" x="10" y="1150" width="149" height="151"/>
<SubTexture name="up confirm0000" x="169" y="1150" width="238" height="235"/>
<SubTexture name="up confirm0001" x="417" y="1150" width="238" height="235"/>
<SubTexture name="up confirm0002" x="665" y="1150" width="216" height="213" frameX="-11" frameY="-11" frameWidth="238" frameHeight="235"/>
<SubTexture name="up confirm0003" x="665" y="1150" width="216" height="213" frameX="-11" frameY="-11" frameWidth="238" frameHeight="235"/>
<SubTexture name="up press0000" x="10" y="1395" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0001" x="10" y="1395" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0002" x="164" y="1395" width="153" height="150"/>
<SubTexture name="up press0003" x="164" y="1395" width="153" height="150"/>
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="NOTE_assets.png">
<!-- Created with Adobe Animate version 18.0.2.126 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="arrowLEFT0000" x="10" y="10" width="155" height="158"/>
<SubTexture name="arrowDOWN0000" x="175" y="10" width="157" height="155"/>
<SubTexture name="arrowRIGHT0000" x="342" y="10" width="155" height="157"/>
<SubTexture name="arrowUP0000" x="507" y="10" width="157" height="154"/>
<SubTexture name="blue hold end0000" x="169" y="425" width="51" height="64"/>
<SubTexture name="blue hold piece0000" x="554" y="668" width="51" height="44"/>
<SubTexture name="blue0000" x="674" y="10" width="157" height="154"/>
<SubTexture name="down confirm0000" x="10" y="178" width="239" height="237"/>
<SubTexture name="down confirm0001" x="259" y="178" width="239" height="237"/>
<SubTexture name="down confirm0002" x="508" y="178" width="221" height="219" frameX="-6" frameY="-12" frameWidth="239" frameHeight="237"/>
<SubTexture name="down confirm0003" x="508" y="178" width="221" height="219" frameX="-6" frameY="-12" frameWidth="239" frameHeight="237"/>
<SubTexture name="down press0000" x="739" y="178" width="142" height="140" frameX="-4" frameY="-3" frameWidth="149" frameHeight="147"/>
<SubTexture name="down press0001" x="739" y="178" width="142" height="140" frameX="-4" frameY="-3" frameWidth="149" frameHeight="147"/>
<SubTexture name="down press0002" x="10" y="425" width="149" height="147"/>
<SubTexture name="down press0003" x="10" y="425" width="149" height="147"/>
<SubTexture name="green hold end0000" x="169" y="425" width="51" height="64"/>
<SubTexture name="green hold piece0000" x="554" y="668" width="51" height="44"/>
<SubTexture name="green0000" x="230" y="425" width="158" height="154"/>
<SubTexture name="left confirm0000" x="398" y="425" width="229" height="233"/>
<SubTexture name="left confirm0001" x="637" y="425" width="219" height="223" frameX="-5" frameY="-5" frameWidth="229" frameHeight="233"/>
<SubTexture name="left confirm0002" x="10" y="668" width="227" height="230" frameX="-2" frameY="-1" frameWidth="229" frameHeight="233"/>
<SubTexture name="left confirm0003" x="10" y="668" width="227" height="230" frameX="-2" frameY="-1" frameWidth="229" frameHeight="233"/>
<SubTexture name="left press0000" x="247" y="668" width="140" height="143" frameX="-4" frameY="-3" frameWidth="147" frameHeight="150"/>
<SubTexture name="left press0001" x="247" y="668" width="140" height="143" frameX="-4" frameY="-3" frameWidth="147" frameHeight="150"/>
<SubTexture name="left press0002" x="397" y="668" width="147" height="150"/>
<SubTexture name="left press0003" x="397" y="668" width="147" height="150"/>
<SubTexture name="pruple end hold0000" x="169" y="425" width="51" height="64"/>
<SubTexture name="purple hold piece0000" x="554" y="668" width="51" height="44"/>
<SubTexture name="purple0000" x="615" y="668" width="155" height="157"/>
<SubTexture name="red hold end0000" x="169" y="425" width="51" height="64"/>
<SubTexture name="red hold piece0000" x="554" y="668" width="51" height="44"/>
<SubTexture name="red0000" x="780" y="668" width="155" height="157"/>
<SubTexture name="right confirm0000" x="10" y="908" width="225" height="228" frameX="-1" frameY="-2" frameWidth="228" frameHeight="232"/>
<SubTexture name="right confirm0001" x="245" y="908" width="225" height="228" frameX="-1" frameY="-2" frameWidth="228" frameHeight="232"/>
<SubTexture name="right confirm0002" x="480" y="908" width="228" height="232"/>
<SubTexture name="right confirm0003" x="480" y="908" width="228" height="232"/>
<SubTexture name="right press0000" x="718" y="908" width="139" height="141" frameX="-3" frameY="-7" frameWidth="149" frameHeight="151"/>
<SubTexture name="right press0001" x="718" y="908" width="139" height="141" frameX="-3" frameY="-7" frameWidth="149" frameHeight="151"/>
<SubTexture name="right press0002" x="10" y="1150" width="149" height="151"/>
<SubTexture name="right press0003" x="10" y="1150" width="149" height="151"/>
<SubTexture name="up confirm0000" x="169" y="1150" width="238" height="235"/>
<SubTexture name="up confirm0001" x="417" y="1150" width="238" height="235"/>
<SubTexture name="up confirm0002" x="665" y="1150" width="216" height="213" frameX="-11" frameY="-11" frameWidth="238" frameHeight="235"/>
<SubTexture name="up confirm0003" x="665" y="1150" width="216" height="213" frameX="-11" frameY="-11" frameWidth="238" frameHeight="235"/>
<SubTexture name="up press0000" x="10" y="1395" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0001" x="10" y="1395" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0002" x="164" y="1395" width="153" height="150"/>
<SubTexture name="up press0003" x="164" y="1395" width="153" height="150"/>
</TextureAtlas>
72 changes: 36 additions & 36 deletions assets/images/noteSplashes.xml
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="noteSplashes.png">
<!-- Created with Adobe Animate version 18.0.2.126 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="note splash blue 10000" x="10" y="10" width="194" height="186" frameX="-47" frameY="-57" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash blue 10001" x="214" y="10" width="220" height="218" frameX="-31" frameY="-34" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash blue 10002" x="444" y="10" width="284" height="293" frameX="-7" frameY="-2" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash blue 10003" x="10" y="313" width="291" height="303"/>
<SubTexture name="note splash blue 20000" x="311" y="313" width="202" height="211" frameX="-69" frameY="-68" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash blue 20001" x="523" y="313" width="235" height="240" frameX="-47" frameY="-45" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash blue 20002" x="10" y="626" width="298" height="315" frameX="-9" frameY="-6" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash blue 20003" x="318" y="626" width="315" height="321"/>
<SubTexture name="note splash green 10000" x="10" y="10" width="194" height="186" frameX="-47" frameY="-57" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash green 10001" x="214" y="10" width="220" height="218" frameX="-31" frameY="-34" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash green 10002" x="444" y="10" width="284" height="293" frameX="-7" frameY="-2" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash green 10003" x="10" y="313" width="291" height="303"/>
<SubTexture name="note splash green 20000" x="311" y="313" width="202" height="211" frameX="-69" frameY="-68" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash green 20001" x="523" y="313" width="235" height="240" frameX="-47" frameY="-45" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash green 20002" x="10" y="626" width="298" height="315" frameX="-9" frameY="-6" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash green 20003" x="318" y="626" width="315" height="321"/>
<SubTexture name="note splash purple 10000" x="10" y="10" width="194" height="186" frameX="-47" frameY="-57" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash purple 10001" x="214" y="10" width="220" height="218" frameX="-31" frameY="-34" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash purple 10002" x="444" y="10" width="284" height="293" frameX="-7" frameY="-2" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash purple 10003" x="10" y="313" width="291" height="303"/>
<SubTexture name="note splash purple 20000" x="311" y="313" width="202" height="211" frameX="-69" frameY="-68" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash purple 20001" x="523" y="313" width="235" height="240" frameX="-47" frameY="-45" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash purple 20002" x="10" y="626" width="298" height="315" frameX="-9" frameY="-6" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash purple 20003" x="318" y="626" width="315" height="321"/>
<SubTexture name="note splash red 10000" x="10" y="10" width="194" height="186" frameX="-47" frameY="-57" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash red 10001" x="214" y="10" width="220" height="218" frameX="-31" frameY="-34" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash red 10002" x="444" y="10" width="284" height="293" frameX="-7" frameY="-2" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash red 10003" x="10" y="313" width="291" height="303"/>
<SubTexture name="note splash red 20000" x="311" y="313" width="202" height="211" frameX="-69" frameY="-68" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash red 20001" x="523" y="313" width="235" height="240" frameX="-47" frameY="-45" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash red 20002" x="10" y="626" width="298" height="315" frameX="-9" frameY="-6" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash red 20003" x="318" y="626" width="315" height="321"/>
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="noteSplashes.png">
<!-- Created with Adobe Animate version 18.0.2.126 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="note splash blue 10000" x="10" y="10" width="194" height="186" frameX="-47" frameY="-57" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash blue 10001" x="214" y="10" width="220" height="218" frameX="-31" frameY="-34" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash blue 10002" x="444" y="10" width="284" height="293" frameX="-7" frameY="-2" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash blue 10003" x="10" y="313" width="291" height="303"/>
<SubTexture name="note splash blue 20000" x="311" y="313" width="202" height="211" frameX="-69" frameY="-68" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash blue 20001" x="523" y="313" width="235" height="240" frameX="-47" frameY="-45" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash blue 20002" x="10" y="626" width="298" height="315" frameX="-9" frameY="-6" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash blue 20003" x="318" y="626" width="315" height="321"/>
<SubTexture name="note splash green 10000" x="10" y="10" width="194" height="186" frameX="-47" frameY="-57" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash green 10001" x="214" y="10" width="220" height="218" frameX="-31" frameY="-34" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash green 10002" x="444" y="10" width="284" height="293" frameX="-7" frameY="-2" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash green 10003" x="10" y="313" width="291" height="303"/>
<SubTexture name="note splash green 20000" x="311" y="313" width="202" height="211" frameX="-69" frameY="-68" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash green 20001" x="523" y="313" width="235" height="240" frameX="-47" frameY="-45" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash green 20002" x="10" y="626" width="298" height="315" frameX="-9" frameY="-6" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash green 20003" x="318" y="626" width="315" height="321"/>
<SubTexture name="note splash purple 10000" x="10" y="10" width="194" height="186" frameX="-47" frameY="-57" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash purple 10001" x="214" y="10" width="220" height="218" frameX="-31" frameY="-34" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash purple 10002" x="444" y="10" width="284" height="293" frameX="-7" frameY="-2" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash purple 10003" x="10" y="313" width="291" height="303"/>
<SubTexture name="note splash purple 20000" x="311" y="313" width="202" height="211" frameX="-69" frameY="-68" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash purple 20001" x="523" y="313" width="235" height="240" frameX="-47" frameY="-45" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash purple 20002" x="10" y="626" width="298" height="315" frameX="-9" frameY="-6" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash purple 20003" x="318" y="626" width="315" height="321"/>
<SubTexture name="note splash red 10000" x="10" y="10" width="194" height="186" frameX="-47" frameY="-57" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash red 10001" x="214" y="10" width="220" height="218" frameX="-31" frameY="-34" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash red 10002" x="444" y="10" width="284" height="293" frameX="-7" frameY="-2" frameWidth="291" frameHeight="303"/>
<SubTexture name="note splash red 10003" x="10" y="313" width="291" height="303"/>
<SubTexture name="note splash red 20000" x="311" y="313" width="202" height="211" frameX="-69" frameY="-68" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash red 20001" x="523" y="313" width="235" height="240" frameX="-47" frameY="-45" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash red 20002" x="10" y="626" width="298" height="315" frameX="-9" frameY="-6" frameWidth="315" frameHeight="321"/>
<SubTexture name="note splash red 20003" x="318" y="626" width="315" height="321"/>
</TextureAtlas>
Binary file modified assets/images/pixelUI/NOTE_assets.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/pixelUI/NOTE_assetsENDS.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions source/Main.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ import haxe.io.Path;

#if linux
@:cppInclude('./external/gamemode_client.h')
@:cppFileCode('
#define GAMEMODE_AUTO
')
@:cppFileCode('#define GAMEMODE_AUTO')
#end

class Main extends Sprite
Expand Down Expand Up @@ -177,6 +175,8 @@ class Main extends Sprite
if (FlxG.sound.music != null)
FlxG.sound.music.stop();

FlxG.sound.play(Paths.sound('crash'));

DiscordClient.shutdown();

Lib.application.window.alert(msg + '\n\nIf you think this shouldn\'t have happened, report this error to GitHub repository! Please? Thanks :)\nhttps://github.com/Joalor64GH/Joalor64-Engine-Rewrite/issues', 'Error!');
Expand Down
Loading

0 comments on commit d9d0efe

Please sign in to comment.