Merge upstream with demo branch.

Adventures in Lestoria/AdventuresInLestoria.cpp

@@ -2168,6 +2168,7 @@ void AiL::_PrepareLevel(MapName map,MusicChange changeMusic){
 			worldColorFunc=[&](vi2d pos){return game->worldColor;};
 			levelTime=0;
 			bossName="";
+			worldShakeTime=0.f;
 			encounterDuration=0;
 			totalDamageDealt=0;
 			encounterStarted=false;
@@ -2175,6 +2176,7 @@ void AiL::_PrepareLevel(MapName map,MusicChange changeMusic){
 			Inventory::Clear("Monster Loot");
 			Inventory::Clear("Stage Loot");
 			Inventory::ResetLoadoutItemsUsed();
+			Input::StopVibration();
 
 			
 			Input::SetLightbar({255,0,255});

Adventures in Lestoria/State_Death.cpp

@@ -82,6 +82,7 @@ void State_Death::OnUserUpdate(AiL*game){
 		if(!Menu::IsMenuOpen()){
 			Menu::OpenMenu(MenuType::DEATH);
 		}
+		Input::StopVibration();
 		game->SetMosaicEffect(uint8_t(util::lerp(9.f,1.f,(gameSlowdownPct-7)/3.f)));
 		Input::SetLightbar(PixelLerp(BLACK,DARK_RED,sin(1.5f*game->GetRuntime())/2.f+0.5f));
 	}