last commit for today

Project.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
 
-	<!-- _________________________ Application Settings _________________________ -->
+	<!-- [ Application Settings ] -->
 
 	<app title="Rhythmo" file="Rhythmo" main="Main" version="0.2.5" company="Joalor64" />
 
-	<!-- ____________________________ Window Settings ___________________________ -->
+	<!-- [ Window Settings ]  -->
 
 	<window width="1280" height="720" fps="60" background="#000000" hardware="true" vsync="false" />
 	<window if="desktop" orientation="landscape" fullscreen="false" resizable="true" />
 	<window if="mobile" orientation="landscape" fullscreen="true" width="0" height="0" />
 
-	<!-- _____________________________ Path Settings ____________________________ -->
+	<!-- [ Path Settings ] -->
 
 	<set name="BUILD_DIR" value="export/debug" if="debug" />
 	<set name="BUILD_DIR" value="export/release" unless="debug" />
 
 	<source path="source" />
 	<assets path="assets" />
 
-	<!-- _______________________________ Libraries ______________________________ -->
+	<!-- [ Libraries ] -->
 
 	<haxelib name="flixel" />
 	<haxelib name="flixel-addons" />
@@ -31,22 +31,32 @@
 	<haxelib name="hscript" />
 	<haxelib name="hxcpp-debug-server" if="desktop debug" />
 
-	<!-- ______________________________ Haxedefines _____________________________ -->
+	<!-- [ Defines ] -->
 
 	<haxedef name="FLX_RECORD" />
 	<haxedef name="FLX_NO_MOUSE" if="mobile" />
 	<haxedef name="FLX_NO_KEYBOARD" if="mobile" />
 	<haxedef name="FLX_NO_TOUCH" if="desktop" />
 	<haxedef name="FLX_NO_DEBUG" unless="debug" />
 	<haxedef name="NAPE_RELEASE_BUILD" unless="debug" />
+	<haxedef name="HXCPP_CHECK_POINTER" if="desktop release" />
+	<haxedef name="HXCPP_STACK_LINE" if="desktop release" />
+	<haxedef name="HXCPP_STACK_TRACE" if="desktop release" />
+	<haxedef name="HXCPP_GC_BIG_BLOCKS" />
+
+	<haxedef name="no-deprecation-warnings" />
+	<haxedef name="message.reporting" value="pretty" />
+
+	<!-- [ Flags ] -->
 
 	<haxeflag name="--macro" value="allowPackage('flash')" />
 	<haxeflag name="--macro" value="include('my.pack')" />
 
-	<haxedef name="no-deprecation-warnings" />
-	<haxedef name="message.reporting" value="pretty" />
+	<!-- [ Icons ] -->
+
+	<icon path="icon.png" />
 
-	<!-- _________________________________ Miscellaneous _______________________________ -->
+	<!-- [ Miscellaneous ] -->
 
 	<target id="haxe" tool="linker" if="linux">
 		<lib name="/usr/lib64/libX11.so" if="HXCPP_M64" /> <!-- linux support -->

assets/data/songList.json

@@ -1,5 +1,5 @@
 {
     "songs": [
-        {"name": "Test", "diff": "Easy"}
+        {"name": "Test", "diff": "★★"}
     ]
 }

source/states/ControlsState.hx

@@ -16,7 +16,7 @@ class ControlsState extends ExtendableState {
 		add(bg);
 
 		var grid:CustomBackdrop = new CustomBackdrop(FlxGridOverlay.createGrid(80, 80, 160, 160, true, 0x33FFFFFF, 0x0));
-        grid.velocity.set(40, 0);
+        grid.velocity.set(40, 40);
         grid.setOscillation(2, 10);
         add(grid);
 

source/states/MenuState.hx

@@ -12,7 +12,7 @@ class MenuState extends ExtendableState {
 		add(bg);
 
 		var grid:CustomBackdrop = new CustomBackdrop(FlxGridOverlay.createGrid(80, 80, 160, 160, true, 0x33FFFFFF, 0x0));
-        grid.velocity.set(40, 0);
+        grid.velocity.set(40, 40);
         grid.setOscillation(2, 10);
         add(grid);
 
@@ -63,6 +63,11 @@ class MenuState extends ExtendableState {
 				});
 			}
 		}
