diff --git a/appveyor-linux.yml b/appveyor-linux.yml
index 47a159a..8cc98de 100644
--- a/appveyor-linux.yml
+++ b/appveyor-linux.yml
@@ -28,6 +28,8 @@ install:
- 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
+ - haxelib git extension-webm https://github.com/KadeDev/extension-webm
+ - haxelib run lime rebuild extension-webm linux
- haxelib install linc_luajit
- haxelib install actuate
- haxelib git extension-webm https://github.com/KadeDev/extension-webm
diff --git a/appveyor-macos.yml b/appveyor-macos.yml
index 6469882..f8d8148 100644
--- a/appveyor-macos.yml
+++ b/appveyor-macos.yml
@@ -28,6 +28,8 @@ install:
- 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
+ - haxelib git extension-webm https://github.com/KadeDev/extension-webm
+ - haxelib run lime rebuild extension-webm macos
- haxelib install linc_luajit
- haxelib install actuate
- haxelib git extension-webm https://github.com/KadeDev/extension-webm
diff --git a/appveyor-windows.yml b/appveyor-windows.yml
index dcdb713..eaf9b74 100644
--- a/appveyor-windows.yml
+++ b/appveyor-windows.yml
@@ -33,6 +33,8 @@ install:
- 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
+ - haxelib git extension-webm https://github.com/KadeDev/extension-webm
+ - haxelib run lime rebuild extension-webm windows
- haxelib install linc_luajit
- haxelib install actuate
- haxelib git extension-webm https://github.com/KadeDev/extension-webm
diff --git a/assets/shared/images/characters/Monster_Assets.png b/assets/shared/images/characters/Monster_Assets.png
index 10b7bbe..7307545 100644
Binary files a/assets/shared/images/characters/Monster_Assets.png and b/assets/shared/images/characters/Monster_Assets.png differ
diff --git a/assets/shared/images/characters/Monster_Assets.xml b/assets/shared/images/characters/Monster_Assets.xml
index 687d294..37341d5 100644
--- a/assets/shared/images/characters/Monster_Assets.xml
+++ b/assets/shared/images/characters/Monster_Assets.xml
@@ -1,109 +1,109 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/building.md b/docs/building.md
index adfa00c..fa8d5a9 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -34,10 +34,22 @@
### 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 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.
+- 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/).
diff --git a/docs/changelogs/changelog-1.5.3.md b/docs/changelogs/changelog-1.5.3.md
index 510ff5b..745f5c2 100644
--- a/docs/changelogs/changelog-1.5.3.md
+++ b/docs/changelogs/changelog-1.5.3.md
@@ -1,4 +1,4 @@
-# Latest (master) changelog
+# Changelog for 1.5.3
Changes marked with 💖 will be listed in the short version of the changelog in `version.downloadMe`.
@@ -14,3 +14,6 @@ Changes marked with 💖 will be listed in the short version of the changelog in
### Bugfixes
- NPS not showing if accuracy is disabled
- Fixed song names so they don't crash (💖)
+
+## Links
+[GitHub Release](https://github.com/KadeDev/Kade-Engine/releases/tag/1.5.3) · [Last Windows CI build](https://ci.appveyor.com/project/KadeDev/kade-engine-windows/builds/39671466) · [Last macOS CI build](https://ci.appveyor.com/project/KadeDev/kade-engine-macos/builds/39671465) · [Last Linux CI build](https://ci.appveyor.com/project/KadeDev/kade-engine-linux/builds/39671464)
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 7866b3b..f53a55e 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -998,7 +998,11 @@ class PlayState extends MusicBeatState
add(healthBar);
// Add Kade Engine watermark
+<<<<<<< HEAD
+ kadeEngineWatermark = new FlxText(4,healthBarBG.y + 50,0,SONG.song + " " + CoolUtil.difficultyFromInt(storyDifficulty) + (Main.watermarks ? " - KE " + MainMenuState.kadeEngineVer : ""), 16);
+=======
kadeEngineWatermark = new FlxText(4,healthBarBG.y + 50,0,SONG.song + " - " + CoolUtil.difficultyFromInt(storyDifficulty) + (Main.watermarks ? " | KE " + MainMenuState.kadeEngineVer : ""), 16);
+>>>>>>> origin/master
kadeEngineWatermark.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK);
kadeEngineWatermark.scrollFactor.set();
add(kadeEngineWatermark);
@@ -3140,6 +3144,10 @@ class PlayState extends MusicBeatState
if (controls.RIGHT_P){luaModchart.executeState('keyPressed',["right"]);};
};
#end
+<<<<<<< HEAD
+
+=======
+>>>>>>> origin/master
// Prevent player input if botplay is on
if(PlayStateChangeables.botPlay)
@@ -3151,9 +3159,15 @@ class PlayState extends MusicBeatState
var anas:Array = [null,null,null,null];
+<<<<<<< HEAD
+ for (i in 0...pressArray.length)
+ if (pressArray[i])
+ anas[i] = new Ana(Conductor.songPosition, null, false, "miss", i);
+=======
/*for (i in 0...pressArray.length)
if (pressArray[i])
anas[i] = new Ana(Conductor.songPosition, null, false, "miss", i);*/
+>>>>>>> origin/master
// HOLDS, check for sustain notes
if (holdArray.contains(true) && /*!boyfriend.stunned && */ generatedMusic)
@@ -3181,6 +3195,11 @@ class PlayState extends MusicBeatState
{
if (!directionsAccounted[daNote.noteData])
{
+<<<<<<< HEAD
+ directionsAccounted[daNote.noteData] = true;
+ possibleNotes.push(daNote);
+ directionList.push(daNote.noteData);
+=======
if (directionList.contains(daNote.noteData))
{
directionsAccounted[daNote.noteData] = true;
@@ -3205,6 +3224,7 @@ class PlayState extends MusicBeatState
possibleNotes.push(daNote);
directionList.push(daNote.noteData);
}
+>>>>>>> origin/master
}
}
});
@@ -3255,12 +3275,21 @@ class PlayState extends MusicBeatState
noteMiss(shit, null);
}
+<<<<<<< HEAD
+ }
+
+ if (!loadRep)
+ for (i in anas)
+ if (i != null)
+ replayAna.anaArray.push(i); // put em all there
+=======
}*/
/*if (!loadRep)
for (i in anas)
if (i != null)
replayAna.anaArray.push(i); // put em all there*/
+>>>>>>> origin/master
notes.forEachAlive(function(daNote:Note)
{