Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-11-16 07:48:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

MAME 0.271

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmciJuwACgkQwXSxAYxA
 cQ4AMhAAj3uqdthPjLslaxgH4QvXigdmW21n1FPQaiXgP6Ob511yyO3QdodqupgX
 UluUdfOPh+LtreoV6xqTAoD4U9Xo4h8in0R6L5TEEYyPqeA71uN9rsYbXFXiDICP
 zW9mOQTDI3gCye1HL53G9u1k2Dpl4UAqPn+BQkq3aiNjHtfiRXOA+2istOPNxfhn
 PzFAetLDV+Kd/u0xB//6NeCjP1OO4pDc90E5C9GrjilluWfwW4MP1+zpINNZKeJq
 HFO0nuyS7tAyS2grwIzc56pHrYNZ/Wj5TvrXYL8PavRavg3c1KZ1pxLziwKzwt2F
 unMSeJlHs2bLNqwR7OnbRjwMV1Ge3Ys6SqVn4r5LlkWeUQEFxYqD1n/tbE/ZWMc3
 MQ9BOPp/aUUh3gof5ThtAfayh7U2i7SxlRWqCgtcyCPq7WsDHiqDcFhtYVt9D+7F
 D5MPqav+sQF7xq4ybDiZn1aD1nCbtDpMREUyd2EB20FWhF4aRF9Ra0T27hDED5B/
 3E5uzWnTTJPuVR4WDrh+1XwnMBvsvQENZMiDdfQmEZxu2otMx11hH3qiayq+7udx
 9fZ/CPNyclQUMMHyDEUhzDdmALxJYvXMxuOu4NWQ19Btz7O/Wzapl2UAksKt4lY/
 j7sSDHXkEStOHs5wUJ3mYr4z9jmgj7o9h59YYh0o9PZRPEDF68Q=
 =uEXp
 -----END PGP SIGNATURE-----

Merge tag 'mame0271' into HEAD

MAME 0.271
This commit is contained in:
Vas Crabb 2024-11-01 02:58:05 +11:00
commit 9c32c75d7b
6 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android-project/app/src/main/AndroidManifest.xml
View file

@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
android:versionCode="270"
android:versionName="0.270"
android:versionCode="271"
android:versionName="0.271"
android:installLocation="auto">
<!-- OpenGL ES 2.0 -->

4
docs/source/conf.py
View file

@ -63,9 +63,9 @@ copyright = u'1997-2024, MAMEdev and contributors'
# built documents.
#
# The short X.Y version.
version = '0.270'
version = '0.271'
# The full version, including alpha/beta/rc tags.
release = '0.270'
release = '0.271'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

13
hash/nes.xml
View file

@ -8499,26 +8499,17 @@ license:CC0-1.0
</part>
</software>
<!-- dgolf version 1.4TE rebuilt from Git using cc65 commit
80a43d732dc9551ad84343ea9644d8fab7ec0bd9. Byte-identical copies of 1.5 and
1.0-1.4 have been reproduced with this toolchain, giving high confidence that the
rebuilds are the same as what was released. Without existent online copies,
however, this cannot be verified.
-->
<software name="dgolf14te" cloneof="dgolf">
<description>NESert Golfing Tournament Edition (v1.4)</description>
<year>2019</year>
<publisher>rainwarrior</publisher>
<notes><![CDATA[
An original download should be located to verify and/or update the hash.
]]></notes>
<info name="release" value="20191124" /> <!-- From NESertGolfing Git tag -->
<info name="release" value="20191124" /> <!-- From NESertGolfing Git tag, apparently released earlier than this as downloads as early as 2019-11-10 exist -->
<part name="cart" interface="nes_cart">
<feature name="slot" value="uxrom" />
<feature name="pcb" value="NES-UNROM" />
<feature name="mirroring" value="vertical" />
<dataarea name="prg" size="32768">
<rom name="dgolf_te prg" size="32768" crc="3ec19565" sha1="24c243f3edd8f1ba9c7f55ef45a1b4110e68ba1a" status="baddump" />
<rom name="dgolf_te prg" size="32768" crc="3ec19565" sha1="24c243f3edd8f1ba9c7f55ef45a1b4110e68ba1a" />
</dataarea>
<!-- 8k VRAM on cartridge -->
<dataarea name="vram" size="8192" />

4
makefile
View file

@ -1578,7 +1578,7 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.270"' > $@
@echo '#define BARE_BUILD_VERSION "0.271"' > $@
@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char bare_vcs_revision[];' >> $@
@ -1588,7 +1588,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@
else
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo #define BARE_BUILD_VERSION "0.270" > $@
@echo #define BARE_BUILD_VERSION "0.271" > $@
@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char bare_vcs_revision[]; >> $@

3
src/frontend/mame/ui/menu.cpp
View file

@ -1177,13 +1177,14 @@ std::pair<int, bool> menu::handle_pointer_update(uint32_t flags, ui_event const
// give derived class a chance to handle it
if ((track_pointer::IDLE == m_pointer_state) || (track_pointer::CUSTOM == m_pointer_state))
{
bool const wascustom(track_pointer::CUSTOM == m_pointer_state);
auto const [key, take, redraw] = custom_pointer_updated(changed, uievt);
if (take)
{
m_pointer_state = track_pointer::CUSTOM;
return std::make_pair(key, redraw);
}
else if (track_pointer::CUSTOM == m_pointer_state)
else if (wascustom)
{
if (uievt.pointer_buttons)
{

2
src/frontend/mame/ui/selmenu.cpp
View file

@ -1733,7 +1733,7 @@ bool menu_select_launch::handle_events(u32 flags, event &ev)
// text input goes to the search field unless there's an error message displayed
case ui_event::type::IME_CHAR:
if (!pointer_idle())
if (have_pointer() && !pointer_idle())
break;
if (exclusive_input_pressed(ev.iptkey, IPT_UI_FOCUS_NEXT, 0) || exclusive_input_pressed(ev.iptkey, IPT_UI_FOCUS_PREV, 0))