Pr 434 #523

Closed
krQo0ygT7YVBDW wants to merge 68 commits from pr-434 into master

68 Commits

Author SHA1 Message Date
Main
da51b283e1 Merge branch 'pr-504' into pr-434 2025-01-14 23:37:11 +09:00
Vladimir Sokolov
8576320c30
Merge branch 'master' into master 2025-01-14 11:32:52 +10:00
madwind
9356b68f26 Add a '*' to label the virtual controller. 2025-01-13 08:41:32 +08:00
IvonWei
14aafebaa6
Merge branch 'Ryubing:master' into master 2025-01-13 08:33:30 +08:00
Vladimir Sokolov
fe484e8cb1
Merge branch 'master' into master 2025-01-13 08:31:53 +10:00
Vladimir Sokolov
44de9b378b
Merge branch 'master' into master 2025-01-11 22:54:24 +10:00
Vova
2ec032c48b Added description in another file 2025-01-11 22:37:33 +10:00
Vova
f75efbea54 oops, rename to"SpecialExitEmulator" 2025-01-11 22:27:28 +10:00
Vova
11f1922a82 fix specialExitEmulator -> SpecialExitEmulator, Added description to clarify function 2025-01-11 22:20:08 +10:00
Vladimir Sokolov
de18c4927f
Merge branch 'master' into master 2025-01-11 21:26:51 +10:00
Evan Husted
4518666a04
Merge branch 'master' into master 2025-01-10 21:39:41 -06:00
Evan Husted
78e7a3085a
add back a comment that was removed for no reason 2025-01-10 21:16:31 -06:00
Evan Husted
01e22f1c67
newline brace 2025-01-10 21:13:39 -06:00
Vladimir Sokolov
3352d70ea4
Update SettingsViewModel.cs
small fix
2025-01-11 10:43:38 +10:00
Vladimir Sokolov
864cd57b51
Merge branch 'master' into master 2025-01-10 20:47:37 +10:00
Vladimir Sokolov
06cd53925c
Merge branch 'master' into master 2025-01-10 10:14:47 +10:00
Vladimir Sokolov
33fefb1323
Merge branch 'master' into master 2025-01-09 07:55:05 +10:00
Vladimir Sokolov
0c503e10ae
Update SettingsViewModel.cs 2025-01-08 23:09:09 +10:00
Vova
1c6390cbfb minor bugs fixed 2025-01-08 23:05:58 +10:00
Vova
c20452be61 Fixed a bug where the emulator would still terminate the game when pressing a hotkey (unnecessary check removed) 2025-01-08 23:00:41 +10:00
Vova
b6667a8352 multiple fixes, variable typo fixes, adherence to a certain style. Fixed initialization of the new function, defaults to 0 2025-01-08 22:45:33 +10:00
Vova
37b4dd2133 Added new option "exit by pressing plus and minus buttons" to the input section. 2025-01-08 21:43:18 +10:00
Vladimir Sokolov
007d3bc045
Merge branch 'Ryubing:master' into master 2025-01-08 18:53:27 +10:00
madwind
4399edaa9f Fix typo: SQL_JOYBATTERYUPDATED => SDL_JOYBATTERYUPDATED 2025-01-02 11:50:20 +08:00
Evan Husted
4e77bcb55a
Merge branch 'master' into master 2025-01-01 21:19:02 -06:00
IvonWei
3cbd7dc1a1
Merge branch 'Ryubing:master' into master 2024-12-31 19:21:10 +08:00
IvonWei
536f792558
Merge branch 'Ryubing:master' into master 2024-12-30 22:04:08 +08:00
madwind
7a451ab160 fix GetMappedStateSnapshot 2024-12-30 22:01:21 +08:00
Vladimir Sokolov
be2aa5ae8f
Merge branch 'Ryubing:master' into master 2024-12-30 14:27:54 +10:00
IvonWei
99c7c3fb14
Merge branch 'Ryubing:master' into master 2024-12-29 18:37:03 +08:00
Evan Husted
09e7b660f4
Merge branch 'master' into master 2024-12-29 03:42:20 -06:00
madwind
69dfd8c60e fix right Stick 2024-12-29 02:11:31 +08:00
madwind
8e50dd9fa6 fix right JoyCon stick 2024-12-29 01:49:25 +08:00
madwind
68c03051ad For the JoyCon controller, wrap SDL2Gamepad as SDL2JoyCon to use a suitable layout and correct the motion sensing and joystick orientation. 2024-12-29 00:56:03 +08:00
Evan Husted
a837294b11
Merge branch 'master' into master 2024-12-28 06:01:06 -06:00
IvonWei
f1c0cc8076
Merge branch 'Ryubing:master' into master 2024-12-28 09:09:10 +08:00
madwind
6dec7ff8ba fix motionData 2024-12-28 09:07:22 +08:00
madwind
20fdbff964 clean log 2024-12-26 14:47:40 +08:00
IvonWei
e426680cb0
Merge branch 'GreemDev:master' into master 2024-12-26 11:58:50 +08:00
madwind
7863e97cb0 invoke OnGamepadConnected and OnGamepadDisconnected 2024-12-26 11:58:00 +08:00
madwind
c4dea0ee28 add SQL_JOYBATTERYUPDATED , OnJoyBatteryUpdated 2024-12-26 11:54:52 +08:00
IvonWei
e0b6a01e9d
Merge branch 'GreemDev:master' into master 2024-12-25 17:00:53 +08:00
madwind
e509ffa716 delay 2000ms before ShowPowerLevel 2024-12-25 16:57:36 +08:00
IvonWei
714c68b548
Merge branch 'GreemDev:master' into master 2024-12-25 10:41:20 +08:00
madwind
fec197d9ec log powerLevel 2024-12-25 10:39:07 +08:00
Vladimir Sokolov
7f5978155b
Merge branch 'GreemDev:master' into master 2024-12-24 20:59:34 +10:00
IvonWei
a4b2feef79
Merge branch 'GreemDev:master' into master 2024-12-23 22:13:47 +08:00
IvonWei
ad7d9d1ce0
Update NpadController.cs
add ?
2024-12-23 18:55:49 +08:00
IvonWei
86f9544910
Update NpadController.cs
back to Debug
2024-12-23 18:54:11 +08:00
madwind
e9ecbd44fc Add a virtual controller to merge Joy-Cons. 2024-12-23 17:57:55 +08:00
Vladimir Sokolov
cd43362042
Merge branch 'GreemDev:master' into master 2024-12-22 19:55:43 +10:00
Vova
39e8283fb8 Merge branch 'master' of https://github.com/Goodfeat/Ryujinx_alt 2024-12-15 09:33:41 +10:00
Vladimir Sokolov
3e3de18976
Merge branch 'GreemDev:master' into master 2024-11-30 11:01:14 +10:00
Vladimir Sokolov
a158a93d0a
Merge branch 'GreemDev:master' into master 2024-11-25 09:10:46 +10:00
Vladimir Sokolov
ff90b68d09
Merge branch 'GreemDev:master' into master 2024-11-23 21:22:17 +10:00
Vladimir Sokolov
d7bd165861
Merge branch 'GreemDev:master' into master 2024-11-21 09:15:18 +10:00
Vladimir Sokolov
5bfa01b58a
Merge branch 'GreemDev:master' into master 2024-11-13 09:45:58 +10:00
Vladimir Sokolov
7c30426f89
Merge branch 'GreemDev:master' into master 2024-11-10 15:42:43 +10:00
Vladimir Sokolov
267aaca87d
Merge branch 'GreemDev:master' into master 2024-11-10 14:41:40 +10:00
Vova
b9012e291b code cleaning 2024-11-10 14:41:02 +10:00
Vladimir Sokolov
7da4a917ba
Merge branch 'GreemDev:master' into master 2024-11-10 13:13:11 +10:00
Vladimir Sokolov
4bab858793
Merge branch 'GreemDev:master' into master 2024-11-09 20:21:57 +10:00
Vladimir Sokolov
ca7c17186e
Merge branch 'GreemDev:master' into master 2024-11-04 20:47:13 +10:00
Vladimir Sokolov
ea061cf60c
Merge branch 'GreemDev:master' into master 2024-11-03 18:55:10 +10:00
Vova
d83da7d2fb Fixed the logic of saving the input section. Added a new dialog box when changing parameters 2024-11-02 22:42:57 +10:00
Vladimir Sokolov
25499cbbf6
Merge branch 'GreemDev:master' into master 2024-11-02 22:38:33 +10:00
Vova
8074a4dd87 Fixed a visual bug in "input settings", when switching between players the settings were reset to default 2024-10-31 18:19:05 +10:00
Vova
13d2498405 test 2024-10-31 18:09:55 +10:00