Merge remote-tracking branch 'upstream/Integration' into feat/frame_pacing_metal
# Conflicts: # VoidLink/Base.lproj/iPad.storyboard # VoidLink/Limelight.xcdatamodeld/VoidLink v1.0.xcdatamodel/contents
This commit is contained in:
@@ -55,7 +55,8 @@ typedef NS_ENUM(NSInteger, SettingsMenuMode) {
|
||||
width:(NSInteger)width
|
||||
audioConfig:(NSInteger)audioConfig
|
||||
onscreenControls:(NSInteger)onscreenControls
|
||||
gyroMode:(NSInteger)gyroMode
|
||||
gyroMode:(NSInteger)gyroMode
|
||||
emulatedControllerType:(NSInteger)emulatedControllerType
|
||||
keyboardToggleFingers:(NSInteger)keyboardToggleFingers
|
||||
oscLayoutToolFingers:(NSInteger)oscLayoutToolFingers
|
||||
slideToSettingsScreenEdge:(NSInteger)slideToSettingsScreenEdge
|
||||
|
||||
Reference in New Issue
Block a user