Merge pull request FunkinCrew#3 from KadeDev/master

uptodate merge

.github/ISSUE_TEMPLATE/bug.md

@@ -3,13 +3,11 @@ name: Bug Report
 about: Report a bug or critical performance issue
 title: 'Bug Report: '
 labels: bug
+assignees: ''
+
 ---
-#### Please check for duplicates or similar issues, as well performing simple troubleshooting steps (such as clearing cookies, clearing AppData, trying another browser) before submitting an issue.
-### If you are playing the game in a browser, what site are you playing it from?
-[Newgrounds](https://www.newgrounds.com/portal/view/770371) or [Itch.io](https://ninja-muffin24.itch.io/funkin)? Specify below.
 
-### If you are playing the game in a browser, what browser are you using?
-Chrome (or a Chromium based browser, i.e. Edge, Opera, etc.), Firefox, or Safari? Specify blow.
+#### Please check for duplicates, similar issues or closed issues with the same problem, as well performing simple troubleshooting steps (such as deleting the export folder if it's an issue with compiling, reinstalling Kade Engine) before submitting an issue.
 
 ### If you are playing a downloaded version of the game, what operating system are you using?
 Windows (`x86`), Windows (`x86_64`), Linux, or macOS? Specify below.

.github/ISSUE_TEMPLATE/enhancement.md

@@ -3,6 +3,9 @@ name: Enhancement
 about: Suggest a new feature
 title: 'Enhancement: '
 labels: enhancement
+assignees: ''
+
 ---
+
 #### Please check for duplicates or similar issues before creating this issue.
 ## What is your suggestion, and why should it be implemented?

.gitignore

@@ -1,3 +1,2 @@
 export/
 .vscode/
-APIStuff.hx

BUILDING.md

@@ -0,0 +1,66 @@
+# Building Friday Night Funkin': Kade Engine
+
+**Please note** that these instructions are for compiling/building the game. If you just want to play Kade Engine, **play in your browser or download a build instead**: **[play in browser](https://funkin.puyo.xyz) ⋅ [latest stable release](https://github.com/KadeDev/Kade-Engine/releases/latest) ⋅ [latest development build (windows)](https://ci.appveyor.com/project/KadeDev/kade-engine-windows/build/artifacts) ⋅ [latest development build (linux)](https://ci.appveyor.com/project/daniel11420/kade-engine-linux/build/artifacts)**. If you want to build the game yourself, continue reading.
+
+**Also note**: you should be familiar with the commandline. If not, read this [quick guide by ninjamuffin](https://ninjamuffin99.newgrounds.com/news/post/1090480).
+
+**Also also note**: To build for *Windows*, you need to be on *Windows*. To build for *Linux*, you need to be on *Linux*. Same goes for macOS. You can build for html5/browsers on any platform.
+
+## Dependencies
+ 1. [Install Haxe 4.1.5](https://haxe.org/download/version/4.1.5/). You should use 4.1.5 instead of the latest version because the latest version has some problems with Friday Night Funkin': Kade Engine.
+ 2. After installing Haxe, [Install HaxeFlixel](https://haxeflixel.com/documentation/install-haxeflixel/).
+ 3. Install `git`.
+	 - Windows: install from the [git-scm](https://git-scm.com/downloads) website.
+	 - Linux: install the `git` package: `sudo apt install git` (ubuntu), `sudo pacman -S git` (arch), etc... (you probably already have it)
+ 4. Install and set up the necessary libraries:
+	 - `haxelib install lime 7.9.0`
+	 - `haxelib install openfl`
+	 - `haxelib install flixel`
+	 - `haxelib run lime setup`
+	 - `haxelib run lime setup flixel`
+	 - `haxelib install flixel-tools`
+	 - `haxelib run flixel-tools setup`
+	 - `haxelib install flixel-addons`
+	 - `haxelib install flixel-ui`
+	 - `haxelib install hscript`
+	 - `haxelib install newgrounds`
+	 - `haxelib install linc_luajit`
+	 - `haxelib git faxe https://github.com/uhrobots/faxe`
+	 - `haxelib git polymod https://github.com/larsiusprime/polymod.git`
+	 - `haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc`
+### Windows-only dependencies (only for building *to* Windows. Building html5 on Windows does not require this)
+If you are planning to build for Windows, you also need to install **Visual Studio 2019**. While installing it, *don't click on any of the options to install workloads*. Instead, go to the **individual components** tab and choose the following:
+-   MSVC v142 - VS 2019 C++ x64/x86 build tools
+-   Windows SDK (10.0.17763.0)
+-   C++ Profiling tools
+-   C++ CMake tools for windows
+-   C++ ATL for v142 build tools (x86 & x64)
+-   C++ MFC for v142 build tools (x86 & x64)
+-   C++/CLI support for v142 build tools (14.21)
+-   C++ Modules for v142 build tools (x64/x86)
+-   Clang Compiler for Windows
+-   Windows 10 SDK (10.0.17134.0)
+-   Windows 10 SDK (10.0.16299.0)
+-   MSVC v141 - VS 2017 C++ x64/x86 build tools
+-   MSVC v140 - VS 2015 C++ build tools (v14.00)
+
+This will install about 22 GB of crap, but is necessary to build for Windows.
+
+### macOS-only dependencies (these are required for building on macOS at all, including html5.)
+If you are running macOS, you'll need to install Xcode. You can download it from the macOS App Store or from the [Xcode website](https://developer.apple.com/xcode/).
+
+If you get an error telling you that you need a newer macOS version, you need to download an older version of Xcode from the [More Software Downloads](https://developer.apple.com/download/more/) section of the Apple Developer website. (You can check which version of Xcode you need for your macOS version on [Wikipedia's comparison table (in the `min macOS to run` column)](https://en.wikipedia.org/wiki/Xcode#Version_comparison_table).)
+
+## Cloning the repository
+Since you already installed `git` in a previous step, we'll use it to clone the repository.
+1. `cd` to where you want to store the source code (i.e. `C:\Users\username\Desktop` or `~/Desktop`)
+2. `git clone https://github.com/KadeDev/Kade-Engine.git`
+3. `cd` into the source code: `cd Kade-Engine`
+4. (optional) If you want to build a specific version of Kade Engine, you can use `git checkout` to switch to it (i.e. `git checkout 1.4-KE`) (remember that versions 1.4 and older cannot build to Linux or HTML5)
+	- You should **not** do this if you are planning to contribute, as you should always be developing on the latest version.
+## Building
+Finally, we are ready to build.
+
+- Run `lime build <target>`, replacing `<target>` with the platform you want to build to (`windows`, `linux`, `html5`) (i.e. `lime build windows`)
+- The build will be in `Kade-Engine/export/<target>/bin`, with `<target>` being the target you built to in the previous step. (i.e. `Kade-Engine/export/windows/bin`)
+	- Only the `bin` folder is necessary to run the game. The other ones in `export/<target>` are not.

CHANGELOG.md

@@ -4,147 +4,152 @@ All notable changes will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [1.4.2]
 ### Changed
-- ASSET LOADING OVERHAUL, WAY FASTER LOAD TIMES ON WEB!!! (THANKS TO GEOKURELI WOKE KING)
-### Fixed
-- That one random note on Bopeebo
+- Trails on notes are more consistent
+- Title now shows "Friday Night Funkin' Kade Engine"
+- **THIS UPDATE WILL RESET YOUR SAVE FOR KADE ENGINE**, so you gotta redo all of ur settings.
+
+### Added
+- Lua Modchart support [(documentation located here)](https://github.com/KadeDev/Kade-Engine/blob/master/ModCharts.md)
+- New option called watermarks which removes all watermarks from Kade Engine
+- Chart spesfic offsets
 
-## [0.2.7.1] - 2021-02-14
+## [1.4.1]
+### Fixed
+- Rating's and Accuracy calculation (they actually work now)
+- Deleting notes
 ### Added
-- Easter eggs
-- readme's in desktop versions of the game
+- Accuracy mod toggle (complex = ms based, accurate = normal rating based. ex sick = 1, good = 0.75, bad = 0.50, shit = 0.25)
+- Judgement Selector (safe frames)
+
+## [1.4.1 Nightly2]
+### Fixed
+- Scroll Speed messing up hold note parts
+- Added caps for Safe Frames (so you couldn't break the game)
 ### Changed
+- Changed the fundamentals of how Ratings and other timing-related things like MS Acc are calculated.
+- and of course. hit window update
 
-- New icons, old one was placeholder since October woops!
-- Made the transitions between the story mode levels more seamless.
-- Offset of the Newgrounds logo on boot screen.
-- Made the changelog txt so it can be opened easier by normal people who don't have a markdown reader (most normal people);
+## [1.4.1 Nightly1]
 ### Fixed
-- Fixed crashes on Week 6 story mode dialogue if spam too fast ([Thanks to Lotusotho for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/357))
-- Should show intro credits on desktop versions of the game more consistently
-- Layering on Week 4 songs with GF and the LIMO LOL HOW TF I MISS THIS
-- Chart's and chart editor now support changeBPM, GOD BLESS MTH FOR THIS ONE I BEEN STRUGGLIN WIT THAT SINCE OCTOBER LMAO ([GOD BLESS MTH](https://github.com/ninjamuffin99/Funkin/pull/382))
-- Fixed sustain note trails ALSO THANKS TO MTH U A REAL ONE ([MTH VERY POWERFUL](https://github.com/ninjamuffin99/Funkin/pull/415))
-- Antialiasing on the skyscraper lights
-
-## [0.2.7] - 2021-02-02
+- Notes can be deleted
+- Hit window updates
+### Changed
+- FPS Cap can now go faster or slower depending on whether you are holding shift or not.
 ### Added
-- PIXEL DAY UPDATE LOL 1 WEEK LATER
-- 3 New songs by Kawaisprite!
-- COOL CUTSCENES
-- WEEK 6 YOYOYOYOY
-- Swaggy pixel art by Moawling!
+- Safe Frames (the ability to change your hit windows)
+
+## [1.4]
+### Edited
+- offsets work. fucking contributors
 ### Changed
-- Made it so you lose sliiiightly more health when you miss a note.
-- Removed the default HaxeFlixel pause screen when the game window loses focus, can get screenshots of the game easier hehehe
+- Updated Judgements to contrast better with each other.
+- Changed Auto Offset to use the tutorial chart instead of a custom one
+- The file in data called "freeplaySonglist.txt" is now fully used.
+- Song Position now works a lot better
+
+## [1.3.1 Nightly3]
+### Added
+- Auto Offset (Kinda works
+- CTRL-Z Support for the charter
+- NPS Display
 ### Fixed
-- Idle animation bug with BF christmas and BF hair blow sprites ([Thanks to Injourn for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/237))
+- You can delete notes
+- FPS No longer resets on changing screens
+- Some of the Rankings didn't work how they were supposed to, now they work.
 
-## [0.2.6] - 2021-01-20
+## [1.3.1 Nightly2]
 ### Added
-- 3 NEW CHRISTMAS SONGS. 2 BY KAWAISPRITE, 1 BY BASSETFILMS!!!!! BF WITH DRIP! SANTA HANGIN OUT!
-- Enemy icons change when they you are winning a lot ([Thanks to pahaze for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/138))
-- Holding CTRL in charting editor places notes on both sides
-- Q and E changes sustain lengths in note editor
-- Other charting editor workflow improvements
-- More hair physics
-- Heads appear at top of chart editor to help show which side ur charting for
+- Option Categories
+- FPS Cap Option
+- FPS Rainbow Toggle
+- Scroll Speed Option
 ### Changed
-- Tweaked code relating to inputs, hopefully making notes that are close together more fair to hit
-### Removed
-- Removed APE
+- Offset now allows you to hold down to change values
+- Rating hit windows update
 ### Fixed
-- Maybe fixed double notes / jump notes. Need to tweak it for balance, but should open things up for cooler charts in the future.
-- Old Verison popup screen weirdness ([Thanks to gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/155))
-- Song no longer loops when finishing the song. ([Thanks Injourn for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/132))
-- Screen wipe being cut off in the limo/mom stage. Should fill the whole screen now.
-- Boyfriend animations on hold notes, and pressing on repeating notes should behave differently
+- Tails being FUCKED
 
-## [0.2.5] - 2020-12-27
+## [1.3.1 Nightly]
 ### Added
-- MOMMY GF, 3 NEW ASS SONGS BY KAWAISPRITE, NEW ART BY PHANTOMARCADE,WOOOOOOAH!!!!
-- Different icons depending on which character you are against, art by EVILSK8R!!
-- Autosave to chart editor
-- Clear section button to note editor
-- Swap button in note editor
-- a new boot text or two
-- automatic check for when you're on an old version of the game! 
-### Changed
-- Made Spookeez on Normal easier.
-- Mouse is now visible in note editor
+- Gameplay Customization
+- The ability to change rating text's position
 ### Fixed
-- Crash when playing Week 3 and then playing a non-week 3 song
-- When pausing music at the start, it doesn't continue the song anyways. ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48))
-- IDK i think backing out of song menu should play main menu songs again hehe ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48))
+- You can now get a shit
+- Downscroll arrows are 100% fixed.
+### Redone
+- The rating system has been completely rewritten.
 
-## [0.2.4] - 2020-12-11
+## [1.3.1]
 ### Added
-- 3 NEW SONGS BY KAWAISPRITE. Pico, Philly, and Blammed.
-- NEW CHARACTER, PICO. Based off the classic Flash game "Pico's School" by Tom Fulp
-- NEW LEVEL WOW! PHILLY BABEEEE
+- Timing text in ms
 ### Changed
-- Made it less punishing to ATTEMPT to hit a note and miss, rather than let it pass you
+- Most UI elements now work based off the camera instead of real-world space (I.E combo, watermark, song bar, etc)
+- New Accuracy calculation (based off of Wife3 from Etterna a Stepmania Mod)
 ### Fixed
-- Song desync of you paused and unpaused frequently ([shoutouts SonicBlam](https://github.com/ninjamuffin99/Funkin/issues/37))
-- Animation offsets when GF is scared
+- Deleting notes
+- Misses due to the other player not hitting notes and thus it makes you miss because there wasn't a check. Now there is.
+- Downscroll tail ends being upside down.
 
-## [0.2.3] - 2020-12-04
+## [1.3]
 ### Added
-- More intro texts
+- Wife3 Accuracy System
+- Wife3 Ranking (Letter Grades/FC Conditions)
+- A Reset chart button on the song tab in the debug menu.
+- Pressing ALT when the note tab is open in the debug menu will allow you to write notes (by playing them, aka pressing DFJK/WASD/Arrow Keys) Press ALT again to toggle off.
+- Etterna Mode (by default this is off) Etterna Mode basicily puts all of the hit timings to Judgement 4. Which is harsher then the base game.
+### Tweaked
+- In the section tab (where it normally says 16) this now works. This is the sections length in steps. It allows you to chart 1/16,1/24,1/32 notes. etc etc.
+- The BPM stepper now allows you to go into decimals (ALLOWS FOR DECIMAL BPMS!!!!)
 ### Fixed
-- Exploit where you could potentially give yourself a high score via the debug menu
-- Issue/bug where you could spam the confirm button on the story menu ([shoutouts lotusotho for the CODE contribution/pull request!](https://github.com/ninjamuffin99/Funkin/pull/19))
-- Glitch where if you never would lose health if you missed a note on a fast song (shoutouts [MrDulfin](https://github.com/ninjamuffin99/Funkin/issues/10), [HotSauceBurritos](https://github.com/ninjamuffin99/Funkin/issues/13) and [LobsterMango](https://lobstermango.newgrounds.com))
-- Fixed tiny note bleed over thingies (shoutouts [lotusotho](https://github.com/ninjamuffin99/Funkin/pull/24))
+- Song Progress bar no longer clips into the strumline on upscroll on non-pixel charts.
+- Deleting notes now works
+- Kade Engine Watermark not showing on all charts.
 
-## [0.2.2] - 2020-11-20
+## [1.2.2]
 ### Added
-- Music playing on the freeplay menu.
-- UI sounds on freeplay menu
-- Score now shows mid-song.
-- Menu on pause screen! Can resume, and restart song, or go back to main menu.
-- New music made for pause menu!
+- A optional bar at the top (or bottom if you have downscroll) that shows the current progress of the song. By default this is turned off.
+- Discord Rich Presence (including accuracy, misses, and score)
+### Tweaked
+- How saving is handled and general code cleanup.
 
-### Changed
-- Moved all the intro texts to its own txt file instead of being hardcoded, this allows for much easier customization. File is in the data folder, called "introText.txt", follow the format in there and you're probably good to go!
-### Fixed
-- Fixed soft lock when pausing on song finish ([shoutouts gedehari](https://github.com/ninjamuffin99/Funkin/issues/15))
-- Think I fixed issue that led to in-game scores being off by 2 ([shoutouts Mike](https://github.com/ninjamuffin99/Funkin/issues/4))
-- Should have fixed the 1 frame note appearance thing. ([shoutouts Mike](https://github.com/ninjamuffin99/Funkin/issues/6))
-- Cleaned up some charting on South on hard mode
-- Fixed some animation timings, should feel both better to play, and watch. (shoutouts Dave/Ivan lol)
-- Animation issue where GF would freak out on the title screen if you returned to it([shoutouts MultiXIII](https://github.com/ninjamuffin99/Funkin/issues/12)).
-
-## [0.2.1.2] - 2020-11-06
+## [1.2.1]
 ### Fixed
-- Story mode scores not properly resetting, leading to VERY inflated highscores on the leaderboards. This also requires me to clear the scores that are on the leaderboard right now, sorry!
-- Difficulty on storymode and in freeplay scores
-- Hard mode difficulty on campaign levels have been fixed
+- Accuracy toggle now works
+### Tweaks
+- HP Drain Tweaks
+### Added
+- Anti-Mash
 
-## [0.2.1.1] - 2020-11-06
+## [1.2]
+### Minor fixes
+- Combo can now go above 999
+- Accuracy display is now togglable
 ### Fixed
-- Week 2 not unlocking properly
-
-## [0.2.1] - 2020-11-06
-### Added
-- Scores to the freeplay menu
-- A few new intro boot messages.
-- Lightning effect in Spooky stages
-- Campaign scores, can now compete on scoreboards for campaign!
-- Can now change difficulties in Freeplay mode
+- Controls now save and reload upon startup instead of just not loading.
+- Random misses no longer happen.
+- REMOVED THE RESET KEYBIND (POG)
 
-### Changed
-- Balanced out Normal mode for the harder songs(Dadbattle and Spookeez, not South yet). Should be much easier all around.
-- Put tutorial in it's own 'week', so that if you want to play week 1, you don't have to play the tutorial.
+## [1.1.3]
+quick patch
+### Fixed
+- random misses when not missing
+- monster's icon in freeplay
 
+## [1.1.2]
+ok i lied another release
 ### Fixed
-- One of the charting bits on South and Spookeez during the intro.
+- Misses not being counted
+- Replays just not at all attempting to work
+- Camera Zoom being WAYY too fast or slow
+- Healthbar in Downscroll not moving
 
-## [0.2.0] - 2020-11-01
-### Added
-- Uhh Newgrounds release lolol I always lose track of shit.
+## [1.1.1]
+Ok this should be the last 1.1.x release for awhile lol. My bad.
 
-## [0.1.0] - 2020-10-05
-### Added
-- Uh, everything. This the game's initial gamejam release. We put it out
+## [1.1]
+I'm really dumb lol
+
+## [1.0]
+Initial release poggers!