diff --git a/KadeEngineLogo.png b/KadeEngineLogo.png index 7a77f25..9279a4a 100644 Binary files a/KadeEngineLogo.png and b/KadeEngineLogo.png differ diff --git a/README.md b/README.md index 7464f0f..8b06cf5 100644 --- a/README.md +++ b/README.md @@ -1,61 +1,62 @@ -![Kade Engine logo](https://user-images.githubusercontent.com/26305836/110529589-4b4eb600-80ce-11eb-9c44-e899118b0bf0.png) - -[![AppVeyor](https://img.shields.io/appveyor/build/KadeDev/Kade-Engine-Windows?label=windows%20build)](https://ci.appveyor.com/project/KadeDev/kade-engine-windows/build/artifacts) [![AppVeyor](https://img.shields.io/appveyor/build/KadeDev/Kade-Engine-Macos?label=macOS%20build)](https://ci.appveyor.com/project/KadeDev/kade-engine-macos/build/artifacts) [![AppVeyor](https://img.shields.io/appveyor/build/KadeDev/Kade-Engine-Linux?label=linux%20build)](https://ci.appveyor.com/project/KadeDev/kade-engine-linux/build/artifacts) [![AppVeyor](https://img.shields.io/appveyor/build/daniel11420/KadeEngineWeb?label=html5&20build)](https://ci.appveyor.com/project/daniel11420/KadeEngineWeb) [![Discord](https://img.shields.io/discord/808039740464300104?label=discord)](https://discord.gg/MG6GQFh52U) [![GitHub issues](https://img.shields.io/github/issues/KadeDev/Kade-Engine)](https://github.com/KadeDev/Kade-Engine/issues) [![GitHub pull requests](https://img.shields.io/github/issues-pr/KadeDev/Kade-Engine)](https://github.com/KadeDev/Kade-Engine/pulls) []() []() - -![GitHub commits since latest release (by date)](https://img.shields.io/github/commits-since/KadeDev/Kade-Engine/latest) ![GitHub repo size](https://img.shields.io/github/repo-size/KadeDev/Kade-Engine) ![Lines of code](https://img.shields.io/tokei/lines/github/KadeDev/Kade-Engine) ![Supported platforms](https://img.shields.io/badge/supported%20platforms-windows%2C%20macOS%2C%20linux%2C%20html5-blue) ![GitHub all releases](https://img.shields.io/github/downloads/KadeDev/Kade-Engine/total) ![GitHub](https://img.shields.io/github/license/KadeDev/Kade-Engine) ![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/KadeDev/Kade-Engine?include_prereleases&label=latest%20version) - -# Friday Night Funkin': Kade Engine -## Friday Night Funkin' -**Friday Night Funkin'** is a rhythm game originally made for Ludum Dare 47 "Stuck In a Loop". - -Links: **[itch.io page](https://ninja-muffin24.itch.io/funkin) ⋅ [Newgrounds](https://www.newgrounds.com/portal/view/770371) ⋅ [source code on GitHub](https://github.com/ninjamuffin99/Funkin)** -> Uh oh! Your tryin to kiss ur hot girlfriend, but her MEAN and EVIL dad is trying to KILL you! He's an ex-rockstar, the only way to get to his heart? The power of music... - -## Kade Engine -**Kade Engine** is a mod for Friday Night Funkin', including a full engine rework, replays, and more. - -Links: **[GameBanana mod page](https://gamebanana.com/gamefiles/16761) ⋅ [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 (macOS)](https://ci.appveyor.com/project/KadeDev/kade-engine-macos/build/artifacts) ⋅ [latest development build (linux)](https://ci.appveyor.com/project/KadeDev/kade-engine-linux/build/artifacts)** - -**REMEMBER**: This is a **mod**. This is not the vanilla game and should be treated as a **modification**. This is not and probably will never be official, so don't get confused. - -## Website ([KadeDev.github.io/kade-engine/](https://KadeDev.github.io/Kade-Engine/)) -If you're looking for documentation, changelogs, or guides, you can find those on the Kade Engine website. - -# Previews ([skip](#features)) - -![Tutorial (Hard) on Downscroll](https://user-images.githubusercontent.com/15311104/113989685-fa5aea80-9850-11eb-9180-f5819a774c79.gif) ![Milf (Hard) on Downscroll](https://user-images.githubusercontent.com/15311104/113990845-2c208100-9852-11eb-8e6d-f1c9e8439871.gif) - -![Roses (Hard) on Upscroll](https://user-images.githubusercontent.com/15311104/113993573-e31dfc00-9854-11eb-82ae-1f29dc8a0b04.png) - -![Milf (Hard) on Downscroll](https://user-images.githubusercontent.com/15311104/113991654-f4660900-9852-11eb-8c3d-f3927571f19b.png) - -![He malding](https://user-images.githubusercontent.com/15311104/113993693-02b52480-9855-11eb-9975-eb8a7a1be8d1.png) - -![Free Play selection screen](https://i.imgur.com/LR0eWIC.png) - -![Options Menu](https://i.imgur.com/LBXW9C1.png) - -# Features - - - **New Input System** - - An improved input system, similar to Quaver or Etterna, with less delays, less dropped inputs and other improvements. - - **More information during gameplay** - - While you're playing, we show you information about how you're doing, such as your accuracy, combo break count, notes per second, and your grade/rating. - - **Customizable keybinds** - - Instead of being forced to use WASD and the arrow keys, you can customize the keybinds to any keys you want! - - **Replays** (in beta) - - Have you ever gotten a crazy score but didn't record? The replay system solves that: it automatically saves a "replay" of your gameplay every time you complete a song, which you can play back inside of the game. - - Replays just store information about what you're doing, they don't actually record the screen -- so they take up way less space on your disk than videos. - - **Audio offset** - - If your headphones are delayed, you can set an offset in the options menu to line the game up with the delay and play with synced audio like intended. - -# Credits -### Friday Night Funkin' - - [ninjamuffin99](https://twitter.com/ninja_muffin99) - Programming - - [PhantomArcade3K](https://twitter.com/phantomarcade3k) and [Evilsk8r](https://twitter.com/evilsk8r) - Art - - [Kawai Sprite](https://twitter.com/kawaisprite) - Music - -This game was made with love to Newgrounds and its community. Extra love to Tom Fulp. -### Kade Engine -- [KadeDeveloper](https://twitter.com/KadeDeveloper) - Maintainer and lead programmer -- [The contributors](https://github.com/KadeDev/Kade-Engine/graphs/contributors) + +![Kade Engine logo](assets/preload/images/KadeEngineLogo.png) + +[![AppVeyor](https://img.shields.io/appveyor/build/KadeDev/Kade-Engine-Windows?label=windows%20build)](https://ci.appveyor.com/project/KadeDev/kade-engine-windows/branch/master/artifacts) [![AppVeyor](https://img.shields.io/appveyor/build/KadeDev/Kade-Engine-Macos?label=macOS%20build)](https://ci.appveyor.com/project/KadeDev/kade-engine-macos/branch/master/artifacts) [![AppVeyor](https://img.shields.io/appveyor/build/KadeDev/Kade-Engine-Linux?label=linux%20build)](https://ci.appveyor.com/project/KadeDev/kade-engine-linux/branch/master/artifacts) [![AppVeyor](https://img.shields.io/appveyor/build/daniel11420/KadeEngineWeb?label=html5&20build)](https://ci.appveyor.com/project/daniel11420/KadeEngineWeb) [![Discord](https://img.shields.io/discord/808039740464300104?label=discord)](https://discord.gg/MG6GQFh52U) [![GitHub issues](https://img.shields.io/github/issues/KadeDev/Kade-Engine)](https://github.com/KadeDev/Kade-Engine/issues) [![GitHub pull requests](https://img.shields.io/github/issues-pr/KadeDev/Kade-Engine)](https://github.com/KadeDev/Kade-Engine/pulls) []() []() + +![GitHub commits since latest release (by date)](https://img.shields.io/github/commits-since/KadeDev/Kade-Engine/latest) ![GitHub repo size](https://img.shields.io/github/repo-size/KadeDev/Kade-Engine) ![Lines of code](https://img.shields.io/tokei/lines/github/KadeDev/Kade-Engine) ![Supported platforms](https://img.shields.io/badge/supported%20platforms-windows%2C%20macOS%2C%20linux%2C%20html5-blue) ![GitHub all releases](https://img.shields.io/github/downloads/KadeDev/Kade-Engine/total) ![GitHub](https://img.shields.io/github/license/KadeDev/Kade-Engine) ![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/KadeDev/Kade-Engine?include_prereleases&label=latest%20version) + +# Friday Night Funkin': Kade Engine +## Friday Night Funkin' +**Friday Night Funkin'** is a rhythm game originally made for Ludum Dare 47 "Stuck In a Loop". + +Links: **[itch.io page](https://ninja-muffin24.itch.io/funkin) ⋅ [Newgrounds](https://www.newgrounds.com/portal/view/770371) ⋅ [source code on GitHub](https://github.com/ninjamuffin99/Funkin)** +> Uh oh! Your tryin to kiss ur hot girlfriend, but her MEAN and EVIL dad is trying to KILL you! He's an ex-rockstar, the only way to get to his heart? The power of music... + +## Kade Engine +**Kade Engine** is a mod for Friday Night Funkin', including a full engine rework, replays, and more. + +Links: **[GameBanana mod page](https://gamebanana.com/gamefiles/16761) ⋅ [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/branch/master/artifacts) ⋅ [latest development build (macOS)](https://ci.appveyor.com/project/KadeDev/kade-engine-macos/branch/master/artifacts) ⋅ [latest development build (linux)](https://ci.appveyor.com/project/KadeDev/kade-engine-linux/branch/master/artifacts)** + +**REMEMBER**: This is a **mod**. This is not the vanilla game and should be treated as a **modification**. This is not and probably will never be official, so don't get confused. + +## Website ([KadeDev.github.io/kade-engine/](https://KadeDev.github.io/Kade-Engine/)) +If you're looking for documentation, changelogs, or guides, you can find those on the Kade Engine website. + +# Previews ([skip](#features)) + +![Tutorial (Hard) on Downscroll](https://user-images.githubusercontent.com/15311104/113989685-fa5aea80-9850-11eb-9180-f5819a774c79.gif) ![Milf (Hard) on Downscroll](https://user-images.githubusercontent.com/15311104/113990845-2c208100-9852-11eb-8e6d-f1c9e8439871.gif) + +![Roses (Hard) on Upscroll](https://user-images.githubusercontent.com/15311104/113993573-e31dfc00-9854-11eb-82ae-1f29dc8a0b04.png) + +![Milf (Hard) on Downscroll](https://user-images.githubusercontent.com/15311104/113991654-f4660900-9852-11eb-8c3d-f3927571f19b.png) + +![He malding](https://user-images.githubusercontent.com/15311104/113993693-02b52480-9855-11eb-9975-eb8a7a1be8d1.png) + +![Free Play selection screen](https://i.imgur.com/LR0eWIC.png) + +![Options Menu](https://i.imgur.com/LBXW9C1.png) + +# Features + + - **New Input System** + - An improved input system, similar to Quaver or Etterna, with less delays, less dropped inputs and other improvements. + - **More information during gameplay** + - While you're playing, we show you information about how you're doing, such as your accuracy, combo break count, notes per second, and your grade/rating. + - **Customizable keybinds** + - Instead of being forced to use WASD and the arrow keys, you can customize the keybinds to any keys you want! + - **Replays** (in beta) + - Have you ever gotten a crazy score but didn't record? The replay system solves that: it automatically saves a "replay" of your gameplay every time you complete a song, which you can play back inside of the game. + - Replays just store information about what you're doing, they don't actually record the screen -- so they take up way less space on your disk than videos. + - **Audio offset** + - If your headphones are delayed, you can set an offset in the options menu to line the game up with the delay and play with synced audio like intended. + +# Credits +### Friday Night Funkin' + - [ninjamuffin99](https://twitter.com/ninja_muffin99) - Programming + - [PhantomArcade3K](https://twitter.com/phantomarcade3k) and [Evilsk8r](https://twitter.com/evilsk8r) - Art + - [Kawai Sprite](https://twitter.com/kawaisprite) - Music + +This game was made with love to Newgrounds and its community. Extra love to Tom Fulp. +### Kade Engine +- [KadeDeveloper](https://twitter.com/KadeDeveloper) - Maintainer and lead programmer +- [The contributors](https://github.com/KadeDev/Kade-Engine/graphs/contributors) diff --git a/appveyor-linux.yml b/appveyor-linux.yml index 6e9a95a..3a18504 100644 --- a/appveyor-linux.yml +++ b/appveyor-linux.yml @@ -36,8 +36,8 @@ build_script: - haxelib run lime build linux after_build: - - tar -cvf funkin-ke.tar -C /home/appveyor/projects/kade-engine-linux/export/release/linux/bin . + - tar -cvf KadeEngine-Linux.tar -C /home/appveyor/projects/kade-engine-linux/export/release/linux/bin . artifacts: -- path: funkin-ke.tar - name: Linux build \ No newline at end of file +- path: KadeEngine-Linux.tar + name: Kade Engine for Linux diff --git a/appveyor-macos.yml b/appveyor-macos.yml index 15e048b..446096c 100644 --- a/appveyor-macos.yml +++ b/appveyor-macos.yml @@ -34,10 +34,10 @@ install: build_script: - haxelib run lime build mac - after_build: - - gtar -cvf funkin-ke.tar -C /Users/appveyor/projects/kade-engine-macos/export/release/macos/bin . + - hdiutil create /Users/appveyor/temp.dmg -ov -volname "KadeEngine-macOS" -fs HFS+ -srcfolder "/Users/appveyor/projects/kade-engine-macos/export/release/macos/bin" + - hdiutil convert /Users/appveyor/temp.dmg -format UDZO -o KadeEngine-macOS.dmg artifacts: -- path: funkin-ke.tar - name: macOS build idk +- path: KadeEngine-macOS.dmg + name: Kade Engine for macOS diff --git a/appveyor-windows.yml b/appveyor-windows.yml index 01bac78..65acce8 100644 --- a/appveyor-windows.yml +++ b/appveyor-windows.yml @@ -42,5 +42,5 @@ build_script: artifacts: - path: export/release/windows/bin - name: Windows release - type: zip \ No newline at end of file + name: KadeEngine-Windows + type: zip diff --git a/assets/preload/images/KadeEngineLogo.png b/assets/preload/images/KadeEngineLogo.png index 7a77f25..0576090 100644 Binary files a/assets/preload/images/KadeEngineLogo.png and b/assets/preload/images/KadeEngineLogo.png differ diff --git a/assets/preload/images/KadeEngineLogoBumpin.png b/assets/preload/images/KadeEngineLogoBumpin.png new file mode 100644 index 0000000..985ef07 Binary files /dev/null and b/assets/preload/images/KadeEngineLogoBumpin.png differ diff --git a/assets/preload/images/KadeEngineLogoBumpin.xml b/assets/preload/images/KadeEngineLogoBumpin.xml new file mode 100644 index 0000000..a8bcb24 --- /dev/null +++ b/assets/preload/images/KadeEngineLogoBumpin.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/assets/preload/images/KadeEngineLogoOld.png b/assets/preload/images/KadeEngineLogoOld.png new file mode 100644 index 0000000..c262f5b Binary files /dev/null and b/assets/preload/images/KadeEngineLogoOld.png differ diff --git a/docs/building.md b/docs/building.md index c44a23b..635b347 100644 --- a/docs/building.md +++ b/docs/building.md @@ -31,8 +31,8 @@ ### 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.19041.0) +- MSVC C++ x64/x86 build tools (versions 142 and up) +- Windows SDK (versions 10.0.19041.0 and up) This will install about 4 GB of crap, but is necessary to build for Windows. diff --git a/docs/changelogs/changelog-1.5.2.md b/docs/changelogs/changelog-1.5.2.md new file mode 100644 index 0000000..a3de9ee --- /dev/null +++ b/docs/changelogs/changelog-1.5.2.md @@ -0,0 +1,14 @@ +# Changelog for 1.5.2 + +Changes marked with 💖 will be listed in the short version of the changelog in `version.downloadMe`. + +### Additions +- [PR #786](https://github.com/KadeDev/Kade-Engine/pull/786): Add Acceleration, Drag and Velocity to X and Y for Actors in modcharts + +### Bugfixes +- [PR #756](https://github.com/KadeDev/Kade-Engine/pull/756): Fix bugs with combo counter +- 💖 PRs [#763](https://github.com/KadeDev/Kade-Engine/pull/763), [#789](https://github.com/KadeDev/Kade-Engine/pull/789): Fix bug where songs with spaces in the name would crash +- Fix skipping notes for judgements + +## Links +[GitHub Release](https://github.com/KadeDev/Kade-Engine/releases/tag/1.5.2) · [Last Windows CI build]() · [Last macOS CI build]() · [Last Linux CI build]() diff --git a/docs/changelogs/changelog-template.md b/docs/changelogs/changelog-template.md index acf810d..7cd0515 100644 --- a/docs/changelogs/changelog-template.md +++ b/docs/changelogs/changelog-template.md @@ -1,4 +1,4 @@ -# Latest changelog/Changelog for 1.0.0 +# Latest (master) changelog/Changelog for 1.0.0 Changes marked with 💖 will be listed in the short version of the changelog in `version.downloadMe`. diff --git a/docs/changelogs/index.md b/docs/changelogs/index.md index 4d58d31..aa2dca3 100644 --- a/docs/changelogs/index.md +++ b/docs/changelogs/index.md @@ -1,6 +1,7 @@ # Changelogs - [Latest](latest) (Contains changes that are not in a release yet) -- [1.5.1](1.5.1) -- [1.5.0](1.5.0) +- [1.5.2](changelog-1.5.2) +- [1.5.1](changelog-1.5.1) +- [1.5.0](changelog-1.5.0) - [1.4.2 and before](changelog-pre) diff --git a/docs/changelogs/latest.md b/docs/changelogs/latest.md index 25c08bb..d7def91 100644 --- a/docs/changelogs/latest.md +++ b/docs/changelogs/latest.md @@ -1 +1,12 @@ -# Latest changelog +# Latest (master) changelog + +Changes marked with 💖 will be listed in the short version of the changelog in `version.downloadMe`. + +### Additions +- Nothing here yet! + +### Changes +- Nothing here yet! + +### Bugfixes +- Nothing here yet! diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index 976f5b3..2815cfd 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -39,7 +39,7 @@ class MainMenuState extends MusicBeatState public static var nightly:String = ""; - public static var kadeEngineVer:String = "1.5.1" + nightly; + public static var kadeEngineVer:String = "1.5.2" + nightly; public static var gameVer:String = "0.2.7.1"; var magenta:FlxSprite; diff --git a/source/TitleState.hx b/source/TitleState.hx index 8b5a281..6b86eca 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -163,14 +163,25 @@ class TitleState extends MusicBeatState // bg.updateHitbox(); add(bg); - logoBl = new FlxSprite(-150, -100); - logoBl.frames = Paths.getSparrowAtlas('logoBumpin'); - logoBl.antialiasing = true; - logoBl.animation.addByPrefix('bump', 'logo bumpin', 24); - logoBl.animation.play('bump'); - logoBl.updateHitbox(); - // logoBl.screenCenter(); - // logoBl.color = FlxColor.BLACK; + if(Main.watermarks) { + logoBl = new FlxSprite(-150, -100); + logoBl.frames = Paths.getSparrowAtlas('KadeEngineLogoBumpin'); + logoBl.antialiasing = true; + logoBl.animation.addByPrefix('bump', 'logo bumpin', 24); + logoBl.animation.play('bump'); + logoBl.updateHitbox(); + // logoBl.screenCenter(); + // logoBl.color = FlxColor.BLACK; + } else { + logoBl = new FlxSprite(-150, -100); + logoBl.frames = Paths.getSparrowAtlas('logoBumpin'); + logoBl.antialiasing = true; + logoBl.animation.addByPrefix('bump', 'logo bumpin', 24); + logoBl.animation.play('bump'); + logoBl.updateHitbox(); + // logoBl.screenCenter(); + // logoBl.color = FlxColor.BLACK; + } gfDance = new FlxSprite(FlxG.width * 0.4, FlxG.height * 0.07); gfDance.frames = Paths.getSparrowAtlas('gfDanceTitle');