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/include/Nazara/Platform/Enums.hpp
+++ b/include/Nazara/Platform/Enums.hpp
@@ -51,6 +51,7 @@ namespace Nz
 		WindowEventType_Moved,
 		WindowEventType_Quit,
 		WindowEventType_Resized,
+		WindowEventType_TextEdited,
 		WindowEventType_TextEntered,

 		WindowEventType_Max = WindowEventType_TextEntered