Merge remote-tracking branch 'upstream/cooker-0.7.0b' into cooker-0.7.0b-icenine451

This commit is contained in:
icenine451 2023-04-13 09:26:30 -04:00
commit bf5df4186e
4 changed files with 129 additions and 8 deletions

View file

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="UTF-8"?>
<emulated_controller>
<type>Wii U GamePad</type>
<controller>
<api>SDLController</api>
<uuid>0_030079f6de280000ff11000001000000</uuid>
<display_name>Steam Virtual Gamepad</display_name>
<rumble>1</rumble>
<axis>
<deadzone>0.25</deadzone>
<range>1</range>
</axis>
<rotation>
<deadzone>0.25</deadzone>
<range>1</range>
</rotation>
<trigger>
<deadzone>0.25</deadzone>
<range>1</range>
</trigger>
<mappings>
<entry>
<mapping>24</mapping>
<button>40</button>
</entry>
<entry>
<mapping>23</mapping>
<button>46</button>
</entry>
<entry>
<mapping>22</mapping>
<button>41</button>
</entry>
<entry>
<mapping>21</mapping>
<button>47</button>
</entry>
<entry>
<mapping>20</mapping>
<button>38</button>
</entry>
<entry>
<mapping>19</mapping>
<button>44</button>
</entry>
<entry>
<mapping>18</mapping>
<button>39</button>
</entry>
<entry>
<mapping>17</mapping>
<button>45</button>
</entry>
<entry>
<mapping>16</mapping>
<button>8</button>
</entry>
<entry>
<mapping>15</mapping>
<button>7</button>
</entry>
<entry>
<mapping>14</mapping>
<button>14</button>
</entry>
<entry>
<mapping>1</mapping>
<button>1</button>
</entry>
<entry>
<mapping>2</mapping>
<button>0</button>
</entry>
<entry>
<mapping>3</mapping>
<button>3</button>
</entry>
<entry>
<mapping>4</mapping>
<button>2</button>
</entry>
<entry>
<mapping>5</mapping>
<button>9</button>
</entry>
<entry>
<mapping>6</mapping>
<button>10</button>
</entry>
<entry>
<mapping>7</mapping>
<button>42</button>
</entry>
<entry>
<mapping>8</mapping>
<button>43</button>
</entry>
<entry>
<mapping>9</mapping>
<button>6</button>
</entry>
<entry>
<mapping>10</mapping>
<button>4</button>
</entry>
<entry>
<mapping>11</mapping>
<button>11</button>
</entry>
<entry>
<mapping>12</mapping>
<button>12</button>
</entry>
<entry>
<mapping>13</mapping>
<button>13</button>
</entry>
</mappings>
</controller>
</emulated_controller>

View file

@ -85,7 +85,7 @@
</Notification> </Notification>
</Graphic> </Graphic>
<Audio> <Audio>
<api>0</api> <api>3</api>
<delay>2</delay> <delay>2</delay>
<TVChannels>1</TVChannels> <TVChannels>1</TVChannels>
<PadChannels>1</PadChannels> <PadChannels>1</PadChannels>
@ -93,9 +93,9 @@
<TVVolume>50</TVVolume> <TVVolume>50</TVVolume>
<PadVolume>0</PadVolume> <PadVolume>0</PadVolume>
<InputVolume>50</InputVolume> <InputVolume>50</InputVolume>
<TVDevice>default</TVDevice> <TVDevice>alsa_output.pci-0000_04_00.5-platform-acp5x_mach.0.HiFi__hw_acp5x_1__sink</TVDevice>
<PadDevice></PadDevice> <PadDevice>alsa_output.pci-0000_04_00.5-platform-acp5x_mach.0.HiFi__hw_acp5x_1__sink</PadDevice>
<InputDevice></InputDevice> <InputDevice>filter-chain-source</InputDevice>
</Audio> </Audio>
<Account> <Account>
<PersistentId>2147483649</PersistentId> <PersistentId>2147483649</PersistentId>
@ -103,7 +103,7 @@
<ActiveService>0</ActiveService> <ActiveService>0</ActiveService>
</Account> </Account>
<Debug> <Debug>
<CrashDumpUnix>0</CrashDumpUnix> <CrashDumpUnix>1</CrashDumpUnix>
<GDBPort>1337</GDBPort> <GDBPort>1337</GDBPort>
</Debug> </Debug>
<Input> <Input>

View file

