Merge branch 'master' into vulkan

2020-05-27 19:48:22 +02:00
parent 8fa456bdf5 81f03f04e5
commit 68208f5426
179 changed files with 41359 additions and 5418 deletions
--- a/src/NazaraSDK/Application.cpp
+++ b/src/NazaraSDK/Application.cpp
@@ -167,7 +167,7 @@ namespace Ndk

 		overlay->keyPressedSlot.Connect(eventHandler.OnKeyPressed, [&consoleRef] (const Nz::EventHandler*, const Nz::WindowEvent::KeyEvent& event)
 		{
-			if (event.code == Nz::Keyboard::F9)
+			if (event.virtualKey == Nz::Keyboard::VKey::F9)
 			{
 				// Toggle console visibility and focus
 				if (consoleRef.IsVisible())