ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
Flyinghead 2023-01-08 11:19:48 +01:00
parent 8cd6a94e26 19818e717f
commit b37e6dc28d
9 changed files with 311 additions and 5206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/c-cpp.yml vendored
View File

@ -31,7 +31,7 @@ jobs:
run: | run: |
brew update brew update
brew install libao ldid ninja pulseaudio brew install libao ldid ninja pulseaudio
VULKAN_VER=1.3.224.1 && aria2c --parameterized-uri=true https://{sdk.lunarg.com/sdk/download/$VULKAN_VER/mac,distfiles.macports.org/MoltenVK}/vulkansdk-macos-$VULKAN_VER.dmg VULKAN_VER=1.3.236.0 && aria2c --parameterized-uri=true https://{sdk.lunarg.com/sdk/download/$VULKAN_VER/mac,distfiles.macports.org/MoltenVK}/vulkansdk-macos-$VULKAN_VER.dmg
hdiutil attach ./vulkansdk-macos-*.dmg hdiutil attach ./vulkansdk-macos-*.dmg
sudo /Volumes/vulkansdk-macos-*/InstallVulkan.app/Contents/MacOS/InstallVulkan --root $HOME/VulkanSDK --accept-licenses --default-answer --confirm-command install sudo /Volumes/vulkansdk-macos-*/InstallVulkan.app/Contents/MacOS/InstallVulkan --root $HOME/VulkanSDK --accept-licenses --default-answer --confirm-command install
hdiutil detach /Volumes/vulkansdk-macos-* hdiutil detach /Volumes/vulkansdk-macos-*

23
core/cheats.cpp
View File

