Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 7884cc9
Author: JordanSantiagoYT <jordan.doesosu2@gmail.com>
Date:   Thu Oct 17 22:54:48 2024 -0400

    peak

commit 3218c6c
Author: JordanSantiagoYT <jordan.doesosu2@gmail.com>
Date:   Thu Oct 17 22:51:33 2024 -0400

    prep 1.36.0 for release

commit bb71073
Author: UltimateQuack <patoflamejantetv@gmail.com>
Date:   Thu Oct 17 14:14:59 2024 -0300

    javascript

    // secret

commit 552ebaf
Author: UltimateQuack <flamejantepato77@gmail.com>
Date:   Thu Oct 17 14:09:17 2024 -0300

    javascript enigne secret

commit 318a775
Author: UltimateQuack <flamejantepato77@gmail.com>
Date:   Thu Oct 17 14:06:22 2024 -0300

    Funni

commit 2313dc9
Author: UltimateQuack <patoflamejantetv@gmail.com>
Date:   Thu Oct 17 13:55:01 2024 -0300

    Added an PULL_REQUEST_TEMPLATE for enhancement pull requests

    https://github.com/corecathx/FNF-CDEV-Engine/blob/master/.github/PULL_REQUEST_TEMPLATE/enhancement.md

commit b806abd
Author: UltimateQuack <patoflamejantetv@gmail.com>
Date:   Thu Oct 17 13:54:00 2024 -0300

    Added an PULL_REQUEST_TEMPLATE for bugfixing pull requests

    https://github.com/corecathx/FNF-CDEV-Engine/blob/master/.github/PULL_REQUEST_TEMPLATE/bug.md

commit 3cf606e
Author: UltimateQuack <patoflamejantetv@gmail.com>
Date:   Thu Oct 17 13:50:33 2024 -0300

    Added some links and some markdown things to README.md

commit bf51d30
Author: JordanSantiagoYT <jordan.doesosu2@gmail.com>
Date:   Thu Oct 17 01:27:20 2024 -0400

    add blockHit for unspawnNotes

commit 035fb11
Author: JordanSantiagoYT <jordan.doesosu2@gmail.com>
Date:   Wed Oct 16 21:06:03 2024 -0400

    my brain might need to be fixed

commit c598d2b
Author: UltimateQuack <patoflamejantetv@gmail.com>
Date:   Wed Oct 16 21:53:42 2024 -0300

    Shields.io badges

    I love these badges
  • Loading branch information
JordanSantiagoYT committed Oct 18, 2024
1 parent b85070a commit 1f1445b
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 7 deletions.
10 changes: 10 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Bug Fix
about: Fix a bug or critical performance issue
title: 'Bug Fix: '
labels: bug
---
#### Please check for duplicates or similar PRs before creating this issue.
## Does this PR close any issue(s)? If so, link them below.

## Briefly describe the issue(s) fixed.
10 changes: 10 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/enhancement.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Enhancement
about: Add a new feature
title: 'Enhancement: '
labels: enhancement
---
#### Please check for duplicates or similar PRs before creating this issue.
## Does this PR close any issue(s)? If so, link them below.

## What do your change(s) add, and why should they be implemented?
Binary file added assets/splash/images/JavaScriptLogo.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 assets/splash/sounds/tada.ogg
Binary file not shown.
2 changes: 1 addition & 1 deletion source/MainMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ using StringTools;

class MainMenuState extends MusicBeatState
{
public static var psychEngineJSVersion:String = '1.35.0'; //This is also used for Discord RPC
public static var psychEngineJSVersion:String = '1.36.0'; //This is also used for Discord RPC
public static var psychEngineVersion:String = '0.6.3'; //This is also used for Discord RPC
public static var curSelected:Int = 0;

Expand Down
5 changes: 3 additions & 2 deletions source/MusicBeatState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,6 @@ class MusicBeatState extends FlxUIState
if (oldStep != curStep && curStep > 0)
{
stepHit();
if (curStep % 4 == 0)
beatHit(); //troll mode no longer breaks beats

if(PlayState.SONG != null)
{
Expand Down Expand Up @@ -283,6 +281,9 @@ class MusicBeatState extends FlxUIState
stage.curDecStep = curDecStep;
stage.stepHit();
});

if (curStep % 4 == 0)
beatHit();
}

