Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into drc_arm_pr
Browse files Browse the repository at this point in the history
  • Loading branch information
987123879113 committed Jan 13, 2025
2 parents 7a4b957 + aa0c4f9 commit 9d08509
Show file tree
Hide file tree
Showing 321 changed files with 31,812 additions and 21,500 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/bgfx/src/glcontext_html5.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ namespace bgfx { namespace gl
}
else
{
m_primary = createSwapChain((void*)canvas, (int)_width, (int)_height) );
m_primary = createSwapChain((void*)canvas, (int)_width, (int)_height);
}

if (0 != _width
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ MAME's purpose is to preserve decades of software history. As electronic technol
## Where can I find out more?

* [Official MAME Development Team Site](https://www.mamedev.org/) (includes binary downloads, wiki, forums, and more)
* [MAME Testers](https://mametesters.org/) (official bug tracker for MAME and MESS)
* [MAME Testers](https://mametesters.org/) (official bug tracker for MAME)

### Community

Expand Down
69 changes: 67 additions & 2 deletions hash/amiga_cd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,60 @@ http://redump.org/discs/system/acd
-->
<softwarelist name="amiga_cd" description="Commodore AmigaCD images">

<!-- !Operating Systems -->

<software name="redhat51" supported="no">
<!-- "for Amiga 68k" -->
<description>Red Hat Linux 5.1</description>
<year>1998</year>
<publisher>Red Hat</publisher>
<notes><![CDATA[
Requires a machine with 68020 (not EC) + FPU + MMU (A3000 or A4000)
]]></notes>
<part name="cdrom" interface="cdrom">
<diskarea name="cdrom">
<disk name="redhat_5_1_m68k" sha1="d61a967ca60fe1f85dd485ad6b535fa07b5cee8b"/>
</diskarea>
</part>
</software>

<!-- !Games -->

<software name="kangfu" supported="no">
<!-- "CD-32, A1200, A4000" on cover art -->
<software name="bigred" supported="no">
<description>The Big Red Adventure (Europe)</description>
<year>1997</year>
<publisher>Power Computing</publisher>
<notes><![CDATA[
Requires an AGA machine with enough installed Fast RAM on it
[Denise] pitch corruption during intro
[Paula] volume gets incredibly loud during intro (verify)
Not extensively tested
]]></notes>
<part name="cdrom" interface="cdrom">
<diskarea name="cdrom">
<disk name="big_red_adventure_(1997)(ludomedia-power_computing)[m4]" sha1="4883a7e4418321c649e4df9a66958b51697656fb"/>
</diskarea>
</part>
</software>

<software name="finlodys" supported="no">
<!-- http://redump.org/disc/18527/ -->
<!-- "Peter Spinaze's Final Odyssey" on introduction screen -->
<description>Final Odyssey: Theseus Verses the Minotaur (Europe)</description>
<year>1997</year>
<publisher>Vulcan Software</publisher>
<notes><![CDATA[
Requires an ECS or AGA machine with enough installed Fast RAM on it
]]></notes>
<part name="cdrom" interface="cdrom">
<diskarea name="cdrom">
<disk name="final_odyssey_-_theseus_verses_the_minotaur_(europe)_(en,de,es,it,no,da,fi)" sha1="db1763b926a90175470871361e02047d0cc457f8"/>
</diskarea>
</part>
</software>

<software name="kangfu" supported="no">
<!-- "CD-32, A1200, A4000" on cover art -->
<description>Kang Fu</description>
<year>1996</year>
<publisher>GREat Effects Development (GREED)</publisher>
Expand Down Expand Up @@ -42,6 +92,21 @@ Not extensively tested, some games known to use ECS or AGA features. (cfr. Bruta
</part>
</software>

<software name="emuplus" supported="no">
<!-- http://redump.org/disc/43683/ -->
<description>Emulators Unlimited Plus (Germany)</description>
<!-- Unknown release date, file datestamps all have unlikely '92 or '78 -->
<!-- Has a tool for Psion Series 3/a (page 6 of Information complete list) so mid-to-late 90s possible -->
<year>1995?</year>
<!-- Epic Marketing? -->
<publisher>&lt;unknown&gt;</publisher>
<part name="cdrom" interface="cdrom">
<diskarea name="cdrom">
<disk name="emulators_unlimited_plus_(germany)_(en,de)" sha1="51ac9436545afdc39def039eeffea69d3f0e110c"/>
</diskarea>
</part>
</software>

<software name="10on10" supported="partial">
<description>Ten on Ten Compilation (Europe)</description>
<year>1995</year>
Expand Down
73 changes: 50 additions & 23 deletions hash/amigaocs_flop.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1689,9 +1689,9 @@ ATK test: C:0 H:U Bad
<year>1991</year>
<publisher>Team 17</publisher>
<notes><![CDATA[
Throws "amiga_fdc_device::live_run - cur_live.bit_counter > 8" after credits display
Throws "amiga_fdc_device::live_run - cur_live.bit_counter > 8" after credits display (worked around)
Motor keeps spinning badly on disk swap screen(s) (verify)
No player sprite, red dots incorrectly drawn on several elements during gameplay (namely alien enemies)
Glitchy [Copper] on bottom part of screen, may use SKIP
ATK test: OK
]]></notes>
<part name="flop1" interface="floppy_3_5">
Expand Down Expand Up @@ -2726,7 +2726,7 @@ ATK test: failed
<publisher>Virgin</publisher>
<notes><![CDATA[
Guru Meditation 00000004.00001970 at bootup
[Copper] cuts bottom part of screen badly during gameplay
[Copper] cuts bottom part of screen badly during gameplay, uses SKIP
ATK test: OK
]]></notes>
<part name="flop1" interface="floppy_3_5">
Expand Down Expand Up @@ -3547,9 +3547,10 @@ ATK test: C:0 H:U Bad
<notes><![CDATA[
ATK test: OK
]]></notes>
<!-- baddump: Sector 1086 damaged by Lamer Exterminator -->
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1049180">
<rom name="(sps2159)astatin.ipf" size="1049180" crc="8817db76" sha1="74a4d3f19c165c5fe3277f5534ea0a453da5fae1"/>
<rom name="(sps2159)astatin.ipf" size="1049180" crc="8817db76" sha1="74a4d3f19c165c5fe3277f5534ea0a453da5fae1" status="baddump"/>
</dataarea>
</part>
</software>
Expand Down Expand Up @@ -3763,6 +3764,10 @@ ATK test: failed
<year>1989</year>
<publisher>Mindware</publisher>
<notes><![CDATA[
Black screen after initial credits, [FDC] DSKSYNC $a425
[Denise] title off with defbitoffs
[Denise] bitplanes off by a whole screen size in gameplay
WHDLoad issue #5120 (for Hot Shots release?)
ATK test: failed
]]></notes>
<part name="flop1" interface="floppy_3_5">
Expand All @@ -3789,16 +3794,21 @@ ATK test: C:0 H:U 1 Sector Bad
</part>
</software>

<software name="australo" supported="no">
<software name="australo" supported="partial">
<!-- SPS (CAPS) release 809 -->
<description>Australo Piticus Mechanicus (Europe)</description>
<!-- retail, standalone -->
<!-- (Amiga, OCS, PAL) -->
<year>1988</year>
<publisher>Timewarp</publisher>
<notes><![CDATA[
Aliased sound SFX samples during gameplay, ch. 0 and 3 [Paula] audxlch_w points to file structure (verify, unlikely)
Pressing HELP on "run TaskForceInfo" will quick load then skip each profile (verify)
ATK test: OK
]]></notes>
<!-- Omake: "copy protection" with SYSTEM at second prompt, "logon superoper helix", -->
<!-- "help" for further commands -->
<info name="usage" value="To enter main game, type anything at first prompt then GAME at second" />
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1049612">
<rom name="(sps809)australopiticusmechanicus.ipf" size="1049612" crc="2650009b" sha1="4cb791388927cadb0ce6ac928404092bc62f49ca"/>
Expand Down Expand Up @@ -4202,7 +4212,7 @@ ATK test: OK
]]></notes>
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1049612">
<rom name="(sps1591)backgammon.ipf" size="1049612" crc="efbe5e06" sha1="8e586af18898906f691aa1afcc782392bfd42d46"/>
<rom name="(sps1591)backgammon.ipf" size="1049612" crc="efbe5e06" sha1="8e586af18898906f691aa1afcc782392bfd42d46" />
</dataarea>
</part>
</software>
Expand All @@ -4214,10 +4224,11 @@ ATK test: OK
<!-- (Amiga, OCS, PAL) -->
<year>1987</year>
<publisher>King Size</publisher>
<info name="additional" value="Mastered with virus" />
<info name="warning" value="Mastered with virus" />
<!-- baddump: SCA bootblock -->
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1049180">
<rom name="(sps206)backgammon.ipf" size="1049180" crc="b7e159cb" sha1="64a12d9db73c704195ce0d6733fb3c52cc5fba7b" status="baddump"/>
<rom name="(sps206)backgammon.ipf" size="1049180" crc="b7e159cb" sha1="64a12d9db73c704195ce0d6733fb3c52cc5fba7b" status="baddump" />
</dataarea>
</part>
</software>
Expand Down Expand Up @@ -5591,7 +5602,8 @@ ATK test: OK
<!-- (Amiga, OCS, PAL) -->
<year>1989</year>
<publisher>Magic Bytes</publisher>
<info name="additional" value="Mastered with virus" />
<info name="warning" value="Mastered with virus" />
<!-- baddump: NorthStar 2 Bootblock -->
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1043202">
<rom name="(sps1304)beam.ipf" size="1043202" crc="7b894a65" sha1="d88c483405e7b3cb3c1ab2e4fb374036f342e032" status="baddump"/>
Expand Down Expand Up @@ -6383,6 +6395,7 @@ ATK test: C:1 Bad
<year>1992</year>
<publisher>Psygnosis</publisher>
<notes><![CDATA[
Title screen is unresponsive, keeps prompting for "Press Left Mouse Button", [FDC] with adkcon=$3100 (heavy activity)
ATK test: failed
]]></notes>
<part name="flop1" interface="floppy_3_5">
Expand Down Expand Up @@ -7817,7 +7830,7 @@ Fatal errors in ipf_decode::generate_timings type 4
new68k: white screen
Title screen background glitches out [Copper]
Map screen mosaic effect is off [Copper]
Gameplay has no [Denise] sprites [Copper]
Gameplay missing [Denise] lives counter, missing background [Copper]
https://codetapper.com/amiga/sprite-tricks/brian-the-lion/
ATK test: OK
]]></notes>
Expand Down Expand Up @@ -10180,9 +10193,10 @@ ATK test: C:0 H:U Bad
<notes><![CDATA[
ATK test: OK
]]></notes>
<!-- baddump: Sector 1369 damaged by Lamer Exterminator -->
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1049180">
<rom name="(sps2804)chariotsofwrath.ipf" size="1049180" crc="80a90a55" sha1="3a82d6211323170f4ac9ad5bf815e5fe06c75a8b"/>
<rom name="(sps2804)chariotsofwrath.ipf" size="1049180" crc="80a90a55" sha1="3a82d6211323170f4ac9ad5bf815e5fe06c75a8b" status="baddump" />
</dataarea>
</part>
</software>
Expand Down Expand Up @@ -10262,13 +10276,14 @@ ATK test: C:0 H:U Bad
<!-- (Amiga, OCS, PAL) -->
<year>1990</year>
<publisher>Ocean</publisher>
<info name="additional" value="Mastered with virus" />
<info name="warning" value="Mastered with virus" />
<part name="flop1" interface="floppy_3_5">
<feature name="part_id" value="Disk 1" />
<dataarea name="flop" size="1049304">
<rom name="(sps1246)chasehqii-specialcriminalinvestigation_disk1.ipf" size="1049304" crc="7c1fd4ab" sha1="7fe8f14785d048c1e9fad7e4b162f998107f1e3c"/>
</dataarea>
</part>
<!-- baddump: Lamer Exterminator Bootblock -->
<part name="flop2" interface="floppy_3_5">
<feature name="part_id" value="Disk 2" />
<dataarea name="flop" size="1049612">
Expand Down Expand Up @@ -16417,6 +16432,8 @@ ATK test: C:0 H:U 1 Sector Bad
<year>1990</year>
<publisher>Rainbow Arts</publisher>
<notes><![CDATA[
Requires audiotape playback to go along with intro (otherwise silent)
TODO: is this a Multi 5 release, where every region got its own language audio?
ATK test: OK
]]></notes>
<part name="flop1" interface="floppy_3_5">
Expand Down Expand Up @@ -17405,8 +17422,9 @@ ATK test: OK
<!-- (Amiga, OCS, PAL) -->
<year>1988</year>
<publisher>Grandslam</publisher>
<info name="additional" value="Mastered with virus" />
<info name="warning" value="Mastered with virus" />
<info name="alt_title" value="Espionage - The Computer Game (Box)" />
<!-- baddump: NorthStar 2 Bootblock -->
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1049612">
<rom name="(sps11)espionage.ipf" size="1049612" crc="258a0c8e" sha1="604fbea189f9f2a1dc252bb9dc952f4af2f3b051" status="baddump"/>
Expand Down Expand Up @@ -29547,7 +29565,7 @@ ATK test: OK
<!-- (Amiga, OCS, PAL) -->
<year>1990</year>
<publisher>Rainbow Arts</publisher>
<info name="additional" value="Mastered with virus" />
<info name="warning" value="Mastered with virus" />
<part name="flop1" interface="floppy_3_5">
<feature name="part_id" value="Disk 1" />
<dataarea name="flop" size="1049180">
Expand All @@ -29560,6 +29578,7 @@ ATK test: OK
<rom name="(sps1589)legendoffaerghail_disk2.ipf" size="1049180" crc="f12792ce" sha1="089a3f0df65662aadadefab3a8502a07c4cfe49b"/>
</dataarea>
</part>
<!-- baddump: Byte Bandit Bootblock -->
<part name="flop3" interface="floppy_3_5">
<feature name="part_id" value="Disk 3" />
<dataarea name="flop" size="1049180">
Expand Down Expand Up @@ -36190,7 +36209,8 @@ ATK test: failed
<year>1988</year>
<publisher>Ariolasoft</publisher>
<info name="alt_title" value="Ooze - Als die Geister mürbe wurden (Box)" />
<info name="additional" value="Mastered with virus" />
<info name="warning" value="Mastered with virus" />
<!-- baddump: PvL Virus Protector v5.0 Bootblock -->
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1049612">
<rom name="(sps1255)ooze.ipf" size="1049612" crc="40d448b7" sha1="66c53d7a931bae8c5436db777c19e40893fd0c9d" status="baddump"/>
Expand Down Expand Up @@ -39081,7 +39101,8 @@ ATK test: OK
<!-- (Amiga, OCS, PAL) -->
<year>1988</year>
<publisher>MicroProse</publisher>
<info name="additional" value="Mastered with virus" />
<info name="warning" value="Mastered with virus" />
<!-- baddump: Byte Warrior (DASA) Bootblock -->
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1049612">
<rom name="(sps712)presidentismissing,the.ipf" size="1049612" crc="03a617da" sha1="d5d5028f8b834567ee9b5a55264a9b860f00b6f8" status="baddump"/>
Expand Down Expand Up @@ -43151,6 +43172,7 @@ ATK test: OK
<year>1991</year>
<publisher>U.S. Gold</publisher>
<notes><![CDATA[
WHDLoad has issues reading disk 3, baddump?
ATK test: OK
]]></notes>
<part name="flop1" interface="floppy_3_5">
Expand Down Expand Up @@ -43733,9 +43755,10 @@ ATK test: OK
<publisher>Psygnosis</publisher>
<notes><![CDATA[
Red screen, [FDC] dsksync (fixed)
Title screen shows with foreground garbage, [Copper] sprites
Title screen shows with foreground garbage, bad [FDC] data?
https://codetapper.com/amiga/sprite-tricks/shadow-of-the-beast/
Hangs during first intro in gameplay, verify [DSKDAT R] access
Hangs during first intro in gameplay
Split up [Denise] bitplanes on a top row, [Copper]?
ATK test: failed
]]></notes>
<part name="flop1" interface="floppy_3_5">
Expand Down Expand Up @@ -44194,7 +44217,8 @@ ATK test: C:0 H:U Bad
<!-- (Amiga, OCS, PAL) -->
<year>1993</year>
<publisher>Accrosoft</publisher>
<info name="additional" value="Mastered with virus" />
<info name="warning" value="Mastered with virus" />
<!-- baddump: SADDAM disk-validator -->
<part name="flop1" interface="floppy_3_5">
<feature name="part_id" value="Disquette 0" />
<dataarea name="flop" size="1049180">
Expand Down Expand Up @@ -47807,7 +47831,8 @@ ATK test: OK
<!-- (Amiga, OCS, PAL) -->
<year>1988</year>
<publisher>Logotron</publisher>
<info name="additional" value="Mastered with virus" />
<info name="warning" value="Mastered with virus" />
<!-- baddump: SCA Bootblock -->
<part name="flop1" interface="floppy_3_5">
<feature name="part_id" value="Boot Disk" />
<dataarea name="flop" size="1049612">
Expand Down Expand Up @@ -49314,8 +49339,9 @@ ATK test: OK
<year>1993</year>
<publisher>Team 17</publisher>
<notes><![CDATA[
Red screen [FDC] dsksync
Has serious GFX pitch issues on gameplay, no sprites with a500p (update: regressed with a500 too, [Copper]?)
Red screen [FDC] dsksync (fixed?)
Main sprite randomly don't show up, [Copper]?
[Copper] cuts bottom part of screen badly during gameplay, may use SKIP
ATK test: failed
]]></notes>
<part name="flop1" interface="floppy_3_5">
Expand Down Expand Up @@ -57168,7 +57194,8 @@ ATK test: failed
<!-- (Amiga, OCS, PAL) -->
<year>1989</year>
<publisher>Ubi Soft</publisher>
<info name="additional" value="Mastered with virus" />
<info name="warning" value="Mastered with virus" />
<!-- baddump: Lamer Exterminator Bootblock -->
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1055523">
<rom name="(sps2768)zombi.ipf" size="1055523" crc="97261026" sha1="922fdade85ab40968c3c4d028ab841151573d572" status="baddump"/>
Expand Down
20 changes: 20 additions & 0 deletions hash/m3.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0"?>
<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">

<!-- license:CC0-1.0 -->

<softwarelist name="m3" description="LSI M-THREE disks">

<!-- bootable -->
<software name="m3utils">
<description>M3 Utilities (Release 3)</description>
<year>198?</year>
<publisher>LSI</publisher>
<part name="flop1" interface="floppy_8">
<dataarea name="flop" size="1617408">
<rom name="m3_utils_cpm22_8ssds.mfm" size="1617408" crc="da1072a2" sha1="fa17616c90efda3e2ceeb06012183bbba3631d34" />
</dataarea>
</part>
</software>

</softwarelist>
Loading

0 comments on commit 9d08509

Please sign in to comment.