+
+		if (Input.is("exit")) {
+			ExtendableState.switchState(new TitleState());
+			FlxG.sound.play(Paths.sound('cancel'));
+		}
 	}
 
 	function changeSelection(change:Int = 0) {

source/states/OptionsState.hx

@@ -25,7 +25,7 @@ class OptionsState extends ExtendableState {
 		add(bg);
 
 		var grid:CustomBackdrop = new CustomBackdrop(FlxGridOverlay.createGrid(80, 80, 160, 160, true, 0x33FFFFFF, 0x0));
-        grid.velocity.set(40, 0);
+        grid.velocity.set(40, 40);
         grid.setOscillation(2, 10);
         add(grid);
 

source/states/PlayState.hx

@@ -376,7 +376,7 @@ class PlayState extends ExtendableState {
 			return false;
 		}
 		ExtendableState.switchState(new SongSelectState());
-		FlxG.sound.playMusic(Paths.music('Basically_Professionally_Musically'));
+		FlxG.sound.playMusic(Paths.music('Basically_Professionally_Musically'), 0.75);
 		HighScore.saveScore(song.song, score);
 		canPause = false;
 		return true;

source/states/SongSelectState.hx

@@ -83,15 +83,15 @@ class SongSelectState extends ExtendableState {
 		titleTxt.screenCenter(X);
 		add(titleTxt);
 
-        var arrowL:FlxSprite = new FlxSprite(-FlxG.width + 280, 0).loadGraphic(Paths.image('selector/arrow'));
+        var arrowL:FlxSprite = new FlxSprite(-FlxG.width + 280, FlxG.height / 2).loadGraphic(Paths.image('selector/arrow'));
         arrowL.scrollFactor.set();
-        arrowL.screenCenter(X);
+        arrowL.scale.set(0.5, 0.5);
         arrowL.flipX = true;
         add(arrowL);
 
-        var arrowR:FlxSprite = new FlxSprite(FlxG.width - 280, 0).loadGraphic(Paths.image('selector/arrow'));
+        var arrowR:FlxSprite = new FlxSprite(FlxG.width - 280, FlxG.height / 2).loadGraphic(Paths.image('selector/arrow'));
         arrowR.scrollFactor.set();
-        arrowR.screenCenter(X);
+        arrowR.scale.set(0.5, 0.5);
         add(arrowR);
 
         changeSelection();
@@ -116,6 +116,7 @@ class SongSelectState extends ExtendableState {
         if (Input.is("accept")) {
             PlayState.song = Song.loadSongfromJson(Paths.formatToSongPath(songListData.songs[currentIndex].name));
             ExtendableState.switchState(new PlayState());
+            FlxG.sound.music.stop();
         }
     }
 

source/states/TitleState.hx

@@ -7,13 +7,13 @@ class TitleState extends ExtendableState {
 		super.create();
 
         FlxG.mouse.visible = true;
-		FlxG.sound.playMusic(Paths.music('Basically_Professionally_Musically'));
+		FlxG.sound.playMusic(Paths.music('Basically_Professionally_Musically'), 0.75);
 
 		var bg:FlxSprite = new FlxSprite().loadGraphic(Paths.image('title/title_bg'));
 		add(bg);
 
         var grid:CustomBackdrop = new CustomBackdrop(FlxGridOverlay.createGrid(80, 80, 160, 160, true, 0x33FFFFFF, 0x0));
-        grid.velocity.set(40, 0);
+        grid.velocity.set(40, 40);
         grid.setOscillation(2, 10);
         add(grid);
 
@@ -28,8 +28,7 @@ class TitleState extends ExtendableState {
 
 		FlxTween.tween(logo, {y: logo.y + 50}, 0.6, {ease: FlxEase.quadInOut, type: PINGPONG});
 
-        new FlxTimer().start(0.01, (timer) ->
-        {
+        new FlxTimer().start(0.01, (tmr:FlxTimer) -> {
             if (logo.angle == -4)
                 FlxTween.angle(logo, logo.angle, 4, 4, {ease: FlxEase.quartInOut});
             if (logo.angle == 4)