Merge branch 'master' into debugger

Author: cuavas

3rdparty/bx/src/debug.cpp

@@ -43,7 +43,13 @@ namespace bx
 		// NativeClient: NaCl module load failed: Validation failure. File violates Native Client safety rules.
 		__asm__ ("int $3");
 #elif BX_PLATFORM_EMSCRIPTEN
-		emscripten_log(EM_LOG_CONSOLE | EM_LOG_ERROR | EM_LOG_C_STACK | EM_LOG_JS_STACK | EM_LOG_DEMANGLE, "debugBreak!");
+		emscripten_log(0
+			| EM_LOG_CONSOLE
+			| EM_LOG_ERROR
+			| EM_LOG_C_STACK
+			| EM_LOG_JS_STACK
+			, "debugBreak!"
+			);
 		// Doing emscripten_debugger() disables asm.js validation due to an emscripten bug
 		//emscripten_debugger();
 		EM_ASM({ debugger; });

docs/source/commandline/commandline-all.rst

@@ -3989,7 +3989,7 @@ Core Misc Options
 
     Specifies the type of UI to use, either ``simple`` or ``cabinet``.
 
-    The default is Cabinet (**-ui cabinet**).
+    The default is cabinet (**-ui cabinet**).
 
     Example:
         .. code-block:: bash
@@ -4025,9 +4025,9 @@ Core Misc Options
 
 **\-[no]ui_mouse**
 
-    Displays a mouse cursor when using the built-in UI for MAME.
+    Displays a mouse cursor when using the built-in MAME user interface.
 
-    The default is (**-noui_mouse**).
+    The default is ON (**-ui_mouse**).
 
 .. _mame-commandline-language:
 

docs/source/conf.py

@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.263'
+version = '0.264'
 # The full version, including alpha/beta/rc tags.
-release = '0.263'
+release = '0.264'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/debugger/general.rst

@@ -197,6 +197,9 @@ available:
     Prints the corresponding argument as an octal number with optional
     minimum field width and zero fill using lowercase letters.
 %[0][<n>]x
+    Prints the corresponding argument as a hexadecimal number with
+    optional minimum field width and zero fill using lowercase letters.
+%[0][<n>]X
     Prints the corresponding argument as a hexadecimal number with
     optional minimum field width and zero fill using uppercase letters.
 \%%