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

This commit is contained in:
icenine451 2023-05-01 14:24:23 -04:00
commit 3bd900ba0a
2 changed files with 57 additions and 51 deletions
emu-configs/ppssppsdl

View file

@ -17,11 +17,17 @@ An.Left = 1-38,10-4001
An.Right = 1-40,10-4000 An.Right = 1-40,10-4000
Analog limiter = 1-60 Analog limiter = 1-60
RapidFire = 1-59 RapidFire = 1-59
Fast-forward = 10-4010 Fast-forward = 1-157
SpeedToggle = 1-68 SpeedToggle = 1-68
Pause = 1-40 Pause = 1-41,10-109,10-104,1-111
Rewind = 10-4008 Rewind = 1-156
Save State = 1-53 Save State = 1-47
Load State = 1-48 Audio/Video Recording = 1-50
Screenshot = 1-46 Load State = 1-29
Home = 1-111 Screenshot = 1-52
Home = 10-107
RightAn.Up = 10-4007
RightAn.Down = 10-4006
RightAn.Left = 10-4005
RightAn.Right = 10-4004
Screen = 1-61

View file

@ -17,7 +17,7 @@ EnableCheats = False
CwCheatRefreshRate = 77 CwCheatRefreshRate = 77
CwCheatScrollPosition = 0.000000 CwCheatScrollPosition = 0.000000
GameListScrollPosition = 0.000000 GameListScrollPosition = 0.000000
ScreenshotsAsPNG = False ScreenshotsAsPNG = True
UseFFV1 = False UseFFV1 = False
DumpFrames = False DumpFrames = False
DumpVideoOutput = False DumpVideoOutput = False
@ -30,9 +30,9 @@ StateUndoLastSaveGame = NA
StateUndoLastSaveSlot = -5 StateUndoLastSaveSlot = -5
RewindFlipFrequency = 0 RewindFlipFrequency = 0
ShowOnScreenMessage = True ShowOnScreenMessage = True
ShowRegionOnGameIcon = False ShowRegionOnGameIcon = True
ShowIDOnGameIcon = False ShowIDOnGameIcon = False
GameGridScale = 1.000000 GameGridScale = 1.250000
GridView1 = True GridView1 = True
GridView2 = True GridView2 = True
GridView3 = False GridView3 = False
@ -101,7 +101,7 @@ HardwareTransform = True
SoftwareSkinning = True SoftwareSkinning = True
TextureFiltering = 1 TextureFiltering = 1
BufferFiltering = 1 BufferFiltering = 1
InternalResolution = 1 InternalResolution = 2
AndroidHwScale = 1 AndroidHwScale = 1
HighQualityDepth = 1 HighQualityDepth = 1
FrameSkip = 0 FrameSkip = 0
@ -114,7 +114,7 @@ AnisotropyLevel = 4
VertexDecCache = False VertexDecCache = False
TextureBackoffCache = False TextureBackoffCache = False
TextureSecondaryCache = False TextureSecondaryCache = False
FullScreen = False FullScreen = True
FullScreenMulti = False FullScreenMulti = False
SmallDisplayZoomType = 2 SmallDisplayZoomType = 2
SmallDisplayOffsetX = 0.500000 SmallDisplayOffsetX = 0.500000
@ -225,80 +225,80 @@ AnalogAutoRotSpeed = 8.000000
TouchSnapToGrid = False TouchSnapToGrid = False
TouchSnapGridSize = 64 TouchSnapGridSize = 64
ActionButtonSpacing2 = 1.000000 ActionButtonSpacing2 = 1.000000
ActionButtonCenterX = -1.000000 ActionButtonCenterX = 0.906250
ActionButtonCenterY = -1.000000 ActionButtonCenterY = 0.850000
ActionButtonScale = 1.150000 ActionButtonScale = 1.150000
DPadX = -1.000000 DPadX = 0.111719
DPadY = -1.000000 DPadY = 0.640000
DPadScale = 1.150000 DPadScale = 1.150000
ShowTouchDpad = True ShowTouchDpad = True
DPadSpacing = 1.000000 DPadSpacing = 1.000000
StartKeyX = -1.000000 StartKeyX = 0.589844
StartKeyY = -1.000000 StartKeyY = 0.913750
StartKeyScale = 1.150000 StartKeyScale = 1.150000
ShowTouchStart = True ShowTouchStart = True
SelectKeyX = -1.000000 SelectKeyX = 0.500000
SelectKeyY = -1.000000 SelectKeyY = 0.913750
SelectKeyScale = 1.150000 SelectKeyScale = 1.150000
ShowTouchSelect = True ShowTouchSelect = True
UnthrottleKeyX = -1.000000 UnthrottleKeyX = 0.410156
UnthrottleKeyY = -1.000000 UnthrottleKeyY = 0.913750
UnthrottleKeyScale = 1.150000 UnthrottleKeyScale = 1.150000
ShowTouchUnthrottle = True ShowTouchUnthrottle = True
LKeyX = -1.000000 LKeyX = 0.053906
LKeyY = -1.000000 LKeyY = 0.453750
LKeyScale = 1.150000 LKeyScale = 1.150000
ShowTouchLTrigger = True ShowTouchLTrigger = True
RKeyX = -1.000000 RKeyX = 0.946094
RKeyY = -1.000000 RKeyY = 0.453750
RKeyScale = 1.150000 RKeyScale = 1.150000
ShowTouchRTrigger = True ShowTouchRTrigger = True
AnalogStickX = -1.000000 AnalogStickX = 0.111719
AnalogStickY = -1.000000 AnalogStickY = 0.885000
AnalogStickScale = 1.150000 AnalogStickScale = 1.150000
ShowAnalogStick = True ShowAnalogStick = True
RightAnalogStickX = -1.000000 RightAnalogStickX = 0.906250
RightAnalogStickY = -1.000000 RightAnalogStickY = 0.885000
RightAnalogStickScale = 1.150000 RightAnalogStickScale = 1.150000
ShowRightAnalogStick = False ShowRightAnalogStick = False
fcombo0X = -1.000000 fcombo0X = 0.607813
fcombo0Y = -1.000000 fcombo0Y = 0.500000
comboKeyScale0 = 1.150000 comboKeyScale0 = 1.150000
ShowComboKey0 = False ShowComboKey0 = False
fcombo1X = -1.000000 fcombo1X = 0.697656
fcombo1Y = -1.000000 fcombo1Y = 0.500000
comboKeyScale1 = 1.150000 comboKeyScale1 = 1.150000
ShowComboKey1 = False ShowComboKey1 = False
fcombo2X = -1.000000 fcombo2X = 0.787500
fcombo2Y = -1.000000 fcombo2Y = 0.500000
comboKeyScale2 = 1.150000 comboKeyScale2 = 1.150000
ShowComboKey2 = False ShowComboKey2 = False
fcombo3X = -1.000000 fcombo3X = 0.607813
fcombo3Y = -1.000000 fcombo3Y = 0.332500
comboKeyScale3 = 1.150000 comboKeyScale3 = 1.150000
ShowComboKey3 = False ShowComboKey3 = False
fcombo4X = -1.000000 fcombo4X = 0.697656
fcombo4Y = -1.000000 fcombo4Y = 0.332500
comboKeyScale4 = 1.150000 comboKeyScale4 = 1.150000
ShowComboKey4 = False ShowComboKey4 = False
fcombo5X = -1.000000 fcombo5X = 0.392188
fcombo5Y = -1.000000 fcombo5Y = 0.500000
comboKeyScale5 = 1.150000 comboKeyScale5 = 1.150000
ShowComboKey5 = False ShowComboKey5 = False
fcombo6X = -1.000000 fcombo6X = 0.302344
fcombo6Y = -1.000000 fcombo6Y = 0.500000
comboKeyScale6 = 1.150000 comboKeyScale6 = 1.150000
ShowComboKey6 = False ShowComboKey6 = False
fcombo7X = -1.000000 fcombo7X = 0.212500
fcombo7Y = -1.000000 fcombo7Y = 0.500000
comboKeyScale7 = 1.150000 comboKeyScale7 = 1.150000
ShowComboKey7 = False ShowComboKey7 = False
fcombo8X = -1.000000 fcombo8X = 0.392188
fcombo8Y = -1.000000 fcombo8Y = 0.332500
comboKeyScale8 = 1.150000 comboKeyScale8 = 1.150000
ShowComboKey8 = False ShowComboKey8 = False
fcombo9X = -1.000000 fcombo9X = 0.302344
fcombo9Y = -1.000000 fcombo9Y = 0.332500
comboKeyScale9 = 1.150000 comboKeyScale9 = 1.150000
ShowComboKey9 = False ShowComboKey9 = False
AnalogDeadzone = 0.150000 AnalogDeadzone = 0.150000
@ -309,7 +309,7 @@ AnalogLimiterDeadzone = 0.600000
LeftStickHeadScale = 1.000000 LeftStickHeadScale = 1.000000
RightStickHeadScale = 1.000000 RightStickHeadScale = 1.000000
HideStickBackground = False HideStickBackground = False
UseMouse = False UseMouse = True
MapMouse = False MapMouse = False
ConfineMap = False ConfineMap = False
MouseSensitivity = 0.100000 MouseSensitivity = 0.100000