Merge pull request #1901 from KadeDev/master

Master

Project.xml

@@ -128,7 +128,7 @@
 	<haxelib name="polymod"/>
 	<haxelib name="discord_rpc" if="windows"/>
 	<haxelib name="linc_luajit"/>
-
+	<haxelib name="hxvm-luajit" if="windows"/>
 	<!-- <haxelib name="hxcpp-debug-server" if="desktop"/> -->
 
 	<!-- <haxelib name="markdown" /> -->
@@ -184,6 +184,8 @@
 	<icon path="art/icon512.png" size='512'/>
 	<icon path="art/iconOG.png" />
 
+	<haxeflag name="--no-traces" unless="debug" />
+	<haxeflag name="--dce full" if="release" />
 
 	<!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> -->
 	<haxedef name="NG_LOGIN" if="newgrounds" />

appveyor-linux.yml

@@ -29,6 +29,7 @@ install:
   - 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 git hxvm-luajit https://github.com/KadeDev/hxvm-luajit
   - haxelib run lime rebuild extension-webm linux
   - haxelib git linc_luajit https://github.com/AndreiRudenko/linc_luajit.git
   - haxelib install actuate

appveyor-macos.yml

@@ -29,6 +29,7 @@ install:
   - 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 git hxvm-luajit https://github.com/KadeDev/hxvm-luajit
   - haxelib run lime rebuild extension-webm macos
   - haxelib install linc_luajit
   - haxelib install actuate

appveyor-windows.yml

@@ -34,6 +34,7 @@ install:
   - 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 git hxvm-luajit https://github.com/KadeDev/hxvm-luajit
   - haxelib run lime rebuild extension-webm windows
   - haxelib install linc_luajit
   - haxelib install actuate 

assets/preload/data/tutorial/modchart.lua

@@ -1,13 +1,21 @@
 function start(song) -- do nothing
-
+    spinLength = 0
 end
 
 function update(elapsed)
+
     if difficulty == 2 and curStep > 400 then
+        if spinLength < 32 then
+            spinLength = spinLength + 0.2
+        end
+
+
         local currentBeat = (songPos / 1000)*(bpm/60)
-		for i=0,7 do
-			setActorX(_G['defaultStrum'..i..'X'] + 32 * math.sin((currentBeat + i*0.25) * math.pi), i)
-			setActorY(_G['defaultStrum'..i..'Y'] + 32 * math.cos((currentBeat + i*0.25) * math.pi), i)
+		for i=0,7,1 do
+            local receptor = _G['receptor_'..i]
+            receptor.angle = (spinLength / 7) * -math.sin((currentBeat + i*0.25) * math.pi)
+			receptor.x = receptor.defaultX + spinLength * math.sin((currentBeat + i*0.25) * math.pi)
+			receptor.y = receptor.defaultY + spinLength * math.cos((currentBeat + i*0.25) * math.pi)
 		end
     end
 end
@@ -21,9 +29,9 @@ function stepHit(step) -- do nothing
 end
 
 function playerTwoTurn()
-    tweenCameraZoom(1.3,(crochet * 4) / 1000)
+    camGame.tweenZoom(camGame,1.3,(crochet * 4) / 1000)
 end
 
 function playerOneTurn()
-    tweenCameraZoom(1,(crochet * 4) / 1000)
+    camGame.tweenZoom(camGame,1,(crochet * 4) / 1000)
 end

docs/building.md

@@ -36,13 +36,9 @@
 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
--   MSVC v141 - VS 2017 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)
 
-This will install about 7 GB of crap, but is necessary to build for Windows.
+This will install about 4 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/).

docs/changelogs/changelog-1.7.md

@@ -0,0 +1,29 @@
+# Latest (master) changelog/Changelog
+
+Changes marked with 💖 will be listed in the short version of the changelog in `version.downloadMe`.
+
+### Additions
+- 💖 A speed modifier (To use, press shift-left/right in freeplay or the charter. Does not work on modcharts.)
+
+### Changes
+- Relocated all of the stage code into it's own file
+- 💖 Completely redid all of modcharting (docs can be found [here](https://github.com/KadeDev/Kade-Engine/wiki))
+- Removed replay functionality due to it being a peice of shit and never working and causing issues and problems all the time.
+- 💖 Optimized a lot of code to run better
+- 💖 Allowed numpad to be binded as a key
+- Optimized rating code to be faster
+- Removed debug code from release builds for faster execution
+- Binding a key to an already binded key no longer sets the other as null
+- When beat quant colors are enabled, your key presses are highlighted in the color you hit instead of the original color.
+- Removed beat base idle animations for characters
+- Changed beat quant colors to. 4th = red, 8th = blue, green = 12th, purple = 16th+
+- 💖 Changed the editor to work entirely on beats
+- Changed the BPM change code to work on beats instead of timestamps
+- Removed a lot of unnecessary code.
+- Changed **scroll speed** change events to be **based on multipliers instead of constant values** (aka 2 scroll speed would be scrollSpeed * 2 instead of setting it to 2)
+
+### Bugfixes
+- 💖 Fix multiplie crashes with story mode and other weeks in story mode
+- 💖 Fix desyncs with bpm changes and section notes in the charter
+- Fix snap working in the charter (it's way more accurate now)
+- Fixed crashing on a song that has a modchart at the end.

docs/changelogs/index.md

@@ -1,6 +1,7 @@
 # Changelogs
 
 - [Latest](latest) (Contains changes that are not in a release yet)
+- [1.7](changelog-1.7)
 - [1.6.2](changelog-1.6.2)
 - [1.6.1](changelog-1.6.1)
 - [1.6](changelog-1.6)

source/BackgroundDancer.hx

@@ -15,6 +15,8 @@ class BackgroundDancer extends FlxSprite
 		animation.addByIndices('danceRight', 'bg dancer sketch PINK', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false);
 		animation.play('danceLeft');
 		antialiasing = FlxG.save.data.antialiasing;
+
+
 	}
 
 	var danceDir:Bool = false;

source/Caching.hx

@@ -152,6 +152,7 @@ class Caching extends MusicBeatState
 
 	function cache()
 	{
+		#if !linux
 		trace("LOADING: " + toBeDone + " OBJECTS.");
 
 		for (i in images)
@@ -181,6 +182,7 @@ class Caching extends MusicBeatState
 
 		trace(Assets.cache.hasBitmapData('GF_assets'));
 
+		#end
 		FlxG.switchState(new TitleState());
 	}
 

source/Character.hx

@@ -382,7 +382,7 @@ class Character extends FlxSprite
 
 		dance();
 
-		if (isPlayer)
+		if (isPlayer && frames != null)
 		{
 			flipX = !flipX;