@ -677,8 +677,8 @@
<fullname>Nintendo GameCube</fullname> <fullname>Nintendo GameCube</fullname>
<path>%ROMPATH%/gc</path> <path>%ROMPATH%/gc</path>
<extension>.ciso .CISO .dff .DFF .dol .DOL .elf .ELF .gcm .GCM .gcz .GCZ .iso .ISO .json .JSON .m3u .M3U .rvz .RVZ .tgc .TGC .wad .WAD .wbfs .WBFS .wia .WIA .7z .7Z .zip .ZIP</extension> <extension>.ciso .CISO .dff .DFF .dol .DOL .elf .ELF .gcm .GCM .gcz .GCZ .iso .ISO .json .JSON .m3u .M3U .rvz .RVZ .tgc .TGC .wad .WAD .wbfs .WBFS .wia .WIA .7z .7Z .zip .ZIP</extension>
<command label="Dolphin">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM%</command>
<command label="Dolphin (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_DOLPHIN% -b -e %ROM%</command> <command label="Dolphin (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_DOLPHIN% -b -e %ROM%</command>
<command label="Dolphin">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM%</command>
<command label="PrimeHack (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_PRIMEHACK% -b -e %ROM%</command> <command label="PrimeHack (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_PRIMEHACK% -b -e %ROM%</command>
<!-- <command label="Triforce (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_TRIFORCE% -b -e %ROM%</command> --> <!-- <command label="Triforce (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_TRIFORCE% -b -e %ROM%</command> -->
<platform>gc</platform> <platform>gc</platform>
@ -1041,7 +1041,7 @@
<extension>.app .APP .bin .BIN .nds .NDS .7z .7Z .zip .ZIP</extension> <extension>.app .APP .bin .BIN .nds .NDS .7z .7Z .zip .ZIP</extension>
<command label="DeSmuME">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume_libretro.so %ROM%</command> <command label="DeSmuME">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume_libretro.so %ROM%</command>
<command label="DeSmuME 2015">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume2015_libretro.so %ROM%</command> <command label="DeSmuME 2015">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume2015_libretro.so %ROM%</command>
<command label="DeSmuME (Standalone)">%EMULATOR_DESMUME% %ROM%</command> <!-- <command label="DeSmuME (Standalone)">%EMULATOR_DESMUME% %ROM%</command> -->
<command label="melonDS">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/melonds_libretro.so %ROM%</command> <command label="melonDS">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/melonds_libretro.so %ROM%</command>
<command label="melonDS (Standalone)">%EMULATOR_MELONDS% %ROM%</command> <command label="melonDS (Standalone)">%EMULATOR_MELONDS% %ROM%</command>
<platform>nds</platform> <platform>nds</platform>
@ -1754,8 +1754,8 @@
<fullname>Nintendo Wii</fullname> <fullname>Nintendo Wii</fullname>
<path>%ROMPATH%/wii</path> <path>%ROMPATH%/wii</path>
<extension>.ciso .CISO .dff .DFF .dol .DOL .elf .ELF .gcm .GCM .gcz .GCZ .iso .ISO .json .JSON .m3u .M3U .rvz .RVZ .tgc .TGC .wad .WAD .wbfs .WBFS .wia .WIA .7z .7Z .zip .ZIP</extension> <extension>.ciso .CISO .dff .DFF .dol .DOL .elf .ELF .gcm .GCM .gcz .GCZ .iso .ISO .json .JSON .m3u .M3U .rvz .RVZ .tgc .TGC .wad .WAD .wbfs .WBFS .wia .WIA .7z .7Z .zip .ZIP</extension>
<command label="Dolphin">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM%</command>
<command label="Dolphin (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_DOLPHIN% -b -e %ROM%</command> <command label="Dolphin (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_DOLPHIN% -b -e %ROM%</command>
<command label="Dolphin">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM%</command>
<command label="PrimeHack (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_PRIMEHACK% -b -e %ROM%</command> <command label="PrimeHack (Standalone)">%INJECT%=%BASENAME%.esprefix %EMULATOR_PRIMEHACK% -b -e %ROM%</command>
<platform>wii</platform> <platform>wii</platform>
<theme>wii</theme> <theme>wii</theme>

View file

@ -71,6 +71,7 @@
<p>New features - General:</p> <p>New features - General:</p>
<ul> <ul>
<li>Added CEMU, WiiU Emulator</li> <li>Added CEMU, WiiU Emulator</li>
<li>Dolphin (Standalone) is now default for GameCube and Wii</li>
</ul> </ul>
<p>Bug fixes and other changes:</p> <p>Bug fixes and other changes:</p>
<ul> <ul>