//runs whenever the game hits a beat
Expand Down
4 changes: 3 additions & 1 deletion source/Note.hx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ typedef PreloadedChartNote = {
multSpeed:Float,
noteDensity:Float,
ignoreNote:Bool,
lowPriority:Bool,
blockHit:Bool,
lowPriority:Bool
}

typedef NoteSplashData = {
Expand Down Expand Up @@ -604,6 +605,7 @@ class Note extends FlxSprite
missHealth = chartNoteData.missHealth;
hitCausesMiss = chartNoteData.hitCausesMiss;
ignoreNote = chartNoteData.ignoreNote;
blockHit = chartNoteData.blockHit;
multSpeed = chartNoteData.multSpeed;
noteDensity = chartNoteData.noteDensity;

Expand Down
2 changes: 1 addition & 1 deletion source/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -5772,7 +5772,7 @@ class PlayState extends MusicBeatState

if (Conductor.songPosition > noteKillOffset + daNote.strumTime)
{
if (daNote.mustPress && (!(cpuControlled || usingBotEnergy && strumsHeld[daNote.noteData]) || cpuControlled) && !daNote.ignoreNote && !endingSong && !daNote.wasGoodHit) {
if (daNote.mustPress && (!(cpuControlled || usingBotEnergy && strumsHeld[daNote.noteData]) || cpuControlled) && !daNote.ignoreNote && !daNote.blockHit && !endingSong && !daNote.wasGoodHit) {
noteMiss(daNote);
if (ClientPrefs.missSoundShit)
{
Expand Down
12 changes: 10 additions & 2 deletions source/StartupState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class StartupState extends MusicBeatState
var logo:FlxSprite;
var skipTxt:FlxText;

var maxIntros:Int = 2;
var maxIntros:Int = 3;

override public function create():Void
{
Expand Down Expand Up @@ -69,6 +69,14 @@ class StartupState extends MusicBeatState
logo.screenCenter();
FlxTween.tween(logo, {alpha: 1, "scale.x": 1, "scale.y": 1}, 1.35, {ease: FlxEase.expoOut, onComplete: _ -> onIntroDone(0.6)});
case 3:
// secret muaahahhahhahaahha
FlxG.sound.play(Paths.sound('tada', 'splash'));
logo.loadGraphic(Paths.image('JavaScriptLogo', 'splash'));
logo.scale.set(0.1,0.1);
logo.updateHitbox();
logo.screenCenter();
FlxTween.tween(logo, {alpha: 1, "scale.x": 1, "scale.y": 1}, 1.35, {ease: FlxEase.expoOut, onComplete: _ -> onIntroDone(0.6)});
case 4:
#if VIDEOS_ALLOWED
var vidSprite = new MP4Handler(); // it plays but it doesn't show???
#if (hxCodec < "3.0.0")
Expand All @@ -87,7 +95,7 @@ class StartupState extends MusicBeatState
});
#end
#end
case 4:
case 5:
#if VIDEOS_ALLOWED
var vidSprite = new MP4Handler(); // it plays but it doesn't show???
#if (hxCodec < "3.0.0")
Expand Down
1 change: 1 addition & 0 deletions source/editors/ChartingState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -1347,6 +1347,7 @@ class ChartingState extends MusicBeatState
saveUndo(_song); //I don't even know why.

for(i in 0...value) {
if (_song.notes[curSec + 1] == null) addSection(getSectionBeats());
changeSection(curSec+1);
for (note in _song.notes[curSec-1].sectionNotes)
{
Expand Down

1 comment on commit 1f1445b

@LilyRoss19
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JordanSantiagoYT use github desktop, switch ur branch to mobile, update from origin/main, push and switch to main instead; it's better tbh

Please sign in to comment.