Skip to content

Commit

Permalink
agony and tragedy for entities and cavities,
Browse files Browse the repository at this point in the history
apathy, an apogee for rapidly gone sanities,
fantasy, reality, uncanny low mentalities,
vanity, depravity, fallacy, eternity
  • Loading branch information
Joalor64GH authored Jun 12, 2024
1 parent 2543cab commit 23b4664
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 11 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ You can check planned/upcoming features [here](/TODO).
* [steve-studios](https://github.com/steve-studios) - In-Game Mod Downloader
* [TheZoroForce240](https://github.com/TheZoroForce240) - Modcharting Tools Haxelib
* [MAJigsaw77](https://github.com/MAJigsaw77) - ToastCore
* [KookerFoxYT](https://twitter.com/kookerfoxyt) - Old Custom Options
* [NexIsDumb](https://linktr.ee/just_nex) - New Custom Options
* [KookerFoxYT](https://twitter.com/kookerfoxyt) - Some code I borrowed
* [NexIsDumb](https://linktr.ee/just_nex) - Custom Options
* [Endergreen12](https://github.com/Endergreen12) - Custom Gameplay Changers
* [Verwex](https://github.com/Verwex) - Mic'd Up Paths System
* [ActualMandM](https://linktr.ee/ActualMandM) - RGB Note Coloring System
Expand Down
2 changes: 2 additions & 0 deletions TODO
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[NEXT UPDATE]
- Week 8 (or Weekend 1, whatever)
- Custom Noteskins/Notesplashes
- Subtitles Event
- Freeplay Search Bar
Expand All @@ -8,6 +9,7 @@
- Add option for camera movement idk
- Add data for languages
- Fix Credits Editor
- Social Credit Check

[HIGH PRIORITY]
- Localization Support (basically done, but need to add data for languages)
Expand Down
Binary file added assets/images/credits/ender.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 modified assets/images/credits/mag.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/images/credits/mandm.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/images/credits/neo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions source/meta/state/CreditsState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,14 @@ class CreditsState extends MusicBeatState
['Bot 404', 'bot', 'Tiny little helper, Drew his own icon\n"expected more"', 'https://www.youtube.com/channel/UC9ntkZ4Nz3AVKrAnderJnOg', 'FF0040', 'slipperyahhfloor'],
[''],
['Special Thanks'],
['crowplexus', 'crowplexus', 'Customizable Main Menu with .JSON, Old Latin Support\nCredits Sounds\n"just happy to be here!"', 'https://github.com/crowplexus', 'a1a1a1', 'Ghost'],
['TahirKarabekiroglu', 'tahir', 'SScript\nFunkin Cocoa Code\nSoftcoded Achievements, Replay System', 'https://github.com/TahirKarabekiroglu', 'A04397', ''],
['steve-studios', 'mag', 'In-Game Mod Downloader', 'https://github.com/steve-studios', '0000FF', 'squeak'],
['TheZoroForce240', 'zoro', 'Modcharting Tools Haxelib', 'https://github.com/TheZoroForce240', 'FFD900', 'goofyahhphone'],
['MAJigsaw77', 'jigsaw', 'ToastCore\n"Just a guy"', 'https://github.com/MAJigsaw77', '444444', ''],
['CharlesCatYT', 'charles', 'Some code I borrowed\n"your local code steale- i mean fnf haxe coder"', 'https://github.com/CharlesCatYT', '00B0B4', ''],
['Endergreen12', 'none', 'Custom Gameplay Changers', 'https://github.com/Endergreen12', '00C834', ''],
['NexIsDumb', 'neo', 'Custom Options\n"Who the fuck is breathing inside my walls"', 'https://github.com/NexIsDumb', '7D485C', ''],
['Endergreen12', 'ender', 'Custom Gameplay Changers', 'https://github.com/Endergreen12', '00C834', ''],
['Verwex', 'verwex', 'Micd Up Paths System\n"hell"', 'https://github.com/Verwex', '8FFFFF', ''],
['ActualMandM', 'none', 'RGB Note Coloring System', 'https://linktr.ee/ActualMandM', '9C5D88', ''],
['ActualMandM', 'mandm', 'RGB Note Coloring System', 'https://linktr.ee/ActualMandM', '9C5D88', ''],
['You', 'face', 'For playing :)', 'https://joalor64.itch.io/', '7E00FF', 'stolethisfromGamerEnginelol'],
[''],
['Psych Engine Team'],
Expand All @@ -82,6 +81,8 @@ class CreditsState extends MusicBeatState
['Engine Contributors'],
['iFlicky', 'flicky', 'Composer of Psync and Tea Time\nMade the Dialogue Sounds', 'https://twitter.com/flicky_i', '9E29CF', ''],
['gedehari', 'sqirra', 'Crash Handler and Base code for\nChart Editor\'s Waveform', 'https://twitter.com/gedehari', 'E1843A', ''],
['crowplexus', 'crowplexus', 'Customizable Main Menu with .JSON, Old Latin Support\nCredits Sounds\n"just happy to be here!"', 'https://github.com/crowplexus', 'a1a1a1', 'Ghost'],
['TahirKarabekiroglu', 'tahir', 'SScript\nFunkin Cocoa Code\nSoftcoded Achievements, Replay System', 'https://github.com/TahirKarabekiroglu', 'A04397', ''],
['EliteMasterEric', 'mastereric', 'Runtime Shaders support', 'https://twitter.com/EliteMasterEric', 'FFBD40', ''],
['PolybiusProxy', 'proxy', 'Creator of hxCodec', 'https://twitter.com/polybiusproxy', 'DCD294', ''],
['KadeDev', 'kade', 'Fixed Chart Editor and other PRs\nExtension WebM Fork', 'https://twitter.com/kade0912', '64A250', ''],
Expand Down
4 changes: 0 additions & 4 deletions source/meta/video/CutsceneHandler.hx
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
package meta.video;

import flixel.graphics.atlas.FlxAtlas;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.sound.FlxSound;

import animateatlas.AtlasFrameMaker;

class CutsceneHandler extends FlxBasic
{
Expand Down
1 change: 1 addition & 0 deletions source/meta/video/VideoState.hx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package meta.video;

// CAN BE USED ANYWHERE
class VideoState extends MusicBeatState
{
var leSource:String = "";
Expand Down
1 change: 1 addition & 0 deletions source/meta/video/VideoSubState.hx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package meta.video;

// SHOULD ONLY BE USED IN PLAYSTATE
class VideoSubState extends MusicBeatSubstate
{
var leSource:String = "";
Expand Down
3 changes: 2 additions & 1 deletion source/minigames/KillBF.hx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class KillBF extends MusicBeatState
bg.screenCenter();
add(bg);

scoreText = new FlxText(0, (FlxG.height * 0.89) + 36, FlxG.height, 'Score: ${score} // Misses: ${misses}', 20);
scoreText = new FlxText(0, (FlxG.height * 0.89) + 36, FlxG.height, 'Score: $score // Misses: $misses', 20);
scoreText.setFormat(Paths.font('vcr.ttf'), 48, FlxColor.WHITE, FlxTextAlign.CENTER, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
scoreText.screenCenter(X);
add(scoreText);
Expand Down Expand Up @@ -71,6 +71,7 @@ class KillBF extends MusicBeatState
{
var sprite:FallingIcon = new FallingIcon(FlxG.random.int(0, FlxG.width - 20), -100);
sprite.velocity.y = FlxG.random.int(80, 160);
sprite.flipX = FlxG.random.bool(50);
beef.push(sprite);
add(sprite);
}
Expand Down

0 comments on commit 23b4664

Please sign in to comment.