Merge branch 'master' into server

gframe/sound_manager.cpp

@@ -121,7 +121,7 @@ void SoundManager::PlaySound(char* sound) {
 	ma_sound_start(usingSoundEffectPointer);
 #endif
 #ifdef YGOPRO_USE_IRRKLANG
-	engineSound->play2D(soundPath);
+	engineSound->play2D(sound);
 #endif
 #endif
 }

ocgcore @ c839efc3

-Subproject commit ca5bd0f5e1b4113d7e046d8228b70fc2281d08eb
+Subproject commit c839efc376239d72400ee84c42851d8ad76b5535

premake5.lua

@@ -111,7 +111,8 @@ boolOptions = {
     "no-lua-safe",
     "message-debug",
     "no-side-check",
-    "enable-debug-func"
+    "enable-debug-func",
+    "log-lua-memory-size",
 }
 
 for _, boolOption in ipairs(boolOptions) do
@@ -124,6 +125,7 @@ numberOptions = {
     "min-deck",
     "max-extra",
     "max-side",
+    "lua-memory-size",
 }
 
 for _, numberOption in ipairs(numberOptions) do