Skip to content

Commit

Permalink
Merge pull request #17 from Hackx2/experimental
Browse files Browse the repository at this point in the history
v1.5.2
  • Loading branch information
Hackx2 committed May 7, 2023
2 parents 2faf1e5 + 4005c51 commit 502019a
Show file tree
Hide file tree
Showing 157 changed files with 47,484 additions and 490 deletions.
13 changes: 0 additions & 13 deletions Modding.md

This file was deleted.

50 changes: 24 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,37 @@
# Friday Night Funkin' • ```Psy Engine```
Psych Engine made by Shadow Mario • Yoshubs • RiverOaken
<div align="center">
<img src="art/psyshit/512-modified.png" width="100" height="100"/>
<br>
<h1>Friday Night Funkin' • <code>Psy Engine</code> (<strong>Beta</strong>)</h1>
<br>
<img src="https://img.shields.io/github/forks/Hackx2/FNF-PsyEngine?style=for-the-badge" />
<img src="https://img.shields.io/github/license/Hackx2/FNF-PsyEngine?style=for-the-badge" />
<img src="https://img.shields.io/github/actions/workflow/status/Hackx2/FNF-PsyEngine/main.yml?style=for-the-badge" />
<br>
<br>UPDATE HAXE TO 4.2.5 rn NOW BOIII<br><br>

Hello, this is a modified version of the **Psych Engine** that includes events and functions missing from the original engine.

## Installation:
You must have [the most up-to-date version of Haxe](https://haxe.org/download/), seriously, stop using 4.1.5, it misses some stuff.

open up a Command Prompt/PowerShell or Terminal, type `haxelib install hmm`

after it finishes, simply type `haxelib run hmm install` in order to install all the needed libraries for *Psych Engine!*
after it finishes, simply type `haxelib run hmm install` in order to install all the needed libraries for _Psych Engine!_

## Customization:
---

if you wish to disable things like *Lua Scripts* or *Video Cutscenes*, you can read over to `Project.xml`
<h2>Credits:</h2>

inside `Project.xml`, you will find several variables to customize Psych Engine to your liking
**[HackTheAir](https://twitter.com/AnimatesHack)** - Main **Programmer**

to start you off, disabling Videos should be simple, simply Delete the line `"VIDEOS_ALLOWED"` or comment it out by wrapping the line in XML-like comments, like this `<!-- YOUR_LINE_HERE -->`
---

same goes for *Lua Scripts*, comment out or delete the line with `LUA_ALLOWED`, this and other customization options are all available within the `Project.xml` file
<h2>Psych Engine Credits::</h2>

## Credits:
* [HackTheAir](https://twitter.com/AnimatesHack) - Main Programmer
**Shadow Mario** - Main **Programmer**<br>
**RiverOaken** - Artist<br>
**Yoshubs** - Assistant **Programmer**<br>
**bbpanzu** - Ex-**Programmer**<br>

## Psych Engine Credits:
* Shadow Mario - Main Programmer
* RiverOaken - Artist
* Yoshubs - Assistant Programmer
---

### Special Thanks
* bbpanzu - Ex-Programmer
* Yoshubs - New Input System
* SqirraRNG - Crash Handler and Base code for Chart Editor's Waveform
* KadeDev - Fixed some cool stuff on Chart Editor and other PRs
* iFlicky - Composer of Psync and Tea Time, also made the Dialogue Sounds
* PolybiusProxy - .MP4 Video Loader Library (hxCodec)
* Keoiki - Note Splash Animations
* Smokey - Sprite Atlas Support
* Nebula the Zorua - LUA JIT Fork and some Lua reworks
_____________________________________
</div>
3 changes: 3 additions & 0 deletions Setup.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
go to ```source/psy/Core.hx``` and edit the ```coreGame``` var!

yeah Yeah i'll update this later!!
9 changes: 0 additions & 9 deletions UPDATE HAXE TO 4.2.4.txt

This file was deleted.

Binary file added art/psyshit/500.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 art/psyshit/500xOG.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 art/psyshit/512-modified.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 art/psyshit/512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
574 changes: 573 additions & 1 deletion assets/preload/data/blammed/blammed-easy.json

Large diffs are not rendered by default.

769 changes: 768 additions & 1 deletion assets/preload/data/blammed/blammed-hard.json

Large diffs are not rendered by default.

638 changes: 637 additions & 1 deletion assets/preload/data/blammed/blammed.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/preload/data/bopeebo/bopeebo-easy.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"song": {
"player1": "bf",
"songColor": "0xFF6807B2",
"notes": [
{
"sectionNotes": [
Expand Down
Loading

0 comments on commit 502019a

Please sign in to comment.