@ -122,8 +122,9 @@ const WidescreenCheat CheatManager::widescreen_cheats[] =
// { "T11001N", nullptr, { 0xC3D6BC, 0xD204A8, 0xD32FC8, 0xC7CF84, 0xD20548 }, // { "T11001N", nullptr, { 0xC3D6BC, 0xD204A8, 0xD32FC8, 0xC7CF84, 0xD20548 },
// { 0x00363031, 0x00000356, 0x00000280, 0x00000280, 0x00000280 } }, // Half-Life. Not working // { 0x00363031, 0x00000356, 0x00000280, 0x00000280, 0x00000280 } }, // Half-Life. Not working
{ "MK-5104150", nullptr, { 0x23FCC4 }, { 0x44558000 } }, // Headhunter (PAL) { "MK-5104150", nullptr, { 0x23FCC4 }, { 0x44558000 } }, // Headhunter (PAL)
{ "MK-5100250", nullptr, { 0x4C6708 }, { 0x43700000 } }, // House of the Dead 2, The (PAL) // gun coords issue
{ "MK-51002", nullptr, { 0x4C6088 }, { 0x43700000 } }, // House of the Dead 2, The (USA) //{ "MK-5100250", nullptr, { 0x4C6708 }, { 0x43700000 } }, // House of the Dead 2, The (PAL)
//{ "MK-51002", nullptr, { 0x4C6088 }, { 0x43700000 } }, // House of the Dead 2, The (USA)
{ "T38706M", nullptr, { 0xC0CFA0 }, { 0x3F400000 } }, // Ikaruga (JP) { "T38706M", nullptr, { 0xC0CFA0 }, { 0x3F400000 } }, // Ikaruga (JP)
{ "T46001N", nullptr, { 0x1C8A98 }, { 0x3F400000 } }, // Illbleed (USA) { "T46001N", nullptr, { 0x1C8A98 }, { 0x3F400000 } }, // Illbleed (USA)
{ "T44904D 50", nullptr, { 0x18C15C, 0x18C18C }, { 0x43F00000, 0x3F400000 } }, // Iron Aces (PAL) { "T44904D 50", nullptr, { 0x18C15C, 0x18C18C }, { 0x43F00000, 0x3F400000 } }, // Iron Aces (PAL)
@ -313,11 +314,29 @@ const WidescreenCheat CheatManager::naomi_widescreen_cheats[] =
{ " 18WHEELER", "18wheelr", { 0x5C64A8 }, { 0x43700000 } }, { " 18WHEELER", "18wheelr", { 0x5C64A8 }, { 0x43700000 } },
{ "BEACH SPIKERS JAPAN", nullptr, { 0x065A7C }, { 0x44558000 } }, { "BEACH SPIKERS JAPAN", nullptr, { 0x065A7C }, { 0x44558000 } },
{ "GUN SPIKE", nullptr, { 0x21A94 }, { 0x3FE38E39 } }, { "GUN SPIKE", nullptr, { 0x21A94 }, { 0x3FE38E39 } },
{ "INITIAL D", "initd", { 0x155434 }, { 0x3FE38E39 } },
{ "INITIAL D", "initdexp", { 0x159674 }, { 0x3FE38E39 } },
{ "INITIAL D", "initdexpo", { 0x159634 }, { 0x3FE38E39 } },
{ "INITIAL D", "initdo", { 0x14F5F4 }, { 0x3FE38E39 } },
{ "INITIAL D Ver.2", "initdv2e", { 0x1B4F74 }, { 0x3FE38E39 } },
{ "INITIAL D Ver.2", "initdv2j", { 0x1B4F34 }, { 0x3FE38E39 } },
{ "INITIAL D Ver.2", "initdv2jo", { 0x1AD1F4 }, { 0x3FE38E39 } },
{ "INITIAL D Ver.3", "initdv3e", { 0x1D0B34 }, { 0x3FE38E39 } }, { "INITIAL D Ver.3", "initdv3e", { 0x1D0B34 }, { 0x3FE38E39 } },
{ "INITIAL D Ver.3", "initdv3j", { 0x1D7C74 }, { 0x3FE38E39 } },
{ "INITIAL D Ver.3", "initdv3jb", { 0x1D7774 }, { 0x3FE38E39 } },
{ "AIRLINE PILOTS IN JAPAN", "alpilotj", { 0x1D62550 }, { 0x43700000 } }, { "AIRLINE PILOTS IN JAPAN", "alpilotj", { 0x1D62550 }, { 0x43700000 } },
{ "MONKEY BALL JAPAN VERSION", nullptr, { 0x345B4, 0x45244, 0x454CC }, { 0x3FE38E39, 0x3FE38E39, 0x3FE38E39 } }, { "MONKEY BALL JAPAN VERSION", nullptr, { 0x345B4, 0x45244, 0x454CC }, { 0x3FE38E39, 0x3FE38E39, 0x3FE38E39 } },
{ "ZOMBIE REVENGE IN JAPAN", "zombrvn", { 0x7A4808 }, { 0x43700000 } }, { "ZOMBIE REVENGE IN JAPAN", "zombrvn", { 0x7A4808 }, { 0x43700000 } },
{ "ZOMBIE REVENGE IN JAPAN", "zombrvno", { 0x7A2E50 }, { 0x43700000 } }, { "ZOMBIE REVENGE IN JAPAN", "zombrvno", { 0x7A2E50 }, { 0x43700000 } },
{ " BIOHAZARD GUN SURVIVOR2", "gunsur2", { 0x42EE80 }, { 0x3F400000 } },
{ " BIOHAZARD GUN SURVIVOR2", "gunsur2j", { 0x42EBE0 }, { 0x3F400000 } },
{ "SPAWN JAPAN", nullptr, { 0x02DEF8, 0x02E1C0 }, { 0x3A99999A, 0x3A99999A } },
// gun coords problem with these 2 cheats
// { " CONFIDENTIAL MISSION ---------", nullptr, { 0x24F798 }, { 0x43700000 } },
// { "hotd2", nullptr, { 0x9C2AD8 }, { 0x43700000 } },
{ "GUN SPIKE", nullptr, { 0xBACD7C }, { 0x440A7C9A } },
{ " JAMBO SAFARI ------------", nullptr, { 0x2B1DE0 }, { 0x3FE38E39 } },
{ "SOUL SURFER IN JAPAN", nullptr, { 0x8962C8 }, { 0x3FE38E39 } },
{ nullptr }, { nullptr },
}; };

2
core/deps/Vulkan-Headers

@ -1 +1 @@
Subproject commit c896e2f920273bfee852da9cca2a356bc1c2031e Subproject commit b75e5a02b6933caf86c5822d019067b335492c85

2
core/deps/glslang

@ -1 +1 @@
Subproject commit 10423ec659d301a0ff2daac8bbf38980abf27590 Subproject commit 77551c429f86c0e077f26552b7c1c0f12a9f235e

15
core/hw/naomi/naomi_roms_input.h
View File

@ -465,20 +465,7 @@ static InputDescriptors meltyb_inputs = INPUT_5_BUTTONS("LAttack", "MAttack", "H
static InputDescriptors toukon4_inputs = INPUT_5_BUTTONS("X", "Y", "R", "A", "B"); static InputDescriptors toukon4_inputs = INPUT_5_BUTTONS("X", "Y", "R", "A", "B");
static InputDescriptors hmgeo_inputs = { static InputDescriptors hmgeo_inputs = INPUT_4_BUTTONS("Fire", "Attack", "Jump", "Target");
{
{ NAOMI_BTN0_KEY, "Fire" },
{ NAOMI_BTN1_KEY, "Attack" },
{ NAOMI_BTN3_KEY, "Jump" },
{ NAOMI_BTN4_KEY, "Target" },
{ NAOMI_UP_KEY, "" },
{ NAOMI_DOWN_KEY, "" },
{ NAOMI_LEFT_KEY, "" },
{ NAOMI_RIGHT_KEY, "" },
NAO_START_DESC
NAO_BASE_BTN_DESC
},
};
// //
// AtomisWave games // AtomisWave games

1
core/rend/game_scanner.h
View File

@ -173,6 +173,7 @@ public:
{ {
std::lock_guard<std::mutex> guard(mutex); std::lock_guard<std::mutex> guard(mutex);
game_list.clear(); game_list.clear();
arcade_game_list.clear();
} }
for (const auto& path : config::ContentPath.get()) for (const auto& path : config::ContentPath.get())
{ {

9
core/rend/vulkan/compiler.cpp
View File

@ -115,6 +115,15 @@ static const TBuiltInResource DefaultTBuiltInResource = {
/* .maxTaskWorkGroupSizeY_NV = */ 1, /* .maxTaskWorkGroupSizeY_NV = */ 1,
/* .maxTaskWorkGroupSizeZ_NV = */ 1, /* .maxTaskWorkGroupSizeZ_NV = */ 1,
/* .maxMeshViewCountNV = */ 4, /* .maxMeshViewCountNV = */ 4,
/* .maxMeshOutputVerticesEXT = */ 256,
/* .maxMeshOutputPrimitivesEXT = */ 256,
/* .maxMeshWorkGroupSizeX_EXT = */ 128,
/* .maxMeshWorkGroupSizeY_EXT = */ 128,
/* .maxMeshWorkGroupSizeZ_EXT = */ 128,
/* .maxTaskWorkGroupSizeX_EXT = */ 128,
/* .maxTaskWorkGroupSizeY_EXT = */ 128,
/* .maxTaskWorkGroupSizeZ_EXT = */ 128,
/* .maxMeshViewCountEXT = */ 4,
/* .maxDualSourceDrawBuffersEXT = */ 1, /* .maxDualSourceDrawBuffersEXT = */ 1,
/* .limits = */ { /* .limits = */ {

5461
shell/libretro/libretro_core_options_intl.h
View File

File diff suppressed because it is too large Load Diff

2
shell/linux/org.flycast.Flycast.metainfo.xml
View File

@ -21,7 +21,7 @@
<screenshot><image>https://raw.githubusercontent.com/flyinghead/flycast/master/shell/imgs/screenshot4.png</image></screenshot> <screenshot><image>https://raw.githubusercontent.com/flyinghead/flycast/master/shell/imgs/screenshot4.png</image></screenshot>
</screenshots> </screenshots>
<categories> <categories>
<category>Games</category> <category>Game</category>
<category>Emulator</category> <category>Emulator</category>
</categories> </categories>
<url type="homepage">https://github.com/flyinghead/flycast#readme</url> <url type="homepage">https://github.com/flyinghead/flycast#readme</url>